From owner-p4-projects@FreeBSD.ORG Sun Jan 11 11:11:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABBA31065672; Sun, 11 Jan 2009 11:11:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2DAD510656C0 for ; Sun, 11 Jan 2009 11:11:45 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1AE9D8FC2D for ; Sun, 11 Jan 2009 11:11:45 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0BBBj6C058968 for ; Sun, 11 Jan 2009 11:11:45 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0BBBiNC058966 for perforce@freebsd.org; Sun, 11 Jan 2009 11:11:44 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 11 Jan 2009 11:11:44 GMT Message-Id: <200901111111.n0BBBiNC058966@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 155948 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2009 11:11:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=155948 Change 155948 by hselasky@hselasky_laptop001 on 2009/01/11 11:11:16 Remove duplicate USB device ID's. These ID's are already present in the U3G driver. Reported by: Paul-Henning Kamp. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#20 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#20 (text+ko) ==== @@ -177,9 +177,6 @@ {USB_VPI(USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CDMA_MODEM1, 0)}, {USB_VPI(USB_VENDOR_KYOCERA2, USB_PRODUCT_KYOCERA2_CDMA_MSM_K, 0)}, {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_49GPLUS, 0)}, -/* {USB_VPI(USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E270, 0)}, */ - {USB_VPI(USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_MOBILE, 0)}, - {USB_VPI(USB_VENDOR_MERLIN, USB_PRODUCT_MERLIN_V620, 0)}, {USB_VPI(USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_FLEXPACKGPS, 0)}, }; From owner-p4-projects@FreeBSD.ORG Sun Jan 11 12:09:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D17091065688; Sun, 11 Jan 2009 12:09:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8F4121065680 for ; Sun, 11 Jan 2009 12:09:49 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7CDE88FC18 for ; Sun, 11 Jan 2009 12:09:49 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0BC9nCA071776 for ; Sun, 11 Jan 2009 12:09:49 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0BC9nmd071774 for perforce@freebsd.org; Sun, 11 Jan 2009 12:09:49 GMT (envelope-from gabor@freebsd.org) Date: Sun, 11 Jan 2009 12:09:49 GMT Message-Id: <200901111209.n0BC9nmd071774@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 155952 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2009 12:09:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=155952 Change 155952 by gabor@gabor_server on 2009/01/11 12:09:16 - Remove this weird boundary match part. Boundary matching is handled in util.c. Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#77 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#77 (text+ko) ==== @@ -237,27 +237,9 @@ if (len > 0 && pat[len - 1] == '\n') --len; /* pat may not be NUL-terminated */ - if (wflag && !(grepbehave == GREP_FIXED)) { - int bol = 0, eol = 0, extra; - if (pat[0] == '^') - bol = 1; - if (len > 0 && pat[len - 1] == '$') - eol = 1; - extra = (grepbehave == GREP_EXTENDED) ? 2 : 4; - pattern[patterns] = grep_malloc(len + 15 + extra); - snprintf(pattern[patterns], len + 15 + extra, - "%s[[:<:]]%s%.*s%s[[:>:]]%s", - bol ? "^" : "", - (grepbehave == GREP_EXTENDED) ? "(" : "\\(", - (int)len - bol - eol, pat + bol, - (grepbehave == GREP_EXTENDED) ? ")" : "\\)", - eol ? "$" : ""); - len += 14 + extra; - } else { - pattern[patterns] = grep_malloc(len + 1); - memcpy(pattern[patterns], pat, len); - pattern[patterns][len] = '\0'; - } + pattern[patterns] = grep_malloc(len + 1); + memcpy(pattern[patterns], pat, len); + pattern[patterns][len] = '\0'; ++patterns; } From owner-p4-projects@FreeBSD.ORG Sun Jan 11 12:17:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FCF11065674; Sun, 11 Jan 2009 12:17:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 084081065670 for ; Sun, 11 Jan 2009 12:17:02 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D100E8FC08 for ; Sun, 11 Jan 2009 12:17:01 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0BCH1ZH072385 for ; Sun, 11 Jan 2009 12:17:01 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0BCH1Bn072383 for perforce@freebsd.org; Sun, 11 Jan 2009 12:17:01 GMT (envelope-from gabor@freebsd.org) Date: Sun, 11 Jan 2009 12:17:01 GMT Message-Id: <200901111217.n0BCH1Bn072383@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 155954 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2009 12:17:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=155954 Change 155954 by gabor@gabor_server on 2009/01/11 12:16:14 - Fix Makefile nit Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/Makefile#17 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/Makefile#17 (text+ko) ==== @@ -17,11 +17,13 @@ CFLAGS+= -std=c99 -Wall -pedantic -LDADD= -lgnuregex -lz -lbz2 -DPADD= ${LIBGNUREGEX} ${LIBZ} ${LIBBZ2} +LDADD= -lz -lbz2 +DPADD= ${LIBZ} ${LIBBZ2} .if !defined(WITHOUT_GNU_COMPAT) CFLAGS+= -I/usr/include/gnu +LDADD+= -lgnuregex +DPADD+= ${LIBGNUREGEX} .endif .if !defined(WITHOUT_NLS) From owner-p4-projects@FreeBSD.ORG Sun Jan 11 14:05:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E23271065675; Sun, 11 Jan 2009 14:05:52 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 89D04106566B for ; Sun, 11 Jan 2009 14:05:52 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 764A68FC13 for ; Sun, 11 Jan 2009 14:05:52 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0BE5qN2097127 for ; Sun, 11 Jan 2009 14:05:52 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0BE5qSc097125 for perforce@freebsd.org; Sun, 11 Jan 2009 14:05:52 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 11 Jan 2009 14:05:52 GMT Message-Id: <200901111405.n0BE5qSc097125@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 155957 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2009 14:05:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=155957 Change 155957 by hselasky@hselasky_laptop001 on 2009/01/11 14:05:33 Make code more compliant with SuperSpeed USB and Wireless USB. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.c#14 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#48 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#41 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#32 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#39 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_standard.h#14 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.c#14 (text+ko) ==== @@ -393,8 +393,14 @@ static uint16_t usb_max_isoc_frames(struct usb_device *dev) { - return ((usb2_get_speed(dev->bsd_udev) == USB_SPEED_HIGH) ? - USB_MAX_HIGH_SPEED_ISOC_FRAMES : USB_MAX_FULL_SPEED_ISOC_FRAMES); + ; /* indent fix */ + switch (usb2_get_speed(dev->bsd_udev)) { + case USB_SPEED_LOW: + case USB_SPEED_FULL: + return (USB_MAX_FULL_SPEED_ISOC_FRAMES); + default: + return (USB_MAX_HIGH_SPEED_ISOC_FRAMES); + } } /*------------------------------------------------------------------------* ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#48 (text+ko) ==== @@ -75,18 +75,6 @@ static void usb2_notify_addq(const char *type, struct usb2_device *); static void usb2_fifo_free_wrap(struct usb2_device *, uint8_t, uint8_t); -/* static structures */ - -static const uint8_t usb2_hub_speed_combs[USB_SPEED_MAX][USB_SPEED_MAX] = { - /* HUB *//* subdevice */ - [USB_SPEED_HIGH][USB_SPEED_HIGH] = 1, - [USB_SPEED_HIGH][USB_SPEED_FULL] = 1, - [USB_SPEED_HIGH][USB_SPEED_LOW] = 1, - [USB_SPEED_FULL][USB_SPEED_FULL] = 1, - [USB_SPEED_FULL][USB_SPEED_LOW] = 1, - [USB_SPEED_LOW][USB_SPEED_LOW] = 1, -}; - /* This variable is global to allow easy access to it: */ int usb2_template = 0; @@ -1364,21 +1352,10 @@ udev->speed = speed; udev->flags.usb2_mode = usb2_mode; - /* check speed combination */ + /* speed combination should be checked by the parent HUB */ hub = udev->parent_hub; - if (hub) { - if (usb2_hub_speed_combs[hub->speed][speed] == 0) { -#if USB_DEBUG - printf("%s: the selected subdevice and HUB speed " - "combination is not supported %d/%d.\n", - __FUNCTION__, speed, hub->speed); -#endif - /* reject this combination */ - err = USB_ERR_INVAL; - goto done; - } - } + /* search for our High Speed USB HUB, if any */ adev = udev; ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#41 (text+ko) ==== @@ -157,12 +157,16 @@ DPRINTFN(6, "flag=0x%x\n", fflags); mtx_lock(f->priv_mtx); - if (usb2_get_speed(f->udev) == USB_SPEED_HIGH) { + switch (usb2_get_speed(f->udev)) { + case USB_SPEED_LOW: + case USB_SPEED_FULL: + f->nframes = UGEN_HW_FRAMES; + f->bufsize = UGEN_BULK_FS_BUFFER_SIZE; + break; + default: f->nframes = UGEN_HW_FRAMES * 8; f->bufsize = UGEN_BULK_HS_BUFFER_SIZE; - } else { - f->nframes = UGEN_HW_FRAMES; - f->bufsize = UGEN_BULK_FS_BUFFER_SIZE; + break; } type = ed->bmAttributes & UE_XFERTYPE; ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#32 (text+ko) ==== @@ -372,18 +372,38 @@ /* * Figure out the device speed */ - speed = - (sc->sc_st.port_status & UPS_HIGH_SPEED) ? USB_SPEED_HIGH : - (sc->sc_st.port_status & UPS_LOW_SPEED) ? USB_SPEED_LOW : USB_SPEED_FULL; - + switch (udev->speed) { + case USB_SPEED_HIGH: + if (sc->sc_st.port_status & UPS_HIGH_SPEED) + speed = USB_SPEED_HIGH; + else if (sc->sc_st.port_status & UPS_LOW_SPEED) + speed = USB_SPEED_LOW; + else + speed = USB_SPEED_FULL; + break; + case USB_SPEED_FULL: + if (sc->sc_st.port_status & UPS_LOW_SPEED) + speed = USB_SPEED_LOW; + else + speed = USB_SPEED_FULL; + break; + case USB_SPEED_LOW: + speed = USB_SPEED_LOW; + break; + default: + /* same speed like parent */ + speed = udev->speed; + break; + } /* * Figure out the device mode * * NOTE: This part is currently FreeBSD specific. */ - usb2_mode = - (sc->sc_st.port_status & UPS_PORT_MODE_DEVICE) ? - USB_MODE_DEVICE : USB_MODE_HOST; + if (sc->sc_st.port_status & UPS_PORT_MODE_DEVICE) + usb2_mode = USB_MODE_DEVICE; + else + usb2_mode = USB_MODE_HOST; /* need to create a new child */ @@ -1049,17 +1069,16 @@ { struct usb2_bus *bus = udev->bus; struct usb2_hub *hub; + uint8_t speed; USB_BUS_LOCK_ASSERT(bus, MA_OWNED); - if (usb2_get_speed(udev) == USB_SPEED_HIGH) { - if (slot >= USB_HS_MICRO_FRAMES_MAX) { - slot = usb2_intr_find_best_slot(bus->uframe_usage, 0, - USB_HS_MICRO_FRAMES_MAX); - } - bus->uframe_usage[slot] += len; - } else { - if (usb2_get_speed(udev) == USB_SPEED_LOW) { + speed = usb2_get_speed(udev); + + switch (speed) { + case USB_SPEED_LOW: + case USB_SPEED_FULL: + if (speed == USB_SPEED_LOW) { len *= 8; } /* @@ -1076,6 +1095,14 @@ } hub->uframe_usage[slot] += len; bus->uframe_usage[slot] += len; + break; + default: + if (slot >= USB_HS_MICRO_FRAMES_MAX) { + slot = usb2_intr_find_best_slot(bus->uframe_usage, 0, + USB_HS_MICRO_FRAMES_MAX); + } + bus->uframe_usage[slot] += len; + break; } return (slot); } ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#39 (text+ko) ==== @@ -63,6 +63,7 @@ [USB_SPEED_FULL] = {.range = {0, 64}}, [USB_SPEED_HIGH] = {.range = {0, 1024}}, [USB_SPEED_VARIABLE] = {.range = {0, 1024}}, + [USB_SPEED_SUPER] = {.range = {0, 1024}}, }, [UE_CONTROL] = { @@ -70,6 +71,7 @@ [USB_SPEED_FULL] = {.fixed = {8, 16, 32, 64}}, [USB_SPEED_HIGH] = {.fixed = {64, 64, 64, 64}}, [USB_SPEED_VARIABLE] = {.fixed = {512, 512, 512, 512}}, + [USB_SPEED_SUPER] = {.fixed = {512, 512, 512, 512}}, }, [UE_BULK] = { @@ -77,6 +79,7 @@ [USB_SPEED_FULL] = {.fixed = {8, 16, 32, 64}}, [USB_SPEED_HIGH] = {.fixed = {512, 512, 512, 512}}, [USB_SPEED_VARIABLE] = {.fixed = {512, 512, 1024, 1536}}, + [USB_SPEED_SUPER] = {.fixed = {1024, 1024, 1024, 1024}}, }, [UE_ISOCHRONOUS] = { @@ -84,6 +87,7 @@ [USB_SPEED_FULL] = {.range = {0, 1023}}, [USB_SPEED_HIGH] = {.range = {0, 1024}}, [USB_SPEED_VARIABLE] = {.range = {0, 3584}}, + [USB_SPEED_SUPER] = {.range = {0, 1024}}, }, }; @@ -413,10 +417,14 @@ */ xfer->timeout = 1000 / 4; } - if (parm->speed == USB_SPEED_HIGH) { + switch (parm->speed) { + case USB_SPEED_LOW: + case USB_SPEED_FULL: + frame_limit = USB_MAX_FS_ISOC_FRAMES_PER_XFER; + break; + default: frame_limit = USB_MAX_HS_ISOC_FRAMES_PER_XFER; - } else { - frame_limit = USB_MAX_FS_ISOC_FRAMES_PER_XFER; + break; } if (xfer->nframes > frame_limit) { @@ -446,13 +454,29 @@ xfer->interval = edesc->bInterval; - if (parm->speed == USB_SPEED_HIGH) { - xfer->interval /= 8; /* 125us -> 1ms */ + switch (parm->speed) { + case USB_SPEED_SUPER: + case USB_SPEED_VARIABLE: + /* 125us -> 1ms */ + if (xfer->interval < 4) + xfer->interval = 1; + else if (xfer->interval > 16) + xfer->interval = (1<<(16-4)); + else + xfer->interval = + (1 << (xfer->interval-4)); + break; + case USB_SPEED_HIGH: + /* 125us -> 1ms */ + xfer->interval /= 8; + break; + default: + break; } if (xfer->interval == 0) { /* - * one millisecond is the smallest - * interval + * One millisecond is the smallest + * interval we support: */ xfer->interval = 1; } ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_standard.h#14 (text+ko) ==== @@ -602,12 +602,12 @@ #define UPS_SUSPEND 0x0004 #define UPS_OVERCURRENT_INDICATOR 0x0008 #define UPS_RESET 0x0010 -#define UPS_PORT_MODE_DEVICE 0x0020 /* currently FreeBSD specific */ #define UPS_PORT_POWER 0x0100 #define UPS_LOW_SPEED 0x0200 #define UPS_HIGH_SPEED 0x0400 #define UPS_PORT_TEST 0x0800 #define UPS_PORT_INDICATOR 0x1000 +#define UPS_PORT_MODE_DEVICE 0x8000 /* currently FreeBSD specific */ uWord wPortChange; #define UPS_C_CONNECT_STATUS 0x0001 #define UPS_C_PORT_ENABLED 0x0002 From owner-p4-projects@FreeBSD.ORG Sun Jan 11 14:57:48 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38267106567C; Sun, 11 Jan 2009 14:57:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EC8C51065679 for ; Sun, 11 Jan 2009 14:57:47 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C12408FC1E for ; Sun, 11 Jan 2009 14:57:46 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0BEvkWi001578 for ; Sun, 11 Jan 2009 14:57:46 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0BEvkpV001576 for perforce@freebsd.org; Sun, 11 Jan 2009 14:57:46 GMT (envelope-from trasz@freebsd.org) Date: Sun, 11 Jan 2009 14:57:46 GMT Message-Id: <200901111457.n0BEvkpV001576@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 155963 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2009 14:57:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=155963 Change 155963 by trasz@trasz_victim7 on 2009/01/11 14:57:40 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/aclocal.m4#3 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/config.h.in#3 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jan 11 15:02:18 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06CBA106568E; Sun, 11 Jan 2009 15:02:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7203E106566B for ; Sun, 11 Jan 2009 15:02:17 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5EB8E8FC19 for ; Sun, 11 Jan 2009 15:02:17 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0BEtij4001442 for ; Sun, 11 Jan 2009 14:55:44 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0BEthOO001440 for perforce@freebsd.org; Sun, 11 Jan 2009 14:55:43 GMT (envelope-from trasz@freebsd.org) Date: Sun, 11 Jan 2009 14:55:43 GMT Message-Id: <200901111455.n0BEthOO001440@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 155961 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2009 15:02:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=155961 Change 155961 by trasz@trasz_victim7 on 2009/01/11 14:55:34 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/CHANGES#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/api#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/unix/socket.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/version#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/string/Makefile.inc#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libmd/mdX.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/en_US.ISO8859-1/relnotes/article.sgml#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mdconfig/mdconfig.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mdconfig/mdconfig.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/redzone.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/misc/pci_vendors#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/cpufunc.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/cpufunc_asm_feroceon.S#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/cpufunc_asm_sheeva.S#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/elf_trampoline.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/cpufunc.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/files.mv#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mv_pci.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mvvar.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/orion/db88f5xxx.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/orion/orion.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_pass.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_ses.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_sg.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/Makefile.arm#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#22 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/md/md.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/mixer.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/sound.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_devid.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_devtable.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/pseudofs/pseudofs_vncache.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_vfs.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/iwnfw/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_loop.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/rtsock.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_pcb.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_pcb.h#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_output.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_framework.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_inet6.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_internal.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_policy.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_biba/mac_biba.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_bsdextended/mac_bsdextended.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_ifoff/mac_ifoff.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_lomac/mac_lomac.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_mls/mac_mls.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_none/mac_none.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_partition/mac_partition.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_seeotheruids/mac_seeotheruids.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_stub/mac_stub.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_test/mac_test.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/soundcard.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/nanobsd/gateworks/Files/root/.profile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/nanobsd/gateworks/G2348#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/nanobsd/gateworks/G2358#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/nanobsd/gateworks/avila#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/nanobsd/gateworks/cambria#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/nanobsd/gateworks/cfg/motd#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/nanobsd/gateworks/cfg/rc.conf#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/nanobsd/gateworks/cfg/ssh/sshd_config#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/nanobsd/gateworks/common#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/csplit/csplit.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/main.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/netstat.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/add/pkg_add.1#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/devices.c#8 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/CHANGES#5 (text+ko) ==== @@ -1,3 +1,11 @@ + --- 9.4.3-P1 released --- + +2522. [security] Handle -1 from DSA_do_verify(). + +2498. [bug] Removed a bogus function argument used with + ISC_SOCKET_USE_POLLWATCH: it could cause compiler + warning or crash named with the debug 1 level + of logging. [RT #18917] --- 9.4.3 released --- ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/api#5 (text+ko) ==== @@ -1,3 +1,3 @@ LIBINTERFACE = 36 -LIBREVISION = 1 +LIBREVISION = 2 LIBAGE = 0 ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/openssldsa_link.c#2 (text+ko) ==== @@ -16,7 +16,7 @@ * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: openssldsa_link.c,v 1.1.6.9 2007/08/28 07:20:04 tbox Exp $ */ +/* $Id: openssldsa_link.c,v 1.1.6.9.28.1 2008/12/24 00:21:22 marka Exp $ */ #ifdef OPENSSL @@ -133,7 +133,7 @@ status = DSA_do_verify(digest, ISC_SHA1_DIGESTLENGTH, dsasig, dsa); DSA_SIG_free(dsasig); - if (status == 0) + if (status != 1) return (dst__openssl_toresult(DST_R_VERIFYFAILURE)); return (ISC_R_SUCCESS); ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/opensslrsa_link.c#2 (text+ko) ==== @@ -17,7 +17,7 @@ /* * Principal Author: Brian Wellington - * $Id: opensslrsa_link.c,v 1.1.6.11 2006/11/07 21:28:49 marka Exp $ + * $Id: opensslrsa_link.c,v 1.1.6.11.58.1 2008/12/24 00:21:22 marka Exp $ */ #ifdef OPENSSL @@ -246,7 +246,7 @@ status = RSA_verify(type, digest, digestlen, sig->base, RSA_size(rsa), rsa); - if (status == 0) + if (status != 1) return (dst__openssl_toresult(DST_R_VERIFYFAILURE)); return (ISC_R_SUCCESS); ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/unix/socket.c#4 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: socket.c,v 1.237.18.56 2008/11/12 03:58:36 marka Exp $ */ +/* $Id: socket.c,v 1.237.18.56.2.1 2008/12/23 00:14:34 marka Exp $ */ /*! \file */ @@ -501,7 +501,7 @@ if (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, (void *)&on, sizeof(on)) < 0) { - + UNEXPECTED_ERROR(__FILE__, __LINE__, "setsockopt(%d, IPV6_RECVPKTINFO) " "%s: %s", sock->fd, @@ -3163,7 +3163,6 @@ ISC_LOGCATEGORY_GENERAL, ISC_LOGMODULE_SOCKET, ISC_LOG_DEBUG(1), - ISC_LOG_INFO, "unexpected POLL timeout"); } pollstate = poll_active; @@ -4902,7 +4901,7 @@ if (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&onoff, sizeof(int)) < 0) { char strbuf[ISC_STRERRORSIZE]; - + UNEXPECTED_ERROR(__FILE__, __LINE__, "setsockopt(%d, IPV6_V6ONLY) " "%s: %s", sock->fd, ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/version#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $Id: version,v 1.29.134.23 2008/11/12 04:17:12 marka Exp $ +# $Id: version,v 1.29.134.23.2.1 2008/12/24 00:21:22 marka Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. @@ -6,5 +6,5 @@ MAJORVER=9 MINORVER=4 PATCHVER=3 -RELEASETYPE= -RELEASEVER= +RELEASETYPE=-P +RELEASEVER=1 ==== //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#9 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.347 2009/01/06 22:18:24 bz Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.348 2009/01/08 23:27:59 keramida Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -570,7 +570,7 @@ ldconfig_local32_dirs="/usr/local/libdata/ldconfig32" # Local directories with 32-bit compatibility ldconfig # configuration files. -kern_securelevel_enable="NO" # kernel security level (see init(8)), +kern_securelevel_enable="NO" # kernel security level (see security(7)) kern_securelevel="-1" # range: -1..3 ; `-1' is the most insecure # Note that setting securelevel to 0 will result # in the system booting with securelevel set to 1, as ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/string/Makefile.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.41 2008/12/06 09:37:54 kib Exp $ +# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.42 2009/01/09 16:24:10 ru Exp $ .PATH: ${.CURDIR}/${MACHINE_ARCH}/string ${.CURDIR}/string @@ -35,34 +35,45 @@ strspn.3 strstr.3 strtok.3 strxfrm.3 swab.3 wcscoll.3 wcstok.3 \ wcswidth.3 wcsxfrm.3 wmemchr.3 -MLINKS+=ffs.3 ffsl.3 -MLINKS+=ffs.3 fls.3 -MLINKS+=ffs.3 flsl.3 -MLINKS+=ffs.3 ffsll.3 -MLINKS+=ffs.3 flsll.3 +MLINKS+=ffs.3 ffsl.3 \ + ffs.3 ffsll.3 \ + ffs.3 fls.3 \ + ffs.3 flsl.3 \ + ffs.3 flsll.3 MLINKS+=index.3 rindex.3 MLINKS+=memchr.3 memrchr.3 MLINKS+=strcasecmp.3 strncasecmp.3 MLINKS+=strcat.3 strncat.3 MLINKS+=strchr.3 strrchr.3 MLINKS+=strcmp.3 strncmp.3 -MLINKS+=strcpy.3 stpcpy.3 +MLINKS+=strcpy.3 stpcpy.3 \ + strcpy.3 strncpy.3 MLINKS+=strdup.3 strndup.3 -MLINKS+=strcpy.3 strncpy.3 -MLINKS+=strerror.3 perror.3 strerror.3 sys_errlist.3 strerror.3 sys_nerr.3 -MLINKS+=strerror.3 strerror_r.3 +MLINKS+=strerror.3 perror.3 \ + strerror.3 strerror_r.3 \ + strerror.3 sys_errlist.3 \ + strerror.3 sys_nerr.3 MLINKS+=strlcpy.3 strlcat.3 +MLINKS+=strstr.3 strcasestr.3 \ + strstr.3 strnstr.3 MLINKS+=strtok.3 strtok_r.3 -MLINKS+=strstr.3 strcasestr.3 -MLINKS+=strstr.3 strnstr.3 -MLINKS+=wmemchr.3 wmemcmp.3 wmemchr.3 wmemcpy.3 \ - wmemchr.3 wmemmove.3 wmemchr.3 wmemset.3 \ - wmemchr.3 wcscat.3 wmemchr.3 wcschr.3 \ - wmemchr.3 wcscmp.3 wmemchr.3 wcscpy.3 \ - wmemchr.3 wcscspn.3 wmemchr.3 wcsdup.3 \ +MLINKS+=wmemchr.3 wcscat.3 \ + wmemchr.3 wcschr.3 \ + wmemchr.3 wcscmp.3 \ + wmemchr.3 wcscpy.3 \ + wmemchr.3 wcscspn.3 \ + wmemchr.3 wcsdup.3 \ wmemchr.3 wcslcat.3 \ - wmemchr.3 wcslcpy.3 wmemchr.3 wcslen.3 \ - wmemchr.3 wcsncat.3 wmemchr.3 wcsncmp.3 \ - wmemchr.3 wcsncpy.3 wmemchr.3 wcspbrk.3 \ - wmemchr.3 wcsrchr.3 wmemchr.3 wcsspn.3 \ - wmemchr.3 wcsstr.3 + wmemchr.3 wcslcpy.3 \ + wmemchr.3 wcslen.3 \ + wmemchr.3 wcsncat.3 \ + wmemchr.3 wcsncmp.3 \ + wmemchr.3 wcsncpy.3 \ + wmemchr.3 wcspbrk.3 \ + wmemchr.3 wcsrchr.3 \ + wmemchr.3 wcsspn.3 \ + wmemchr.3 wcsstr.3 \ + wmemchr.3 wmemcmp.3 \ + wmemchr.3 wmemcpy.3 \ + wmemchr.3 wmemmove.3 \ + wmemchr.3 wmemset.3 ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libmd/mdX.3#2 (text+ko) ==== @@ -6,7 +6,7 @@ .\" this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp .\" ---------------------------------------------------------------------------- .\" -.\" $FreeBSD: src/lib/libmd/mdX.3,v 1.30 2006/01/17 15:35:56 phk Exp $ +.\" $FreeBSD: src/lib/libmd/mdX.3,v 1.31 2009/01/09 11:45:13 phk Exp $ .\" .Dd February 11, 1999 .Dt MDX 3 @@ -164,11 +164,6 @@ .%O RFC 1321 .Re .Rs -.%A RSA Laboratories -.%T Frequently Asked Questions About today's Cryptography -.%O \& -.Re -.Rs .%A H. Dobbertin .%T Alf Swindles Ann .%J CryptoBytes ==== //depot/projects/soc2008/trasz_nfs4acl/release/doc/en_US.ISO8859-1/relnotes/article.sgml#9 (text+ko) ==== @@ -17,7 +17,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1098 2008/11/24 01:26:22 delphij Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1099 2009/01/09 03:52:12 murray Exp $ 2000 @@ -29,6 +29,7 @@ 2006 2007 2008 + 2009 The &os; Documentation Project @@ -347,6 +348,12 @@ The &man.fdopendir.3; library function has been added. + The &man.fetch.3; library now support HTTP 1.1 + If-Modified-Since behavior. The &man.fetch.1; program now + supports + which will only download the specified HTTP URL if the content + is newer than filename. + &man.find.1; has been enhanced by the addition of a number of primaries that were present in GNU find but not &os; &man.find.1;. ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/mdconfig/mdconfig.8#3 (text+ko) ==== @@ -39,7 +39,7 @@ .\" @(#)vnconfig.8 8.1 (Berkeley) 6/5/93 .\" from: src/usr.sbin/vnconfig/vnconfig.8,v 1.19 2000/12/27 15:30:29 .\" -.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.43 2008/06/21 15:04:42 marck Exp $ +.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.44 2009/01/10 17:17:18 trasz Exp $ .\" .Dd June 21, 2008 .Dt MDCONFIG 8 @@ -62,6 +62,7 @@ .Nm .Fl d .Fl u Ar unit +.Op Fl o Oo Cm no Oc Ns Ar force .Nm .Fl l .Op Fl n ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/mdconfig/mdconfig.c#3 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sbin/mdconfig/mdconfig.c,v 1.56 2008/06/21 15:04:42 marck Exp $ + * $FreeBSD: src/sbin/mdconfig/mdconfig.c,v 1.57 2009/01/10 17:17:18 trasz Exp $ * */ #include @@ -58,7 +58,7 @@ "usage: mdconfig -a -t type [-n] [-o [no]option] ... [-f file]\n" " [-s size] [-S sectorsize] [-u unit]\n" " [-x sectors/track] [-y heads/cyl]\n" -" mdconfig -d -u unit\n" +" mdconfig -d -u unit [-o [no]force]\n" " mdconfig -l [-v] [-n] [-u unit]\n"); fprintf(stderr, "\t\ttype = {malloc, preload, vnode, swap}\n"); fprintf(stderr, "\t\toption = {cluster, compress, reserve}\n"); @@ -160,6 +160,16 @@ close(fd); break; case 'o': + if (action == DETACH) { + if (!strcmp(optarg, "force")) + mdio.md_options |= MD_FORCE; + else if (!strcmp(optarg, "noforce")) + mdio.md_options &= ~MD_FORCE; + else + errx(1, "Unknown option: %s.", optarg); + break; + } + if (cmdline != 2) usage(); if (!strcmp(optarg, "async")) ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/mount/mount.c,v 1.102 2008/12/26 22:55:38 obrien Exp $"; + "$FreeBSD: src/sbin/mount/mount.c,v 1.103 2009/01/10 20:54:47 obrien Exp $"; #endif /* not lint */ #include @@ -68,16 +68,21 @@ #define MOUNT_META_OPTION_FSTAB "fstab" #define MOUNT_META_OPTION_CURRENT "current" -#define MAX_ARGS 100 +int debug, fstab_style, verbose; -int debug, fstab_style, verbose; +#define MAX_ARGS 100 +struct cpa { + char *a[MAX_ARGS]; + ssize_t m; + int c; +}; char *catopt(char *, const char *); struct statfs *getmntpt(const char *); int hasopt(const char *, const char *); int ismounted(struct fstab *, struct statfs *, int); int isremountable(const char *); -void mangle(char *, int *, char *[]); +void mangle(char *, struct cpa *); char *update_options(char *, char *, int); int mountfs(const char *, const char *, const char *, int, const char *, const char *); @@ -500,12 +505,20 @@ return (found); } +static void +append_arg(struct cpa *sa, char *arg) +{ + if (sa->c >= sa->m) + errx(1, "Cannot process more than %zd mount arguments", sa->m); + + sa->a[++sa->c] = arg; +} + int mountfs(const char *vfstype, const char *spec, const char *name, int flags, const char *options, const char *mntopts) { - static int argc; - char *argv[MAX_ARGS]; + struct cpa mnt_argv; struct statfs sf; int i, ret; char *optbuf, execname[PATH_MAX], mntpath[PATH_MAX]; @@ -543,32 +556,29 @@ /* Construct the name of the appropriate mount command */ (void)snprintf(execname, sizeof(execname), "mount_%s", vfstype); - argc = 0; - argv[argc++] = execname; - mangle(optbuf, &argc, argv); - argv[argc++] = strdup(spec); - argv[argc++] = strdup(name); - argv[argc] = NULL; - - if (MAX_ARGS <= argc ) - errx(1, "Cannot process more than %d mount arguments", - MAX_ARGS); + mnt_argv.m = MAX_ARGS; + mnt_argv.c = -1; + append_arg(&mnt_argv, execname); + mangle(optbuf, &mnt_argv); + append_arg(&mnt_argv, strdup(spec)); + append_arg(&mnt_argv, strdup(name)); + append_arg(&mnt_argv, NULL); if (debug) { if (use_mountprog(vfstype)) printf("exec: mount_%s", vfstype); else printf("mount -t %s", vfstype); - for (i = 1; i < argc; i++) - (void)printf(" %s", argv[i]); + for (i = 1; i < mnt_argv.c; i++) + (void)printf(" %s", mnt_argv.a[i]); (void)printf("\n"); return (0); } if (use_mountprog(vfstype)) { - ret = exec_mountprog(name, execname, argv); + ret = exec_mountprog(name, execname, mnt_argv.a); } else { - ret = mount_fs(vfstype, argc, argv); + ret = mount_fs(vfstype, mnt_argv.c, mnt_argv.a); } free(optbuf); @@ -671,12 +681,10 @@ } void -mangle(char *options, int *argcp, char *argv[]) +mangle(char *options, struct cpa *a) { char *p, *s; - int argc; - argc = *argcp; for (s = options; (p = strsep(&s, ",")) != NULL;) if (*p != '\0') { if (strcmp(p, "noauto") == 0) { @@ -708,19 +716,17 @@ sizeof(groupquotaeq) - 1) == 0) { continue; } else if (*p == '-') { - argv[argc++] = p; + append_arg(a, p); p = strchr(p, '='); if (p != NULL) { *p = '\0'; - argv[argc++] = p+1; + append_arg(a, p + 1); } } else { - argv[argc++] = strdup("-o"); - argv[argc++] = p; + append_arg(a, strdup("-o")); + append_arg(a, p); } } - - *argcp = argc; } ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/rc.conf.5#5 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.349 2008/09/24 21:07:11 des Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.350 2009/01/08 23:50:32 keramida Exp $ .\" -.Dd September 24, 2008 +.Dd January 9, 2009 .Dt RC.CONF 5 .Os .Sh NAME @@ -3188,7 +3188,7 @@ ranges from \-1 (the compile time default) to 3 (the most secure). See -.Xr init 8 +.Xr security 7 for the list of possible security levels and their effect on system operation. .It Va sshd_program @@ -3987,6 +3987,7 @@ .Xr motd 5 , .Xr newsyslog.conf 5 , .Xr pf.conf 5 , +.Xr security 7 , .Xr accton 8 , .Xr amd 8 , .Xr apm 8 , ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/redzone.9#2 (text+ko) ==== @@ -22,15 +22,17 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/redzone.9,v 1.1 2006/01/31 11:09:20 pjd Exp $ +.\" $FreeBSD: src/share/man/man9/redzone.9,v 1.2 2009/01/09 14:41:36 brueffer Exp $ .\" -.Dd January 31, 2006 +.Dd January 9, 2009 .Dt REDZONE 9 .Os .Sh NAME .Nm RedZone .Nd "buffer corruptions detector" .Sh SYNOPSIS +.Cd "options KDB" +.Cd "options DDB" .Cd "options DEBUG_REDZONE" .Sh DESCRIPTION .Nm ==== //depot/projects/soc2008/trasz_nfs4acl/share/misc/pci_vendors#2 (text+ko) ==== @@ -1,4 +1,4 @@ -; $FreeBSD: src/share/misc/pci_vendors,v 1.37 2008/01/17 19:29:01 ambrisko Exp $ +; $FreeBSD: src/share/misc/pci_vendors,v 1.38 2009/01/10 16:24:58 kib Exp $ ; ; Automatically generated by src/tools/tools/pciid/mk_pci_vendors.pl ; (with the -l option), using the following source lists: @@ -4606,7 +4606,7 @@ 6041 MV88SX6041 Marvell Technology Group Ltd. MV88SX6041 4-port SATA II PCI-X Controller (rev 03) 6042 MV88SX6042 4-port SATA II PCI-X Controller 6081 MV88SX6081 8-port SATA II PCI-X Controller - 6101 6101 SATA2 Controller + 6101 MV88SX6101 1-port UltraATA/133 Controller 6111 6111 SATA2 Controller 6120 6120 SATA2 Controller 6121 6121 SATA2 Controller ==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/cpufunc.c#4 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.24 2008/12/20 03:26:09 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.25 2009/01/09 10:45:04 raj Exp $"); #include #include @@ -358,7 +358,7 @@ }; -struct cpu_functions feroceon_cpufuncs = { +struct cpu_functions sheeva_cpufuncs = { /* CPU functions */ cpufunc_id, /* id */ @@ -368,7 +368,7 @@ cpufunc_control, /* control */ cpufunc_domains, /* Domain */ - feroceon_setttb, /* Setttb */ + sheeva_setttb, /* Setttb */ cpufunc_faultstatus, /* Faultstatus */ cpufunc_faultaddress, /* Faultaddress */ @@ -387,17 +387,17 @@ armv5_ec_icache_sync_range, /* icache_sync_range */ armv5_ec_dcache_wbinv_all, /* dcache_wbinv_all */ - feroceon_dcache_wbinv_range, /* dcache_wbinv_range */ - feroceon_dcache_inv_range, /* dcache_inv_range */ - feroceon_dcache_wb_range, /* dcache_wb_range */ + sheeva_dcache_wbinv_range, /* dcache_wbinv_range */ + sheeva_dcache_inv_range, /* dcache_inv_range */ + sheeva_dcache_wb_range, /* dcache_wb_range */ armv5_ec_idcache_wbinv_all, /* idcache_wbinv_all */ - feroceon_idcache_wbinv_range, /* idcache_wbinv_all */ + sheeva_idcache_wbinv_range, /* idcache_wbinv_all */ - feroceon_l2cache_wbinv_all, /* l2cache_wbinv_all */ - feroceon_l2cache_wbinv_range, /* l2cache_wbinv_range */ - feroceon_l2cache_inv_range, /* l2cache_inv_range */ - feroceon_l2cache_wb_range, /* l2cache_wb_range */ + sheeva_l2cache_wbinv_all, /* l2cache_wbinv_all */ + sheeva_l2cache_wbinv_range, /* l2cache_wbinv_range */ + sheeva_l2cache_inv_range, /* l2cache_inv_range */ + sheeva_l2cache_wb_range, /* l2cache_wb_range */ /* Other functions */ @@ -1000,7 +1000,7 @@ cputype == CPU_ID_MV88FR571_VD || cputype == CPU_ID_MV88FR571_41) { - cpufuncs = feroceon_cpufuncs; + cpufuncs = sheeva_cpufuncs; /* * Workaround for Marvell MV78100 CPU: Cache prefetch * mechanism may affect the cache coherency validity, @@ -1011,12 +1011,12 @@ */ if (cputype == CPU_ID_MV88FR571_VD || cputype == CPU_ID_MV88FR571_41) { - feroceon_control_ext(0xffffffff, + sheeva_control_ext(0xffffffff, FC_DCACHE_STREAM_EN | FC_WR_ALLOC_EN | FC_BRANCH_TARG_BUF_DIS | FC_L2CACHE_EN | FC_L2_PREF_DIS); } else { - feroceon_control_ext(0xffffffff, + sheeva_control_ext(0xffffffff, FC_DCACHE_STREAM_EN | FC_WR_ALLOC_EN | FC_BRANCH_TARG_BUF_DIS | FC_L2CACHE_EN); } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/elf_trampoline.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.22 2008/10/13 20:07:13 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.23 2009/01/09 10:45:04 raj Exp $"); #include #include #include @@ -74,7 +74,7 @@ #ifdef CPU_XSCALE_81342 #define cpu_l2cache_wbinv_all xscalec3_l2cache_purge #elif defined(SOC_MV_KIRKWOOD) || defined(SOC_MV_DISCOVERY) -#define cpu_l2cache_wbinv_all feroceon_l2cache_wbinv_all +#define cpu_l2cache_wbinv_all sheeva_l2cache_wbinv_all #else #define cpu_l2cache_wbinv_all() #endif ==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/cpufunc.h#3 (text+ko) ==== @@ -38,7 +38,7 @@ * * Prototypes for cpu, mmu and tlb related functions. * - * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.14 2008/10/13 18:16:54 raj Exp $ + * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.15 2009/01/09 10:45:04 raj Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -377,17 +377,17 @@ extern unsigned arm10_dcache_index_max; extern unsigned arm10_dcache_index_inc; -u_int feroceon_control_ext (u_int, u_int); -void feroceon_setttb (u_int); -void feroceon_dcache_wbinv_range (vm_offset_t, vm_size_t); -void feroceon_dcache_inv_range (vm_offset_t, vm_size_t); -void feroceon_dcache_wb_range (vm_offset_t, vm_size_t); -void feroceon_idcache_wbinv_range (vm_offset_t, vm_size_t); +u_int sheeva_control_ext (u_int, u_int); +void sheeva_setttb (u_int); +void sheeva_dcache_wbinv_range (vm_offset_t, vm_size_t); +void sheeva_dcache_inv_range (vm_offset_t, vm_size_t); +void sheeva_dcache_wb_range (vm_offset_t, vm_size_t); +void sheeva_idcache_wbinv_range (vm_offset_t, vm_size_t); -void feroceon_l2cache_wbinv_range (vm_offset_t, vm_size_t); -void feroceon_l2cache_inv_range (vm_offset_t, vm_size_t); -void feroceon_l2cache_wb_range (vm_offset_t, vm_size_t); -void feroceon_l2cache_wbinv_all (void); +void sheeva_l2cache_wbinv_range (vm_offset_t, vm_size_t); +void sheeva_l2cache_inv_range (vm_offset_t, vm_size_t); +void sheeva_l2cache_wb_range (vm_offset_t, vm_size_t); +void sheeva_l2cache_wbinv_all (void); #endif #ifdef CPU_ARM11 ==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/files.mv#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/mv/files.mv,v 1.2 2008/11/19 11:30:44 raj Exp $ +# $FreeBSD: src/sys/arm/mv/files.mv,v 1.3 2009/01/09 10:55:33 raj Exp $ # # The Marvell CPU cores # - Compliant with V5TE architecture @@ -15,7 +15,7 @@ arm/arm/bus_space_generic.c standard arm/arm/cpufunc_asm_arm10.S standard arm/arm/cpufunc_asm_armv5_ec.S standard -arm/arm/cpufunc_asm_feroceon.S standard +arm/arm/cpufunc_asm_sheeva.S standard arm/arm/irq_dispatch.S standard arm/mv/bus_space.c standard ==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mv_pci.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/mv_pci.c,v 1.3 2008/12/05 15:27:28 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/mv_pci.c,v 1.5 2009/01/09 12:38:41 raj Exp $"); #include #include @@ -80,6 +80,7 @@ #define PCIE_REG_STATUS 0x1A04 #define PCIE_REG_IRQ_MASK 0x1910 +#define STATUS_LINK_DOWN 1 #define STATUS_BUS_OFFS 8 #define STATUS_BUS_MASK (0xFF << STATUS_BUS_OFFS) #define STATUS_DEV_OFFS 16 @@ -95,10 +96,12 @@ struct pcib_mbus_softc { device_t sc_dev; + struct rman sc_iomem_rman; bus_addr_t sc_iomem_base; bus_addr_t sc_iomem_size; bus_addr_t sc_iomem_alloc; /* Next allocation. */ + struct rman sc_ioport_rman; bus_addr_t sc_ioport_base; bus_addr_t sc_ioport_size; bus_addr_t sc_ioport_alloc; /* Next allocation. */ @@ -434,6 +437,8 @@ P2P_CONF_DEV_OFFS; } else { val = bus_space_read_4(sc->sc_bst, sc->sc_bsh, PCIE_REG_STATUS); + if (val & STATUS_LINK_DOWN) + goto out; bus = sc->sc_busnr = (val & STATUS_BUS_MASK) >> STATUS_BUS_OFFS; dev = sc->sc_devnr = (val & STATUS_DEV_MASK) >> STATUS_DEV_OFFS; } @@ -521,12 +526,39 @@ sc->sc_ioport_size = sc->sc_info->op_io_size; sc->sc_ioport_alloc = sc->sc_info->op_io_base; + sc->sc_iomem_rman.rm_type = RMAN_ARRAY; + err = rman_init(&sc->sc_iomem_rman); + if (err) + return (err); + + sc->sc_ioport_rman.rm_type = RMAN_ARRAY; + err = rman_init(&sc->sc_ioport_rman); + if (err) { + rman_fini(&sc->sc_iomem_rman); + return (err); + } + + err = rman_manage_region(&sc->sc_iomem_rman, sc->sc_iomem_base, + sc->sc_iomem_base + sc->sc_iomem_size - 1); + if (err) + goto error; + + err = rman_manage_region(&sc->sc_ioport_rman, sc->sc_ioport_base, + sc->sc_ioport_base + sc->sc_ioport_size - 1); + if (err) + goto error; + err = pcib_mbus_init(sc, sc->sc_busnr, pcib_mbus_maxslots(sc->sc_dev)); if (err) - return(err); + goto error; device_add_child(self, "pci", -1); return (bus_generic_attach(self)); + +error: + rman_fini(&sc->sc_iomem_rman); + rman_fini(&sc->sc_ioport_rman); + return (err); } static int @@ -570,7 +602,7 @@ return (width); addr = (*allocp + mask) & ~mask; - if ((*allocp = addr + size) >= limit) + if ((*allocp = addr + size) > limit) return (-1); if (bootverbose) @@ -634,8 +666,10 @@ pcib_mbus_init_resources(struct pcib_mbus_softc *sc, int bus, int slot, int func, int hdrtype) { + const struct obio_pci_irq_map *map = sc->sc_info->op_pci_irq_map; int maxbar = (hdrtype & PCIM_HDRTYPE) ? 0 : 6; - int bar = 0, irq, pin, i; + int bar = 0, irq = -1; + int pin, i; /* Program the base address registers */ while (bar < maxbar) { @@ -652,8 +686,14 @@ pin = pcib_mbus_read_config(sc->sc_dev, bus, slot, func, PCIR_INTPIN, 1); - if (sc->sc_info->op_get_irq != NULL) - irq = sc->sc_info->op_get_irq(bus, slot, func, pin); + if (map != NULL) + while (map->opim_irq >= 0) { + if ((map->opim_slot == slot || map->opim_slot < 0) && + (map->opim_pin == pin || map->opim_pin < 0)) + irq = map->opim_irq; + + map++; + } else irq = sc->sc_info->op_irq; @@ -728,9 +768,37 @@ pcib_mbus_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + struct pcib_mbus_softc *sc = device_get_softc(dev); + struct rman *rm = NULL; + struct resource *res; - return (BUS_ALLOC_RESOURCE(device_get_parent(dev), child, - type, rid, start, end, count, flags)); + switch (type) { + case SYS_RES_IOPORT: + rm = &sc->sc_ioport_rman; + break; + case SYS_RES_MEMORY: + rm = &sc->sc_iomem_rman; + break; + default: + return (BUS_ALLOC_RESOURCE(device_get_parent(dev), child, + type, rid, start, end, count, flags)); + }; + + res = rman_reserve_resource(rm, start, end, count, flags, child); + if (res == NULL) + return (NULL); + + rman_set_rid(res, *rid); + rman_set_bustag(res, obio_tag); + rman_set_bushandle(res, start); + + if (flags & RF_ACTIVE) + if (bus_activate_resource(child, type, *rid, res)) { + rman_release_resource(res); + return (NULL); + } + + return (res); } static int @@ -738,8 +806,11 @@ struct resource *res) { - return (BUS_RELEASE_RESOURCE(device_get_parent(dev), child, - type, rid, res)); + if (type != SYS_RES_IOPORT && type != SYS_RES_MEMORY) + return (BUS_RELEASE_RESOURCE(device_get_parent(dev), child, + type, rid, res)); + + return (rman_release_resource(res)); } static int ==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mvvar.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * * from: FreeBSD: //depot/projects/arm/src/sys/arm/xscale/pxa2x0/pxa2x0var.h, rev 1 * - * $FreeBSD: src/sys/arm/mv/mvvar.h,v 1.4 2009/01/08 18:31:43 raj Exp $ + * $FreeBSD: src/sys/arm/mv/mvvar.h,v 1.5 2009/01/09 10:20:51 raj Exp $ */ #ifndef _MVVAR_H_ @@ -63,7 +63,11 @@ struct resource_list od_resources; }; -typedef int (*obio_get_irq_t)(u_int bus, u_int slot, u_int func, u_int pin); +struct obio_pci_irq_map { + int opim_slot; + int opim_pin; + int opim_irq; +}; struct obio_pci { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 11 17:05:57 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F171106566B; Sun, 11 Jan 2009 17:05:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F22BA1065670; Sun, 11 Jan 2009 17:05:56 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from pin.if.uz.zgora.pl (pin.if.uz.zgora.pl [212.109.128.251]) by mx1.freebsd.org (Postfix) with ESMTP id B40BE8FC0C; Sun, 11 Jan 2009 17:05:56 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: by pin.if.uz.zgora.pl (Postfix, from userid 1001) id DD16A39BC9; Sun, 11 Jan 2009 17:58:17 +0100 (CET) Date: Sun, 11 Jan 2009 17:58:17 +0100 From: Edward Tomasz Napierala To: Tim Kientzle Message-ID: <20090111165817.GA1144@pin.if.uz.zgora.pl> References: <200901082154.n08Lsxb9097788@repoman.freebsd.org> <4966DF0D.9020302@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-2 Content-Disposition: inline In-Reply-To: <4966DF0D.9020302@freebsd.org> User-Agent: Mutt/1.5.18 (2008-05-17) Cc: Perforce Change Reviews Subject: Re: PERFORCE change 155836 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2009 17:05:58 -0000 Right now it's somewhat stalled. I need to write some more about what this thing does (as for the previous attemps at that, see http://wiki.freebsd.org/NFSv4_ACLs and an email I've sent some time ago to mailing lists and can't find right now due to some problem with archives, available here: http://people.freebsd.org/~trasz/acls-summary.mbox). Then, somebody needs to review all this. On 0108T2122, Tim Kientzle wrote: > Any estimate when the nfs4acl patches will be > merged into -CURRENT? > > I'm hoping to start soon on nfs4acl support for > libarchive and it would be a lot simpler post-merge. > I have a couple of other things to finish up first, > so probably won't get started until mid-February. > > Cheers, > > Tim > > > Edward Tomasz Napierala wrote: > > http://perforce.freebsd.org/chv.cgi?CH=155836 > > > > Change 155836 by trasz@trasz_victim7 on 2009/01/08 21:54:31 > > > > IFC. > > > > Affected files ... > > > > .. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#15 integrate > > .. //depot/projects/soc2008/trasz_nfs4acl/bin/test/test.1#2 integrate > > .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/GNUmakefile#2 integrate > > .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/Makefile#2 integrate > > .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/TODO#2 integrate -- If you cut off my head, what would I say? Me and my head, or me and my body? From owner-p4-projects@FreeBSD.ORG Sun Jan 11 18:18:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46A8C1065674; Sun, 11 Jan 2009 18:18:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 01A63106566C for ; Sun, 11 Jan 2009 18:18:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E299F8FC17 for ; Sun, 11 Jan 2009 18:18:11 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0BIIB9B034887 for ; Sun, 11 Jan 2009 18:18:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0BIIBvx034885 for perforce@freebsd.org; Sun, 11 Jan 2009 18:18:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 11 Jan 2009 18:18:11 GMT Message-Id: <200901111818.n0BIIBvx034885@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 155971 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2009 18:18:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=155971 Change 155971 by rwatson@rwatson_cinnamon on 2009/01/11 18:18:07 Update NEWS for @155879. Affected files ... .. //depot/projects/trustedbsd/openbsm/NEWS#27 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/NEWS#27 (text+ko) ==== @@ -16,6 +16,8 @@ platforms. - Don't compile error strings into bsm_errno.c when building it in the kernel environment. +- When started by launchd, use the label com.apple.auditd rather than + org.trustedbsd.auditd. OpenBSM 1.1 alpha 4 @@ -410,4 +412,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#26 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#27 $ From owner-p4-projects@FreeBSD.ORG Sun Jan 11 18:35:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 724D11065670; Sun, 11 Jan 2009 18:35:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2EEFA106564A for ; Sun, 11 Jan 2009 18:35:30 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1AB4B8FC0A for ; Sun, 11 Jan 2009 18:35:30 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0BIZTe1036520 for ; Sun, 11 Jan 2009 18:35:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0BIZTNc036518 for perforce@freebsd.org; Sun, 11 Jan 2009 18:35:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 11 Jan 2009 18:35:29 GMT Message-Id: <200901111835.n0BIZTNc036518@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 155973 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2009 18:35:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=155973 Change 155973 by rwatson@rwatson_fledge on 2009/01/11 18:35:29 Add OpenBSM 1.1 alpha 5 to the TrustedBSD web site. Affected files ... .. //depot/projects/trustedbsd/www/downloads/openbsm-1.1-alpha5.tgz#1 add .. //depot/projects/trustedbsd/www/news.page#20 edit .. //depot/projects/trustedbsd/www/openbsm.page#35 edit Differences ... ==== //depot/projects/trustedbsd/www/news.page#20 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/news.page#19 $ + $P4: //depot/projects/trustedbsd/www/news.page#20 $ @@ -50,6 +50,15 @@
+
January 11, 2009 OpenBSM 1.1 alpha 5 released
+ +

OpenBSM 1.1 alpha 5 has been released; this is a test release + of OpenBSM, and primarily works to improve portability of audit + trails by converting between more local vs. wire token types, as + well as other improvements and bug fixes. See the OpenBSM web page for more information. +

+
December 19, 2008 OpenBSM 1.1 alpha 4 released

OpenBSM 1.1 alpha 4 has been released; this is a test release ==== //depot/projects/trustedbsd/www/openbsm.page#35 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -53,6 +53,11 @@ Siebrand Mazeland + + + René + Ladan + @@ -96,6 +101,12 @@ + Hoe uw documentatie bijgewerkt te houden met + CVSup. + + + De verschillen tussen de ontwikkeltakken &os.stable; en &os.current;; @@ -149,17 +160,9 @@ Gebaseerd op notities aangeleverd door - - - - René - Ladan - Vertaald door - - - FreeBSD Update + &os; Update updaten en upgraden @@ -695,14 +698,6 @@ Gebaseerd op notities geleverd door - - - - René - Ladan - Vertaald door - - Portsnap: een updategereedschap voor de Portscollectie @@ -714,6 +709,7 @@ updaten en upgraden + Het basissysteem van &os; bevat ook een gereedschap om de Portscollectie bij te werken: het hulpmiddel &man.portsnap.8;. Wanneer het wordt uitgevoerd, zal het een verbinding maken met een @@ -773,6 +769,345 @@ &prompt.root; portsnap fetch update + + + De documentatie bijwerken + + updaten en upgraden + + + documentatie + + updaten en upgraden + + + Naast het basissysteem en de Portscollectie is documentatie + een integraal onderdeel van het besturingssysteem &os;. Hoewel + een actuele versie van de &os;-documentatie altijd beschikbaar is + op de &os; website, hebben + sommige gebruikers een langzame of helemaal geen permanente + netwerkverbinding. Gelukkig zijn er verschillende manieren om de + documentatie die bij elke uitgave wordt geleverd bij te werken + door een lokale kopie van de nieuwste &os;-documentatie bij te + houden. + + + CVSup gebruiken om de documentatie bij te werken + + De bronnen en de geïnstalleerde kopie van de + &os;-documentatie kunnen met CVSup + worden bijgewerkt, waarbij een mechanisme wordt gebruikt dat + lijkt op degene die voor de broncode van het basissysteem wordt + gebruikt (c.f. ). Deze sectie + beschrijft: + + + + Hoe de documentatiegereedschappen, de gereedschappen die + nodig zijn om de &os;-documentatie vanuit de broncode te + herbouwen, te installeren. + + + + Hoe een kopie van de documentatiebronnen in /usr/doc te downloaden door + CVSup te gebruiken. + + + + Hoe de &os;-documentatie vanuit de broncode te herbouwen + en onder /usr/share/doc te + installeren. + + + + Sommige bouwopties die door het bouwsysteem van de + documentatie ondersteund worden, i.e. de opties die slechts + enkele van de verschillende vertalingen van de documentatie + bouwen of de opties die een specifiek uitvoerformaat + selecteren. + + + + + + CVSup en de documentatiegereedschappen installeren + + Voor het herbouwen van de &os;-documentatie vanuit de + broncode is een aardig grote verzameling gereedschappen nodig. + Deze gereedschappen zijn geen deel van het basissysteem van &os; + omdat ze een grote hoeveelheid schijfruimte nodig hebben en niet + voor alle &os;-gebruikers nuttig zijn; ze zijn alleen nuttig + voor die gebruikers die actief nieuwe documentatie voor &os; + schrijven of regelmatig hun documentatie vanuit de broncode + bijwerken. + + Alle benodigde gereedschappen zijn beschikbaar als deel van + de Portscollectie. De port textproc/docproj is een meesterport + die door het &os; Documentatieproject is ontwikkeld om de + installatie en toekomstige updates van deze gereedschappen + makkelijker te maken. + + + Wanneer er geen &postscript;- of PDF-documentatie nodig + is, kan men overwegen om in plaats hiervan de port textproc/docproj-nojadetex te + installeren. Deze versie van de documentatiegereedschappen + bevat alles behalve de typesetting-engine + teTeX. + teTeX is een erg grote verzameling + van gereedschappen, dus kan het zinvol zijn om de installatie + ervan achterwege te laten als PDF-uitvoer niet echt nodig + is. + + + Bekijk CVSup gebruiken voor + meer informatie over het installeren en gebruiken van + CVSup. + + + + De documentatiebroncode bijwerken + + Het hulpmiddel CVSup kan een + schone kopie van de documentatiebroncode ophalen, door het + bestand + /usr/share/examples/cvsup/doc-supfile + als een configuratiesjabloon te gebruiken. Voor de standaard + update-host is in doc-supfile een nog in te + vullen waarde ingevuld, maar &man.cvsup.1; accepteert een + hostnaam via de opdrachtregel, dus kan de documentatiebroncode + van een van de CVSup-servers worden + opgehaald door het volgende te typen: + + &prompt.root; cvsup -h cvsup.FreeBSD.org -g -L 2 /usr/share/examples/cvsup/doc-supfile + + Verander cvsup.FreeBSD.org in de + dichtstbijzijnde CVSup-server. Zie + voor een complete lijst van + spiegelsites. + + De initiële download van de documentatiebroncode kan + een tijd duren. Laat het draaien totdat het voltooid is. + + Toekomstige updates van de documentatiebroncode kunnen + opgehaald worden door hetzelfde commando te draaien. Het + hulpmiddel CVSup downloadt en + kopieert alleen de updates sinds de laatste keer dat het + gedraaid werd, dus zou elke keer dat + CVSup gedraaid wordt na de eerste + complete keer redelijk snel moeten zijn. + + Nadat de broncode is uitgecheckt, wordt een alternatieve + manier om de documentatie bij te werken ondersteund door + Makefile van de map /usr/doc. Door + SUP_UPDATE, SUP_HOST, en + DOCSUPFILE in het bestand + /etc/make.conf in te stellen, is het + mogelijk om dit te draaien: + + &prompt.root; cd /usr/doc +&prompt.root; make update + + Een typische verzameling van deze &man.make.1;-opties voor + /etc/make.conf is: + + SUP_UPDATE= yes +SUPHOST?= cvsup.FreeBSD.org +DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile + + + Het instellen van de waardes SUPHOST en + DOCSUPFILE met ?= staat + toe dat ze in de opdrachtregel van make overschreven worden. + Dit is de aangeraden manier om opties aan + /etc/make.conf toe te voegen, om te + voorkomen dat het bestand telkens wanneer er een andere waarde + van de optie getest moet worden bewerkt moet worden. + + + + + Instelbare opties van de documentatiebroncode + + Het bijwerk- en bouwsysteem van de &os;-documentatie + ondersteunt enkele opties die het proces om de documentatie + alleen gedeeltelijk bij te werken, of om specifieke vertalingen + te bouwen, makkelijker maken. Deze opties kunnen of als + systeemwijde opties in het bestand + /etc/make.conf worden ingesteld, of als + opdrachtregelopties aan het hulpmiddel &man.make.1; worden + doorgegeven. + + De volgende opties zijn er enkelen van: + + + + DOC_LANG + + + De lijst van te bouwen en te installeren talen en + coderingen, bijvoorbeeld + en_US.ISO8859-1 voor alleen de Engelse + documentatie. + + + + + FORMATS + + + Een enkel formaat of een lijst van uitvoerformaten die + gebouwd moeten worden. Momenteel worden + html, html-split, + txt, ps, + pdf, en rtf + ondersteund. + + + + + SUPHOST + + + De hostnaam van de CVSup + server die gebruikt wordt tijdens het bijwerken. + + + + + Bekijk &man.make.conf.5; voor meer make-variabelen die als + systeemwijde opties in &os; worden ondersteund. + + Voor meer make-variabelen die die door het bouwsysteem van + de &os;-documentatie ondersteund worden, wordt naar het &os; Documentation + Project Primer for New Contributors verwezen. + + + + De &os;-documentatie vanuit de broncode installeren + + Wanneer er een actueel snapshot van de documentatiebroncode + is opgehaald in /usr/doc, + is alles gereed om de geïnstalleerde documentatie bij te + werken. + + Het volledig bijwerken van alle talen die in de + Makefile-optie DOC_LANG zijn gedefinieerd kan + worden gedaan door te typen: + + &prompt.root; cd /usr/doc +&prompt.root; make install clean + + Als make.conf is ingesteld met de + juiste opties voor DOCSUPFILE, + SUPHOST, en SUP_UPDATE, + dan kan de installatiestap worden gecombineerd met het bijwerken + van de documentatiebroncode door te typen: + + &prompt.root; cd /usr/doc +&prompt.root; make update install clean + + Als alleen het bijwerken van een specifieke taal gewenst is, + dan kan &man.make.1; worden aangeroepen in een taalspecifieke + submap van /usr/doc, + i.e.: + + &prompt.root; cd /usr/doc/en_US.ISO8859-1 +&prompt.root; make update install clean + + De te installeren uitvoerformaten kunnen worden + gespecificeerd door de make-variabele FORMATS + in te stellen, i.e.: + + &prompt.root; cd /usr/doc +&prompt.root; make FORMATS='html html-split' install clean + + + + + + + + Pav + Lucistnik + Gebaseerd op informatie geleverd door + + + + + Docsnap gebruiken + + updaten en upgraden + + + Docsnap + + updaten en upgraden + + + Docscnap is een + &man.rsync.1;-reservoir voor het bijwerken van + geïnstalleerde &os;-documentatie op een relatief + gemakkelijke en snelle manier. Een + Docsnap server volgt + de documentatiebroncode en bouwt ze elk uur in HTML-formaat. De + port textproc/docproj is + niet nodig met Docsnap aangezien er + alleen patches voor de gebouwde documentatie bestaan. + + De enige benodigdheid om deze techniek te gebruiken is de + port of het pakket net/rsync. Gebruik het volgende + commando om het toe te voegen: + + &prompt.root; pkg_add -r rsync + + + Docsnap is eigenlijk ontwikkeld + om de documentatie die in /usr/share/doc is + geïnstalleerd bij te werken, maar de volgende voorbeelden + kunnen ook voor andere mappen worden gebruikt. Voor + gebruikersmappen heeft het geen + root-rechten nodig. + + + Geef het volgende commando om de documentatie bij te + werken: + + &prompt.root; rsync -rltvz docsnap.sk.FreeBSD.org::docsnap /usr/share/doc + + + Er is momenteel slechts één + Docsnap-server; de bovengenoemde + host docsnap.sk.FreeBSD.org. + + + Gebruik hier niet de vlag omdat er + tijdens make installworld wat dingen in + /usr/share/doc worden + geïnstalleerd, die dan per ongeluk verwijderd zouden + worden. Gebruik in plaats daarvan dit commando om op te + ruimen: + + &prompt.root; rsync -rltvz --delete docsnap.sk.FreeBSD.org::docsnap/??_??\.\* /usr/share/doc + + Het volgende commando dient gebruikt te worden als er een + deelverzameling van de documentatie, bijvoorbeeld + alleen de Engelse documentatie, bijgewerkt moet worden: + + &prompt.root; rsync -rltvz docsnap.sk.FreeBSD.org::docsnap/en_US.ISO8859-1 /usr/share/doc + +]]> + + Een ontwikkelingstak volgen From owner-p4-projects@FreeBSD.ORG Sun Jan 11 23:20:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55DA21065673; Sun, 11 Jan 2009 23:20:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 13E0A106566B for ; Sun, 11 Jan 2009 23:20:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 021AC8FC12 for ; Sun, 11 Jan 2009 23:20:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0BNKMIR083136 for ; Sun, 11 Jan 2009 23:20:22 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0BNKMWD083134 for perforce@freebsd.org; Sun, 11 Jan 2009 23:20:22 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 11 Jan 2009 23:20:22 GMT Message-Id: <200901112320.n0BNKMWD083134@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 155990 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2009 23:20:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=155990 Change 155990 by hselasky@hselasky_laptop001 on 2009/01/11 23:19:42 Add USB scanner support to USB2 config files. Affected files ... .. //depot/projects/usb/src/sys/amd64/conf/USB2#2 edit .. //depot/projects/usb/src/sys/i386/conf/USB2#2 edit Differences ... ==== //depot/projects/usb/src/sys/amd64/conf/USB2#2 (text+ko) ==== @@ -108,3 +108,7 @@ # USB sound and MIDI device support #device usb2_sound + +# USB scanner support +device usb2_image +device usb2_scanner ==== //depot/projects/usb/src/sys/i386/conf/USB2#2 (text+ko) ==== @@ -108,3 +108,7 @@ # USB sound and MIDI device support #device usb2_sound + +# USB scanner support +device usb2_image +device usb2_scanner From owner-p4-projects@FreeBSD.ORG Mon Jan 12 02:05:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5DDD01065672; Mon, 12 Jan 2009 02:05:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1D0ED106564A for ; Mon, 12 Jan 2009 02:05:47 +0000 (UTC) (envelope-from weongyo.jeong@gmail.com) Received: from wa-out-1112.google.com (wa-out-1112.google.com [209.85.146.177]) by mx1.freebsd.org (Postfix) with ESMTP id DD7BF8FC1D for ; Mon, 12 Jan 2009 02:05:46 +0000 (UTC) (envelope-from weongyo.jeong@gmail.com) Received: by wa-out-1112.google.com with SMTP id m34so5877162wag.27 for ; Sun, 11 Jan 2009 18:05:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:date:to:cc:subject :message-id:reply-to:references:mime-version:content-type :content-disposition:in-reply-to:user-agent:organization :x-operation-sytem:from; bh=MSDcP12TK4R5kB57+HB78+xYkjiLuzU2CY6am/fJDPA=; b=Qqlff+dvi87U87lB46zIpt2xOxDBnXOx1fW6KjpXZZwRRjMDGk8pJnFG6mNgzjFWYo 2PyhR90udNmp2nqDj3rc/naYB/PVsnwzvD3FTGliNdRvh6uIzXAlcrvMMAgWGH0PgwYt DHlaZkP4WYppc7zk16om73ywKcdI9rNc6IMOA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:to:cc:subject:message-id:reply-to:references:mime-version :content-type:content-disposition:in-reply-to:user-agent :organization:x-operation-sytem:from; b=Xv8vxo38VfedMcL1ajW0VOF6SD+/ag4CpcB3GjOuQpJ7CwA6xsFUn28D4O3JLueJzn QxFxPBzdR8yXLwyC4RFGpIahs7QFdEphM0zMEn5pPlbGu/XRdVeBojmn7XNQbpQYYn5S FWSrPeK9k3rx2pi7Eg5SU1Fb2sCkP/LehVogA= Received: by 10.115.110.15 with SMTP id n15mr18679070wam.144.1231724031197; Sun, 11 Jan 2009 17:33:51 -0800 (PST) Received: from freebsd.weongyo.org ([211.53.35.67]) by mx.google.com with ESMTPS id m29sm44617209poh.6.2009.01.11.17.33.48 (version=SSLv3 cipher=RC4-MD5); Sun, 11 Jan 2009 17:33:50 -0800 (PST) Received: by freebsd.weongyo.org (sSMTP sendmail emulation); Mon, 12 Jan 2009 10:33:31 +0900 Date: Mon, 12 Jan 2009 10:33:31 +0900 To: Hans Petter Selasky Message-ID: <20090112013331.GA29564@freebsd.weongyo.org> References: <200901100859.n0A8xdmW025069@repoman.freebsd.org> <200901101138.02533.hselasky@c2i.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200901101138.02533.hselasky@c2i.net> User-Agent: Mutt/1.4.2.3i Organization: CDNetworks. X-Operation-Sytem: FreeBSD From: Weongyo Jeong Cc: Perforce Change Reviews Subject: Re: PERFORCE change 155896 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Weongyo Jeong List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jan 2009 02:05:48 -0000 On Sat, Jan 10, 2009 at 11:38:01AM +0100, Hans Petter Selasky wrote: > On Saturday 10 January 2009, Weongyo Jeong wrote: > > http://perforce.freebsd.org/chv.cgi?CH=155896 > > > > Change 155896 by weongyo@weongyo_ws on 2009/01/10 08:59:26 > > > > In USB 2.0 specification The USB System Software should guarantees > > a minumum of 10ms for reset recovery but it looks the USB1 framework > > doesn't follow it. So it looks sometimes it failed to re-attach or > > reenumerate devices after the device reset. > > > > With this patch, the fw loading operation of uath(4) works. > > > > Affected files ... > > > > .. //depot/projects/vap/sys/dev/usb/usb.c#8 edit > > > > Hi, > > This is not the right place to patch. > > I think this delay belongs somewhere in "uhub.c". Please search for the > following defines in the code: > > #define USB_PORT_RESET_DELAY 50 /* ms */ > #define USB_PORT_ROOT_RESET_DELAY 250 /* ms */ > #define USB_PORT_RESET_RECOVERY 250 /* ms */ > > There should already be a delay there. Maybe you need to increase one of these > macros. Oops. Ok I'll try to fix it. Thank you for noticing about it. regards, Weongyo Jeong From owner-p4-projects@FreeBSD.ORG Mon Jan 12 04:30:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 30B46106577D; Mon, 12 Jan 2009 04:30:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E4857106567A for ; Mon, 12 Jan 2009 04:30:38 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D17F38FC08 for ; Mon, 12 Jan 2009 04:30:38 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0C4UcIq022797 for ; Mon, 12 Jan 2009 04:30:38 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0C4Ucsw022795 for perforce@freebsd.org; Mon, 12 Jan 2009 04:30:38 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 12 Jan 2009 04:30:38 GMT Message-Id: <200901120430.n0C4Ucsw022795@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 156000 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Jan 2009 04:30:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=156000 Change 156000 by gonzo@gonzo_figaro on 2009/01/12 04:30:08 - More stuff for PCI core initialization - Add resources/interrupts management code Affected files ... .. //depot/projects/mips2/src/sys/dev/siba/siba_pcib.c#7 edit .. //depot/projects/mips2/src/sys/dev/siba/siba_pcibvar.h#5 edit .. //depot/projects/mips2/src/sys/dev/siba/sibareg.h#5 edit Differences ... ==== //depot/projects/mips2/src/sys/dev/siba/siba_pcib.c#7 (text+ko) ==== @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -86,14 +87,11 @@ * TODO: code cleanup. */ -static int siba_pcib_activate_resource(device_t, device_t, int, - int, struct resource *); static struct resource * siba_pcib_alloc_resource(device_t, device_t, int, int *, u_long , u_long, u_long, u_int); static int siba_pcib_attach(device_t); -static int siba_pcib_deactivate_resource(device_t, device_t, int, - int, struct resource *); +static int siba_pcib_intr(void *); static int siba_pcib_maxslots(device_t); static int siba_pcib_probe(device_t); static uint32_t @@ -126,23 +124,19 @@ return (ENXIO); } -//extern int rman_debug; - static int siba_pcib_attach(device_t dev) { struct siba_pcib_softc *sc = device_get_softc(dev); int rid; uint32_t ctl; - uint16_t vid, svid; - + sc->sc_dev = dev; /* * Allocate the resources which the parent bus has already * determined for us. */ rid = MIPS_MEM_RID; /* XXX */ - //rman_debug = 1; sc->sc_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); if (sc->sc_mem == NULL) { @@ -171,44 +165,61 @@ SBPCI_WRITE_4(sc, SIBA_PCI_TRANS0, SIBA_PCI_TRANS_IO); SBPCI_WRITE_4(sc, SIBA_PCI_TRANS1, SIBA_PCI_TRANS_CFG0); - SBPCI_WRITE_4(sc, SIBA_PCI_TRANS2, SIBA_PCI_TRANS_MEM); + SBPCI_WRITE_4(sc, SIBA_PCI_TRANS2, + SIBA_PCI_TRANS_MEM | SIBA_PCI_MEM_START); + DELAY(100); - vid = siba_pcib_read_config(dev, 0, 0, 0, 0, 2); - svid = siba_pcib_read_config(dev, 0, 0, 0, 2, 2); - printf("bridge vid=%08x, svid=%08x\n", vid, svid); + siba_pcib_write_config(dev, 0, 0, 0, PCIR_COMMAND, + PCIM_CMD_BUSMASTEREN | PCIM_CMD_MEMEN, 2); + siba_pcib_write_config(dev, 0, 0, 0, PCIR_STATUS, + 0, 2); + DELAY(100); + SBPCI_WRITE_4(sc, SIBA_PCI_BP_INTR_MASK, SIBA_PCI_BP_INTR_MASK_INTA); -#if 0 - bus_space_handle_t sc_cfg_hand; - int error; - /* - * XXX this doesn't actually do anything on mips; however... should - * we not be mapping to KSEG1? we need to wire down the range. + * Initialize resource managers */ - error = bus_space_map(sc->sc_bt, SBPCI_CFGBASE, SBPCI_CFGSIZE, - 0, &sc_cfg_hand); - if (error) { - device_printf(dev, "cannot map PCI configuration space\n"); - return (ENXIO); + sc->sc_mem_rman.rm_type = RMAN_ARRAY; + sc->sc_mem_rman.rm_descr = "SiBa PCI core memory"; + if (rman_init(&sc->sc_mem_rman) != 0 || + rman_manage_region(&sc->sc_mem_rman, SIBA_PCI_MEM_START, + SIBA_PCI_MEM_START + SIBA_PCI_MEM_SIZE - 1) != 0) { + panic("siba_pcib_attach: failed to set up memory rman"); + } + + sc->sc_io_rman.rm_type = RMAN_ARRAY; + sc->sc_io_rman.rm_descr = "SiBa PCI core memory"; + if (rman_init(&sc->sc_io_rman) != 0 || + rman_manage_region(&sc->sc_io_rman, SIBA_PCI_IO_START, + SIBA_PCI_IO_START + SIBA_PCI_IO_SIZE - 1) != 0) { + panic("siba_pcib_attach: failed to set up memory rman"); } - device_printf(dev, "mapped pci config space at 0x%08x\n", - (uint32_t)sc_cfg_hand); + + sc->sc_irq_rman.rm_type = RMAN_ARRAY; + sc->sc_irq_rman.rm_descr = "SiBa PCI core IRQs"; + if (rman_init(&sc->sc_irq_rman) != 0 || + rman_manage_region(&sc->sc_irq_rman, 0, + 99) != 0) + panic("siba_pcib_attach: failed to set up IRQ rman"); - /* - * Setup configuration, io, and dma space windows. - * XXX we need to be able to do type 1 too. - * we probably don't need to be able to do i/o cycles. - */ - SBPCI_WRITE_4(sc->sc_mem, SBPCI_SBTOPCI0, 1); /* I/O read/write window */ - SBPCI_WRITE_4(sc->sc_mem, SBPCI_SBTOPCI1, 2); /* type 0 configuration only */ - SBPCI_WRITE_4(sc->sc_mem, SBPCI_SBTOPCI2, 1 << 30); /* memory only */ - DELAY(500); + /* Hook up our interrupt handler. */ + rid = 0; + if ((sc->sc_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, + 0UL, ~0UL, 1, + RF_SHAREABLE | RF_ACTIVE)) == NULL) { + device_printf(dev, "unable to allocate IRQ resource\n"); + return ENXIO; + } - /* XXX resource managers */ -#endif + if ((bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_MISC, + siba_pcib_intr, NULL, sc, &sc->sc_ih))) { + device_printf(dev, + "WARNING: unable to register interrupt handler\n"); + return ENXIO; + } device_add_child(dev, "pci", -1); return (bus_generic_attach(dev)); @@ -240,6 +251,7 @@ struct siba_pcib_softc *sc; sc = device_get_softc(dev); + switch (which) { case PCIB_IVAR_BUS: sc->sc_bus = value; @@ -251,12 +263,29 @@ static int siba_pcib_setup_intr(device_t dev, device_t child, struct resource *ires, - int flags, driver_filter_t *filt, driver_intr_t *intr, void *arg, + int flags, driver_filter_t *filt, driver_intr_t *handler, void *arg, void **cookiep) { + struct siba_pcib_softc *sc = device_get_softc(dev); + struct intr_event *event; + int irq, error; + + irq = rman_get_start(ires); + + event = sc->sc_irq_event; + if (event == NULL) { + error = intr_event_create(&event, (void *)irq, 0, irq, + (mask_fn)mips_mask_irq, (mask_fn)mips_unmask_irq, + (mask_fn)mips_unmask_irq, NULL, "siba_pcib intr%d:", irq); + if (error) + return 0; + sc->sc_irq_event = event; + } + + intr_event_add_handler(event, device_get_nameunit(child), filt, + handler, arg, intr_priority(flags), flags, cookiep); - return (BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, - filt, intr, arg, cookiep)); + return (0); } static int @@ -264,75 +293,65 @@ void *cookie) { - return (BUS_TEARDOWN_INTR(device_get_parent(dev), child, vec, cookie)); + return (intr_event_remove_handler(cookie)); +} + +static int +siba_pcib_intr(void *v) +{ + struct siba_pcib_softc *sc = v; + struct intr_event *event; + + event = sc->sc_irq_event; + + if (!event || TAILQ_EMPTY(&event->ie_handlers)) + return FILTER_STRAY; + + /* TODO: frame instead of NULL? */ + intr_event_handle(event, NULL); + /* XXX: Log stray IRQs */ + + return FILTER_HANDLED; } + static struct resource * siba_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, unsigned int flags) { -#if 1 + struct siba_pcib_softc *sc = device_get_softc(bus); + struct resource *rv = NULL; + struct rman *rm; - //device_printf(bus, "%s: not yet implemented\n", __func__); - return (NULL); -#else - bus_space_tag_t tag; - struct siba_pcib_softc *sc = device_get_softc(bus); - struct rman *rmanp; - struct resource *rv; - - tag = 0; - rv = NULL; switch (type) { case SYS_RES_IRQ: - rmanp = &sc->sc_irq_rman; + rm = &sc->sc_irq_rman; break; - case SYS_RES_MEMORY: - rmanp = &sc->sc_mem_rman; - tag = &sc->sc_pci_memt; + rm = &sc->sc_mem_rman; + break; + case SYS_RES_IOPORT: + rm = &sc->sc_io_rman; break; - default: - return (rv); + return (NULL); } - rv = rman_reserve_resource(rmanp, start, end, count, flags, child); - if (rv != NULL) { - rman_set_rid(rv, *rid); - if (type == SYS_RES_MEMORY) { -#if 0 - rman_set_bustag(rv, tag); - rman_set_bushandle(rv, rman_get_bushandle(sc->sc_mem) + - (rman_get_start(rv) - IXP425_PCI_MEM_HWBASE)); -#endif - } - } + rv = rman_reserve_resource(rm, start, end, count, flags, child); - return (rv); -#endif -} + if (rv == NULL) + return (NULL); -static int -siba_pcib_activate_resource(device_t bus, device_t child, int type, int rid, - struct resource *r) -{ + rman_set_rid(rv, *rid); - device_printf(bus, "%s: not yet implemented\n", __func__); - device_printf(bus, "%s called activate_resource\n", - device_get_nameunit(child)); - return (ENXIO); -} + if (flags & RF_ACTIVE) { + if (bus_activate_resource(child, type, *rid, rv)) { + rman_release_resource(rv); + return (NULL); + } + } -static int -siba_pcib_deactivate_resource(device_t bus, device_t child, int type, int rid, - struct resource *r) -{ - - device_printf(bus, "%s: not yet implemented\n", __func__); - device_printf(bus, "%s called deactivate_resource\n", - device_get_nameunit(child)); - return (ENXIO); + return (rv); } static int @@ -424,7 +443,7 @@ return (val); break; default: - panic("%s: wrong bytes count", __func__); + panic("%s: wrong bytes count: %d", __func__, bytes); break; } } @@ -475,7 +494,7 @@ case 4: break; default: - panic("%s: wrong bytes count", __func__); + panic("%s: wrong bytes count: %d", __func__, bytes); break; } @@ -486,8 +505,8 @@ siba_pcib_route_interrupt(device_t bridge, device_t device, int pin) { - //device_printf(bridge, "%s: not yet implemented\n", __func__); - return (-1); + /* It doesn't matter actually, all devices share PCI core interrupt */ + return (0); } static device_method_t siba_pcib_methods[] = { @@ -502,8 +521,8 @@ DEVMETHOD(bus_setup_intr, siba_pcib_setup_intr), DEVMETHOD(bus_teardown_intr, siba_pcib_teardown_intr), DEVMETHOD(bus_alloc_resource, siba_pcib_alloc_resource), - DEVMETHOD(bus_activate_resource, siba_pcib_activate_resource), - DEVMETHOD(bus_deactivate_resource, siba_pcib_deactivate_resource), + DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), + DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_release_resource, siba_pcib_release_resource), /* pcib interface */ ==== //depot/projects/mips2/src/sys/dev/siba/siba_pcibvar.h#5 (text+ko) ==== @@ -36,21 +36,18 @@ bus_write_4((sc)->sc_mem, (reg), (val)) struct siba_pcib_softc { - device_t sc_dev; /* Device ID */ - u_int sc_bus; /* PCI bus number */ - struct resource *sc_mem; /* siba memory window */ - struct resource *sc_csr; /* config space */ + device_t sc_dev; /* Device ID */ + uintptr_t sc_bus; + + struct resource *sc_mem; -#if 0 - bus_space_tag_t sc_bt; - bus_space_handle_t sc_bh; - bus_addr_t sc_maddr; - bus_size_t sc_msize; + struct resource *sc_irq; + struct intr_event *sc_irq_event; + void *sc_ih; - struct bus_space sc_pci_memt; - struct bus_space sc_pci_iot; - bus_dma_tag_t sc_dmat; -#endif + struct rman sc_mem_rman; + struct rman sc_io_rman; + struct rman sc_irq_rman; }; #endif /* _SIBA_PCIBVAR_H_ */ ==== //depot/projects/mips2/src/sys/dev/siba/sibareg.h#5 (text+ko) ==== @@ -103,6 +103,8 @@ #define SIBA_PCI_BP_INTR_STATUS 0x0020 #define SIBA_PCI_BP_INTR_MASK 0x0024 +#define SIBA_PCI_BP_INTR_MASK_INTA 0x01 +#define SIBA_PCI_BP_INTR_MASK_INTB 0x02 #define SIBA_PCI_BP_PCI_MBOX 0x0028 #define SIBA_PCI_BP_BCAST_ADDR 0x0050 @@ -121,4 +123,10 @@ #define SIBA_PCI_TRANS1 0x0104 #define SIBA_PCI_TRANS2 0x0108 +/* PCIcore resources */ +#define SIBA_PCI_MEM_START 0x40000000UL +#define SIBA_PCI_MEM_SIZE 0x40000000UL +#define SIBA_PCI_IO_START 0x100 +#define SIBA_PCI_IO_SIZE 0x700 + #endif /* _SIBA_SIBAREG_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Jan 12 08:01:16 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19ECE1065670; Mon, 12 Jan 2009 08:01:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E9B04106566C for ; Mon, 12 Jan 2009 08:01:12 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BD4CE8FC19 for ; Mon, 12 Jan 2009 08:01:12 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0C81CUH051362 for ; Mon, 12 Jan 2009 08:01:12 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0C81Com051360 for perforce@freebsd.org; Mon, 12 Jan 2009 08:01:12 GMT (envelope-from weongyo@FreeBSD.org) Date: Mon, 12 Jan 2009 08:01:12 GMT Message-Id: <200901120801.n0C81Com051360@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 156003 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Jan 2009 08:01:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=156003 Change 156003 by weongyo@weongyo_ws on 2009/01/12 08:00:31 Commits uathload and the firmware image to be used with uath(4) that I think it needs better name instead of ar5523.bin like ar5523-$ver.fw.uu or other forms but don't know the infomation of the version. Affected files ... .. //depot/projects/vap/sys/contrib/dev/uath/ar5523.bin.uu#1 add .. //depot/projects/vap/usr.sbin/uathload/Makefile#1 add .. //depot/projects/vap/usr.sbin/uathload/uathload.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jan 12 08:32:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7EE9B1065672; Mon, 12 Jan 2009 08:32:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3F0FB106566C for ; Mon, 12 Jan 2009 08:32:45 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 132178FC13 for ; Mon, 12 Jan 2009 08:32:45 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0C8WikR054492 for ; Mon, 12 Jan 2009 08:32:44 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0C8WiWL054490 for perforce@freebsd.org; Mon, 12 Jan 2009 08:32:44 GMT (envelope-from weongyo@FreeBSD.org) Date: Mon, 12 Jan 2009 08:32:44 GMT Message-Id: <200901120832.n0C8WiWL054490@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 156004 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Jan 2009 08:32:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=156004 Change 156004 by weongyo@weongyo_ws on 2009/01/12 08:31:49 add myself Affected files ... .. //depot/projects/vap/sys/dev/usb/if_uath.c#2 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_uath.c#2 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2006 Sam Leffler, Errno Consulting + * Copyright (c) 2008 Weongyo Jeong * All rights reserved. * * Redistribution and use in source and binary forms, with or without From owner-p4-projects@FreeBSD.ORG Mon Jan 12 08:33:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DADF1065673; Mon, 12 Jan 2009 08:33:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4DCB11065670 for ; Mon, 12 Jan 2009 08:33:46 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3BEFF8FC0A for ; Mon, 12 Jan 2009 08:33:46 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0C8Xk2T054600 for ; Mon, 12 Jan 2009 08:33:46 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0C8Xkek054598 for perforce@freebsd.org; Mon, 12 Jan 2009 08:33:46 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 12 Jan 2009 08:33:46 GMT Message-Id: <200901120833.n0C8Xkek054598@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 156005 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Jan 2009 08:33:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=156005 Change 156005 by hselasky@hselasky_laptop001 on 2009/01/12 08:33:37 Add missing set frame data pointer call. The function call was missed when zero copy was introduced in UMASS. Reported by: WATANABE Kazuhiro. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#21 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#21 (text+ko) ==== @@ -2414,6 +2414,9 @@ } xfer->timeout = sc->sc_transfer.data_timeout; + if (xfer->flags.ext_buffer) { + usb2_set_frame_data(xfer, sc->sc_transfer.data_ptr, 0); + } xfer->frlengths[0] = max_bulk; usb2_start_hardware(xfer); return; From owner-p4-projects@FreeBSD.ORG Mon Jan 12 15:57:19 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 685A11065676; Mon, 12 Jan 2009 15:57:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E1A6B106566C for ; Mon, 12 Jan 2009 15:57:17 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CFB308FC17 for ; Mon, 12 Jan 2009 15:57:17 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0CFvHZf035828 for ; Mon, 12 Jan 2009 15:57:17 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0CFvHbW035826 for perforce@freebsd.org; Mon, 12 Jan 2009 15:57:17 GMT (envelope-from nwhitehorn@freebsd.org) Date: Mon, 12 Jan 2009 15:57:17 GMT Message-Id: <200901121557.n0CFvHbW035826@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 156012 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Jan 2009 15:57:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=156012 Change 156012 by nwhitehorn@nwhitehorn_trantor on 2009/01/12 15:56:33 First crack at making /dev/mem work on systems without a direct map. This is currently broken if you try to dd multiple consecutive pages, but reading at a random offset does work, which is enough to make X11 work on my iMac G5. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/powerpc/mem.c#3 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/powerpc/mem.c#3 (text+ko) ==== @@ -64,6 +64,7 @@ #include #include #include +#include #include @@ -77,6 +78,8 @@ int error = 0; vm_offset_t va, eva, off, v; vm_prot_t prot; + struct vm_page m; + vm_page_t marr; vm_size_t cnt; cnt = 0; @@ -102,14 +105,18 @@ cnt = min(cnt, PAGE_SIZE - off); cnt = min(cnt, iov->iov_len); - if (mem_valid(v, cnt) - && pmap_dev_direct_mapped(v, cnt)) { + if (mem_valid(v, cnt)) { error = EFAULT; break; } - - uiomove((void *)v, cnt, uio); - break; + + if (!pmap_dev_direct_mapped(v, cnt)) { + error = uiomove((void *)v, cnt, uio); + } else { + m.phys_addr = trunc_page(v); + marr = &m; + error = uiomove_fromphys(&marr, off, cnt, uio); + } } else if (dev2unit(dev) == CDEV_MINOR_KMEM) { va = uio->uio_offset; From owner-p4-projects@FreeBSD.ORG Mon Jan 12 16:58:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3F12106567C; Mon, 12 Jan 2009 16:58:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 733591065670 for ; Mon, 12 Jan 2009 16:58:20 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5E2B18FC23 for ; Mon, 12 Jan 2009 16:58:20 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0CGwKMg052369 for ; Mon, 12 Jan 2009 16:58:20 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0CGwKKN052367 for perforce@freebsd.org; Mon, 12 Jan 2009 16:58:20 GMT (envelope-from gabor@freebsd.org) Date: Mon, 12 Jan 2009 16:58:20 GMT Message-Id: <200901121658.n0CGwKKN052367@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 156019 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Jan 2009 16:58:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=156019 Change 156019 by gabor@gabor_server on 2009/01/12 16:58:06 IFC Affected files ... .. //depot/projects/soc2008/gabor_textproc/src/share/mk/bsd.own.mk#5 integrate .. //depot/projects/soc2008/gabor_textproc/src/usr.bin/grep/Makefile#5 integrate .. //depot/projects/soc2008/gabor_textproc/src/usr.bin/grep/file.c#7 integrate .. //depot/projects/soc2008/gabor_textproc/src/usr.bin/grep/grep.c#5 integrate .. //depot/projects/soc2008/gabor_textproc/src/usr.bin/grep/grep.h#5 integrate Differences ... ==== //depot/projects/soc2008/gabor_textproc/src/share/mk/bsd.own.mk#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.own.mk,v 1.78 2008/09/21 22:02:26 sam Exp $ +# $FreeBSD: src/share/mk/bsd.own.mk,v 1.79 2009/01/08 12:22:37 bz Exp $ # # The include file set common variables for owner, # group, mode, and directories. Defaults are in brackets. @@ -44,9 +44,9 @@ # KMODDIR Base path for loadable kernel modules # (see kld(4)). [/boot/kernel] # -# KMODOWN KLD owner. [${BINOWN}] +# KMODOWN Kernel and KLD owner. [${BINOWN}] # -# KMODGRP KLD group. [${BINGRP}] +# KMODGRP Kernel and KLD group. [${BINGRP}] # # KMODMODE KLD mode. [${BINMODE}] # ==== //depot/projects/soc2008/gabor_textproc/src/usr.bin/grep/Makefile#5 (text+ko) ==== @@ -20,6 +20,12 @@ LDADD= -lz -lbz2 DPADD= ${LIBZ} ${LIBBZ2} +.if !defined(WITHOUT_GNU_COMPAT) +CFLAGS+= -I/usr/include/gnu +LDADD+= -lgnuregex +DPADD+= ${LIBGNUREGEX} +.endif + .if !defined(WITHOUT_NLS) NLS= hu_HU.ISO8859-2 NLS+= pt_BR.ISO8859-1 ==== //depot/projects/soc2008/gabor_textproc/src/usr.bin/grep/file.c#7 (text+ko) ==== @@ -132,8 +132,10 @@ /* Only pre-read to the buffer if we need the binary check. */ if (binbehave != BINFILE_TEXT) { - if (stat(fname, &st) != 0) - errx(2, NULL); + if (f->stdin == 1) + st.st_size = MAXBUFSIZ; + else if (stat(fname, &st) != 0) + err(2, NULL); bufsiz = (MAXBUFSIZ > (st.st_size * PREREAD_M)) ? (st.st_size / 2) : MAXBUFSIZ; @@ -183,8 +185,10 @@ f = grep_malloc(sizeof *f); - if ((f->f = fdopen(STDIN_FILENO, "r")) != NULL) + if ((f->f = fdopen(STDIN_FILENO, "r")) != NULL) { + f->stdin = 1; return (f); + } free(f); return (NULL); @@ -202,6 +206,7 @@ f = grep_malloc(sizeof *f); + f->stdin = 0; switch (filebehave) { case FILE_STDIO: if ((f->f = fopen(path, "r")) != NULL) ==== //depot/projects/soc2008/gabor_textproc/src/usr.bin/grep/grep.c#5 (text+ko) ==== @@ -82,7 +82,7 @@ }; /* Flags passed to regcomp() and regexec() */ -int cflags; +int cflags = 0; int eflags = REG_STARTEND; /* Shortcut for matching all cases like empty regex */ @@ -237,27 +237,9 @@ if (len > 0 && pat[len - 1] == '\n') --len; /* pat may not be NUL-terminated */ - if (wflag && !(grepbehave == GREP_FIXED)) { - int bol = 0, eol = 0, extra; - if (pat[0] == '^') - bol = 1; - if (len > 0 && pat[len - 1] == '$') - eol = 1; - extra = (grepbehave == GREP_EXTENDED) ? 2 : 4; - pattern[patterns] = grep_malloc(len + 15 + extra); - snprintf(pattern[patterns], len + 15 + extra, - "%s[[:<:]]%s%.*s%s[[:>:]]%s", - bol ? "^" : "", - (grepbehave == GREP_EXTENDED) ? "(" : "\\(", - (int)len - bol - eol, pat + bol, - (grepbehave == GREP_EXTENDED) ? ")" : "\\)", - eol ? "$" : ""); - len += 14 + extra; - } else { - pattern[patterns] = grep_malloc(len + 1); - memcpy(pattern[patterns], pat, len); - pattern[patterns][len] = '\0'; - } + pattern[patterns] = grep_malloc(len + 1); + memcpy(pattern[patterns], pat, len); + pattern[patterns][len] = '\0'; ++patterns; } @@ -563,10 +545,7 @@ switch (grepbehave) { case GREP_FIXED: - cflags |= REG_NOSPEC; - break; case GREP_BASIC: - cflags |= REG_BASIC; break; case GREP_EXTENDED: cflags |= REG_EXTENDED; ==== //depot/projects/soc2008/gabor_textproc/src/usr.bin/grep/grep.h#5 (text+ko) ==== @@ -72,6 +72,7 @@ struct file { int binary; + int stdin; FILE *f; struct mmfile *mmf; gzFile *gzf; From owner-p4-projects@FreeBSD.ORG Mon Jan 12 17:42:06 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69A8210656C6; Mon, 12 Jan 2009 17:42:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 25BDD10656C3 for ; Mon, 12 Jan 2009 17:42:06 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EE9408FC0C for ; Mon, 12 Jan 2009 17:42:05 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0CHg5e8056982 for ; Mon, 12 Jan 2009 17:42:05 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0CHg5BQ056980 for perforce@freebsd.org; Mon, 12 Jan 2009 17:42:05 GMT (envelope-from sam@freebsd.org) Date: Mon, 12 Jan 2009 17:42:05 GMT Message-Id: <200901121742.n0CHg5BQ056980@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 156029 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Jan 2009 17:42:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=156029 Change 156029 by sam@sam_ebb on 2009/01/12 17:41:18 add copyright per Atheros Affected files ... .. //depot/projects/vap/sys/contrib/dev/uath/ar5523.bin.uu#2 edit Differences ... ==== //depot/projects/vap/sys/contrib/dev/uath/ar5523.bin.uu#2 (text+ko) ==== @@ -1,3 +1,38 @@ +/*- + * Copyright (c) 2002-2008 Atheros Communications, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms are permitted + * provided that the following conditions are met: + * 1. The materials contained herein are unmodified and are used + * unmodified. + * 2. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following NO + * ''WARRANTY'' disclaimer below (''Disclaimer''), without + * modification. + * 3. Redistributions in binary form must reproduce at minimum a + * disclaimer similar to the Disclaimer below and any redistribution + * must be conditioned upon including a substantially similar + * Disclaimer requirement for further binary redistribution. + * 4. Neither the names of the above-listed copyright holders nor the + * names of any contributors may be used to endorse or promote + * product derived from this software without specific prior written + * permission. + * + * NO WARRANTY + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, + * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE + * FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGES. + */ begin 755 ar5523.bin M0!I@`#P;``@#>M@D$V``#0`````#X`@A/!N``"=[!@@\'X``)_\`-`-_V"($ M$0`!``````-_V"``(/@A`V``"``````\&P`0`WK8)!-@``T``````^`((3P; From owner-p4-projects@FreeBSD.ORG Mon Jan 12 20:43:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0A6E1065679; Mon, 12 Jan 2009 20:43:20 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6B5641065677 for ; Mon, 12 Jan 2009 20:43:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5A71B8FC0C for ; Mon, 12 Jan 2009 20:43:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0CKhKEo075874 for ; Mon, 12 Jan 2009 20:43:20 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0CKhKXG075872 for perforce@freebsd.org; Mon, 12 Jan 2009 20:43:20 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 12 Jan 2009 20:43:20 GMT Message-Id: <200901122043.n0CKhKXG075872@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 156055 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Jan 2009 20:43:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=156055 Change 156055 by hselasky@hselasky_laptop001 on 2009/01/12 20:42:19 Compile fix for AVR-GCC Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#24 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/atmegadci.c#3 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#20 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_mbuf.h#6 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#24 (text+ko) ==== @@ -1776,7 +1776,7 @@ .wHubCharacteristics[0] = (UHD_PWR_NO_SWITCH | UHD_OC_INDIVIDUAL) & 0xFF, .wHubCharacteristics[1] = - (UHD_PWR_NO_SWITCH | UHD_OC_INDIVIDUAL) >> 16, + (UHD_PWR_NO_SWITCH | UHD_OC_INDIVIDUAL) >> 8, .bPwrOn2PwrGood = 50, .bHubContrCurrent = 0, .DeviceRemovable = {0}, /* port is removable */ ==== //depot/projects/usb/src/sys/dev/usb2/controller/atmegadci.c#3 (text+ko) ==== @@ -1645,7 +1645,7 @@ .wHubCharacteristics[0] = (UHD_PWR_NO_SWITCH | UHD_OC_INDIVIDUAL) & 0xFF, .wHubCharacteristics[1] = - (UHD_PWR_NO_SWITCH | UHD_OC_INDIVIDUAL) >> 16, + (UHD_PWR_NO_SWITCH | UHD_OC_INDIVIDUAL) >> 8, .bPwrOn2PwrGood = 50, .bHubContrCurrent = 0, .DeviceRemovable = {0}, /* port is removable */ ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#20 (text+ko) ==== @@ -1794,7 +1794,7 @@ .wHubCharacteristics[0] = (UHD_PWR_NO_SWITCH | UHD_OC_INDIVIDUAL) & 0xFF, .wHubCharacteristics[1] = - (UHD_PWR_NO_SWITCH | UHD_OC_INDIVIDUAL) >> 16, + (UHD_PWR_NO_SWITCH | UHD_OC_INDIVIDUAL) >> 8, .bPwrOn2PwrGood = 50, .bHubContrCurrent = 0, .DeviceRemovable = {0}, /* port is removable */ ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_mbuf.h#6 (text+ko) ==== @@ -38,8 +38,9 @@ struct usb2_mbuf *usb2_next; uint32_t cur_data_len; - uint32_t max_data_len:31; - uint32_t last_packet:1; + uint32_t max_data_len; + uint8_t last_packet:1; + uint8_t unused:7; }; /* From owner-p4-projects@FreeBSD.ORG Mon Jan 12 21:45:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E90D1065670; Mon, 12 Jan 2009 21:45:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 06D96106564A for ; Mon, 12 Jan 2009 21:45:37 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe11.swip.net [212.247.155.65]) by mx1.freebsd.org (Postfix) with ESMTP id 922868FC16 for ; Mon, 12 Jan 2009 21:45:36 +0000 (UTC) (envelope-from hselasky@c2i.net) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=0IAzYXyEQ80A:10 a=nklthdr5v5AUSfVrlghuJA==:17 a=6I5d2MoRAAAA:8 a=FVv5qTRyrADygycpslsA:9 a=alpsORkGvkKdNGG7-gBwzAihokwA:4 a=LY0hPdMaydYA:10 Received: from [62.113.132.62] (account mc467741@c2i.net [62.113.132.62] verified) by mailfe11.swip.net (CommuniGate Pro SMTP 5.2.6) with ESMTPA id 1006630720 for perforce@freebsd.org; Mon, 12 Jan 2009 21:45:33 +0100 From: Hans Petter Selasky To: Perforce Change Reviews Date: Mon, 12 Jan 2009 21:47:49 +0100 User-Agent: KMail/1.9.7 References: <200901122043.n0CKhKXG075872@repoman.freebsd.org> In-Reply-To: <200901122043.n0CKhKXG075872@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200901122147.49677.hselasky@c2i.net> Cc: Subject: Re: PERFORCE change 156055 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Jan 2009 21:45:38 -0000 On Monday 12 January 2009, Hans Petter Selasky wrote: > http://perforce.freebsd.org/chv.cgi?CH=156055 > > Change 156055 by hselasky@hselasky_laptop001 on 2009/01/12 20:42:19 > > > Compile fix for AVR-GCC > This change also includes three bugfixes where the wrong shift was used on some constants for the Root HUBs. --HPS From owner-p4-projects@FreeBSD.ORG Tue Jan 13 00:23:09 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F55F1065676; Tue, 13 Jan 2009 00:23:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2A2DF1065673 for ; Tue, 13 Jan 2009 00:23:09 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1666D8FC1B for ; Tue, 13 Jan 2009 00:23:09 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0D0N8W0007707 for ; Tue, 13 Jan 2009 00:23:08 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0D0N7u9007705 for perforce@freebsd.org; Tue, 13 Jan 2009 00:23:07 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 13 Jan 2009 00:23:07 GMT Message-Id: <200901130023.n0D0N7u9007705@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 156064 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Jan 2009 00:23:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=156064 Change 156064 by gonzo@gonzo_figaro on 2009/01/13 00:22:46 IFC @156063 (last before switching to svn) Affected files ... .. //depot/projects/mips2/src/ObsoleteFiles.inc#26 integrate .. //depot/projects/mips2/src/bin/test/test.1#4 integrate .. //depot/projects/mips2/src/contrib/bind9/CHANGES#9 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/api#8 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/openssldsa_link.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/opensslrsa_link.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/socket.c#7 integrate .. //depot/projects/mips2/src/contrib/bind9/version#9 integrate .. //depot/projects/mips2/src/contrib/csup/GNUmakefile#2 integrate .. //depot/projects/mips2/src/contrib/csup/Makefile#2 integrate .. //depot/projects/mips2/src/contrib/csup/TODO#2 integrate .. //depot/projects/mips2/src/contrib/csup/config.c#2 integrate .. //depot/projects/mips2/src/contrib/csup/csup.1#2 integrate .. //depot/projects/mips2/src/contrib/csup/detailer.c#2 integrate .. //depot/projects/mips2/src/contrib/csup/diff.c#2 integrate .. //depot/projects/mips2/src/contrib/csup/diff.h#2 integrate .. //depot/projects/mips2/src/contrib/csup/fattr.c#2 integrate .. //depot/projects/mips2/src/contrib/csup/fattr.h#2 integrate .. //depot/projects/mips2/src/contrib/csup/keyword.c#2 integrate .. //depot/projects/mips2/src/contrib/csup/keyword.h#2 integrate .. //depot/projects/mips2/src/contrib/csup/lex.rcs.c#1 branch .. //depot/projects/mips2/src/contrib/csup/lister.c#2 integrate .. //depot/projects/mips2/src/contrib/csup/misc.c#2 integrate .. //depot/projects/mips2/src/contrib/csup/misc.h#2 integrate .. //depot/projects/mips2/src/contrib/csup/mux.c#3 integrate .. //depot/projects/mips2/src/contrib/csup/proto.c#2 integrate .. //depot/projects/mips2/src/contrib/csup/proto.h#2 integrate .. //depot/projects/mips2/src/contrib/csup/rcsfile.c#1 branch .. //depot/projects/mips2/src/contrib/csup/rcsfile.h#1 branch .. //depot/projects/mips2/src/contrib/csup/rcsparse.c#1 branch .. //depot/projects/mips2/src/contrib/csup/rcsparse.h#1 branch .. //depot/projects/mips2/src/contrib/csup/rcstokenizer.h#1 branch .. //depot/projects/mips2/src/contrib/csup/rcstokenizer.l#1 branch .. //depot/projects/mips2/src/contrib/csup/rsyncfile.c#1 branch .. //depot/projects/mips2/src/contrib/csup/rsyncfile.h#1 branch .. //depot/projects/mips2/src/contrib/csup/status.c#2 integrate .. //depot/projects/mips2/src/contrib/csup/stream.c#2 integrate .. //depot/projects/mips2/src/contrib/csup/stream.h#2 integrate .. //depot/projects/mips2/src/contrib/csup/updater.c#2 integrate .. //depot/projects/mips2/src/contrib/file/AUTHORS#1 branch .. //depot/projects/mips2/src/contrib/file/COPYING#1 branch .. //depot/projects/mips2/src/contrib/file/ChangeLog#4 integrate .. //depot/projects/mips2/src/contrib/file/FREEBSD-upgrade#4 delete .. //depot/projects/mips2/src/contrib/file/INSTALL#1 branch .. //depot/projects/mips2/src/contrib/file/LEGAL.NOTICE#3 delete .. //depot/projects/mips2/src/contrib/file/MAINT#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/adventure#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/animation#4 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/apple#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/archive#4 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/audio#4 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/c-lang#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/c64#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/cafebabe#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/cddb#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/clarion#1 branch .. //depot/projects/mips2/src/contrib/file/Magdir/commands#4 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/compress#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/console#4 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/cracklib#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/ctags#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/database#4 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/diff#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/dump#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/elf#4 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/erlang#1 branch .. //depot/projects/mips2/src/contrib/file/Magdir/filesystems#4 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/flash#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/fonts#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/fortran#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/frame#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/freebsd#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/fsav#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/games#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/gimp#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/gnome-keyring#1 branch .. //depot/projects/mips2/src/contrib/file/Magdir/gnu#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/gnumeric#1 branch .. //depot/projects/mips2/src/contrib/file/Magdir/graphviz#1 branch .. //depot/projects/mips2/src/contrib/file/Magdir/hp#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/iff#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/images#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/inform#1 branch .. //depot/projects/mips2/src/contrib/file/Magdir/java#4 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/jpeg#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/kde#1 branch .. //depot/projects/mips2/src/contrib/file/Magdir/lex#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/linux#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/lisp#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/llvm#1 branch .. //depot/projects/mips2/src/contrib/file/Magdir/lua#1 branch .. //depot/projects/mips2/src/contrib/file/Magdir/luks#1 branch .. //depot/projects/mips2/src/contrib/file/Magdir/macintosh#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/mail.news#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/mathcad#1 branch .. //depot/projects/mips2/src/contrib/file/Magdir/mathematica#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/mercurial#1 branch .. //depot/projects/mips2/src/contrib/file/Magdir/misctools#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/mozilla#1 branch .. //depot/projects/mips2/src/contrib/file/Magdir/msdos#4 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/mup#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/netware#1 branch .. //depot/projects/mips2/src/contrib/file/Magdir/ole2compounddocs#1 branch .. //depot/projects/mips2/src/contrib/file/Magdir/os2#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/palm#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/pdf#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/perl#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/pgp#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/pkgadd#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/printer#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/psion#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/revision#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/riff#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/rpm#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/rtf#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/ruby#1 branch .. //depot/projects/mips2/src/contrib/file/Magdir/sc#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/scientific#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/securitycerts#1 branch .. //depot/projects/mips2/src/contrib/file/Magdir/sgi#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/sgml#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/sharc#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/sketch#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/softquad#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/spectrum#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/tex#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/troff#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/unicode#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/uuencode#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/varied.script#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/vorbis#2 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/warc#1 branch .. //depot/projects/mips2/src/contrib/file/Magdir/weak#1 branch .. //depot/projects/mips2/src/contrib/file/Magdir/windows#1 branch .. //depot/projects/mips2/src/contrib/file/Magdir/wordprocessors#3 integrate .. //depot/projects/mips2/src/contrib/file/Magdir/xilinx#1 branch .. //depot/projects/mips2/src/contrib/file/Makefile.am#4 integrate .. //depot/projects/mips2/src/contrib/file/Makefile.in#4 integrate .. //depot/projects/mips2/src/contrib/file/Makefile.std#2 delete .. //depot/projects/mips2/src/contrib/file/NEWS#1 branch .. //depot/projects/mips2/src/contrib/file/PORTING#2 delete .. //depot/projects/mips2/src/contrib/file/README#3 integrate .. //depot/projects/mips2/src/contrib/file/TODO#1 branch .. //depot/projects/mips2/src/contrib/file/acinclude.m4#3 integrate .. //depot/projects/mips2/src/contrib/file/aclocal.m4#3 integrate .. //depot/projects/mips2/src/contrib/file/apprentice.c#4 integrate .. //depot/projects/mips2/src/contrib/file/ascmagic.c#4 integrate .. //depot/projects/mips2/src/contrib/file/asprintf.c#1 branch .. //depot/projects/mips2/src/contrib/file/compile#1 branch .. //depot/projects/mips2/src/contrib/file/compress.c#4 integrate .. //depot/projects/mips2/src/contrib/file/config.guess#1 branch .. //depot/projects/mips2/src/contrib/file/config.h.in#4 integrate .. //depot/projects/mips2/src/contrib/file/config.sub#1 branch .. //depot/projects/mips2/src/contrib/file/configure#4 integrate .. //depot/projects/mips2/src/contrib/file/configure.ac#1 branch .. //depot/projects/mips2/src/contrib/file/configure.in#4 delete .. //depot/projects/mips2/src/contrib/file/elfclass.h#1 branch .. //depot/projects/mips2/src/contrib/file/file.c#4 integrate .. //depot/projects/mips2/src/contrib/file/file.h#4 integrate .. //depot/projects/mips2/src/contrib/file/file.man#3 integrate .. //depot/projects/mips2/src/contrib/file/fsmagic.c#4 integrate .. //depot/projects/mips2/src/contrib/file/funcs.c#4 integrate .. //depot/projects/mips2/src/contrib/file/getopt_long.c#1 branch .. //depot/projects/mips2/src/contrib/file/is_tar.c#4 integrate .. //depot/projects/mips2/src/contrib/file/libmagic.man#3 integrate .. //depot/projects/mips2/src/contrib/file/magic.c#4 integrate .. //depot/projects/mips2/src/contrib/file/magic.h#4 integrate .. //depot/projects/mips2/src/contrib/file/magic.man#3 integrate .. //depot/projects/mips2/src/contrib/file/magic.mime#4 delete .. //depot/projects/mips2/src/contrib/file/magic2mime#3 delete .. //depot/projects/mips2/src/contrib/file/mkinstalldirs#4 delete .. //depot/projects/mips2/src/contrib/file/mygetopt.h#1 branch .. //depot/projects/mips2/src/contrib/file/names.h#4 integrate .. //depot/projects/mips2/src/contrib/file/patchlevel.h#4 integrate .. //depot/projects/mips2/src/contrib/file/print.c#4 integrate .. //depot/projects/mips2/src/contrib/file/readelf.c#4 integrate .. //depot/projects/mips2/src/contrib/file/readelf.h#3 integrate .. //depot/projects/mips2/src/contrib/file/softmagic.c#4 integrate .. //depot/projects/mips2/src/contrib/file/tar.h#3 integrate .. //depot/projects/mips2/src/contrib/file/test.c#3 delete .. //depot/projects/mips2/src/contrib/file/tests/Makefile.am#1 branch .. //depot/projects/mips2/src/contrib/file/tests/Makefile.in#1 branch .. //depot/projects/mips2/src/contrib/file/tests/README#1 branch .. //depot/projects/mips2/src/contrib/file/tests/gedcom.magic#1 branch .. //depot/projects/mips2/src/contrib/file/tests/gedcom.result#1 branch .. //depot/projects/mips2/src/contrib/file/tests/gedcom.testfile#1 branch .. //depot/projects/mips2/src/contrib/file/tests/test.c#1 branch .. //depot/projects/mips2/src/contrib/file/vasprintf.c#1 branch .. //depot/projects/mips2/src/contrib/lukemftpd/src/extern.h#3 integrate .. //depot/projects/mips2/src/contrib/lukemftpd/src/ftpcmd.y#3 integrate .. //depot/projects/mips2/src/contrib/lukemftpd/src/ftpd.c#3 integrate .. //depot/projects/mips2/src/crypto/openssl/apps/speed.c#3 integrate .. //depot/projects/mips2/src/crypto/openssl/apps/spkac.c#3 integrate .. //depot/projects/mips2/src/crypto/openssl/apps/verify.c#3 integrate .. //depot/projects/mips2/src/crypto/openssl/apps/x509.c#3 integrate .. //depot/projects/mips2/src/crypto/openssl/ssl/s2_clnt.c#3 integrate .. //depot/projects/mips2/src/crypto/openssl/ssl/s2_srvr.c#3 integrate .. //depot/projects/mips2/src/crypto/openssl/ssl/s3_clnt.c#3 integrate .. //depot/projects/mips2/src/crypto/openssl/ssl/s3_srvr.c#3 integrate .. //depot/projects/mips2/src/crypto/openssl/ssl/ssltest.c#3 integrate .. //depot/projects/mips2/src/etc/defaults/rc.conf#15 integrate .. //depot/projects/mips2/src/games/fortune/datfiles/freebsd-tips#5 integrate .. //depot/projects/mips2/src/lib/libc/net/getaddrinfo.3#4 integrate .. //depot/projects/mips2/src/lib/libc/stdio/wsetup.c#3 integrate .. //depot/projects/mips2/src/lib/libc/string/Makefile.inc#4 integrate .. //depot/projects/mips2/src/lib/libc/string/strlcat.c#2 integrate .. //depot/projects/mips2/src/lib/libc/string/strlcpy.3#2 integrate .. //depot/projects/mips2/src/lib/libc/sys/jail.2#4 integrate .. //depot/projects/mips2/src/lib/libc/sys/socket.2#5 integrate .. //depot/projects/mips2/src/lib/libc/sys/timer_create.2#4 integrate .. //depot/projects/mips2/src/lib/libelf/README#1 branch .. //depot/projects/mips2/src/lib/libmagic/Makefile#3 integrate .. //depot/projects/mips2/src/lib/libmd/mdX.3#2 integrate .. //depot/projects/mips2/src/lib/libstand/bootp.c#4 integrate .. //depot/projects/mips2/src/lib/libusb20/libusb20_desc.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/math.h#9 integrate .. //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#24 integrate .. //depot/projects/mips2/src/sbin/fsck_ffs/fsck_ffs.8#4 integrate .. //depot/projects/mips2/src/sbin/geom/class/virstor/gvirstor.8#2 integrate .. //depot/projects/mips2/src/sbin/ifconfig/ifconfig.8#16 integrate .. //depot/projects/mips2/src/sbin/ifconfig/ifieee80211.c#12 integrate .. //depot/projects/mips2/src/sbin/md5/md5.1#3 integrate .. //depot/projects/mips2/src/sbin/mdconfig/mdconfig.8#7 integrate .. //depot/projects/mips2/src/sbin/mdconfig/mdconfig.c#5 integrate .. //depot/projects/mips2/src/sbin/mount/mount.c#9 integrate .. //depot/projects/mips2/src/sbin/mount_msdosfs/mount_msdosfs.8#3 integrate .. //depot/projects/mips2/src/sbin/ping/ping.8#2 integrate .. //depot/projects/mips2/src/share/man/man4/Makefile#26 integrate .. //depot/projects/mips2/src/share/man/man4/ae.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/cd.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/cpuctl.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/snd_hda.4#9 integrate .. //depot/projects/mips2/src/share/man/man4/snd_ich.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/sysmouse.4#2 integrate .. //depot/projects/mips2/src/share/man/man5/rc.conf.5#17 integrate .. //depot/projects/mips2/src/share/man/man7/build.7#4 integrate .. //depot/projects/mips2/src/share/man/man9/dev_clone.9#2 integrate .. //depot/projects/mips2/src/share/man/man9/domain.9#3 integrate .. //depot/projects/mips2/src/share/man/man9/insmntque.9#3 integrate .. //depot/projects/mips2/src/share/man/man9/redzone.9#2 integrate .. //depot/projects/mips2/src/share/misc/bsd-family-tree#13 integrate .. //depot/projects/mips2/src/share/misc/pci_vendors#5 integrate .. //depot/projects/mips2/src/share/mk/bsd.own.mk#14 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/amd64_mem.c#4 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/identcpu.c#12 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/initcpu.c#4 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/msi.c#5 integrate .. //depot/projects/mips2/src/sys/amd64/conf/GENERIC#19 integrate .. //depot/projects/mips2/src/sys/amd64/include/cputypes.h#3 integrate .. //depot/projects/mips2/src/sys/amd64/include/md_var.h#6 integrate .. //depot/projects/mips2/src/sys/amd64/include/specialreg.h#12 integrate .. //depot/projects/mips2/src/sys/arm/arm/cpufunc.c#9 integrate .. //depot/projects/mips2/src/sys/arm/arm/cpufunc_asm_feroceon.S#2 delete .. //depot/projects/mips2/src/sys/arm/arm/cpufunc_asm_sheeva.S#1 branch .. //depot/projects/mips2/src/sys/arm/arm/elf_trampoline.c#8 integrate .. //depot/projects/mips2/src/sys/arm/include/cpufunc.h#6 integrate .. //depot/projects/mips2/src/sys/arm/mv/common.c#3 integrate .. //depot/projects/mips2/src/sys/arm/mv/discovery/db78xxx.c#3 integrate .. //depot/projects/mips2/src/sys/arm/mv/discovery/discovery.c#3 integrate .. //depot/projects/mips2/src/sys/arm/mv/files.mv#3 integrate .. //depot/projects/mips2/src/sys/arm/mv/gpio.c#2 integrate .. //depot/projects/mips2/src/sys/arm/mv/kirkwood/db88f6xxx.c#3 integrate .. //depot/projects/mips2/src/sys/arm/mv/kirkwood/kirkwood.c#3 integrate .. //depot/projects/mips2/src/sys/arm/mv/mv_machdep.c#3 integrate .. //depot/projects/mips2/src/sys/arm/mv/mv_pci.c#2 integrate .. //depot/projects/mips2/src/sys/arm/mv/mvreg.h#3 integrate .. //depot/projects/mips2/src/sys/arm/mv/mvvar.h#3 integrate .. //depot/projects/mips2/src/sys/arm/mv/obio.c#3 integrate .. //depot/projects/mips2/src/sys/arm/mv/orion/db88f5xxx.c#3 integrate .. //depot/projects/mips2/src/sys/arm/mv/orion/orion.c#3 integrate .. //depot/projects/mips2/src/sys/boot/forth/loader.4th#2 integrate .. //depot/projects/mips2/src/sys/boot/forth/pnp.4th#2 integrate .. //depot/projects/mips2/src/sys/boot/forth/support.4th#5 integrate .. //depot/projects/mips2/src/sys/boot/i386/libi386/bootinfo64.c#4 integrate .. //depot/projects/mips2/src/sys/cam/cam_xpt.c#13 integrate .. //depot/projects/mips2/src/sys/cam/cam_xpt_sim.h#3 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_cd.c#8 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_ch.c#5 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_pass.c#7 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_pt.c#6 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_sa.c#7 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_ses.c#8 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_sg.c#5 integrate .. //depot/projects/mips2/src/sys/conf/Makefile.arm#11 integrate .. //depot/projects/mips2/src/sys/conf/NOTES#29 integrate .. //depot/projects/mips2/src/sys/conf/files#35 integrate .. //depot/projects/mips2/src/sys/conf/files.amd64#17 integrate .. //depot/projects/mips2/src/sys/conf/kern.post.mk#5 integrate .. //depot/projects/mips2/src/sys/conf/kern.pre.mk#11 integrate .. //depot/projects/mips2/src/sys/conf/options#25 integrate .. //depot/projects/mips2/src/sys/crypto/via/padlock.c#7 integrate .. //depot/projects/mips2/src/sys/crypto/via/padlock_hash.c#2 integrate .. //depot/projects/mips2/src/sys/dev/adb/adb_kbd.c#3 integrate .. //depot/projects/mips2/src/sys/dev/agp/agp_amd64.c#2 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-queue.c#8 integrate .. //depot/projects/mips2/src/sys/dev/ata/atapi-cam.c#7 integrate .. //depot/projects/mips2/src/sys/dev/ath/ath_rate/amrr/amrr.c#8 integrate .. //depot/projects/mips2/src/sys/dev/ath/ath_rate/onoe/onoe.c#8 integrate .. //depot/projects/mips2/src/sys/dev/ath/ath_rate/sample/sample.c#8 integrate .. //depot/projects/mips2/src/sys/dev/ath/if_ath.c#16 integrate .. //depot/projects/mips2/src/sys/dev/ath/if_ath_pci.c#7 integrate .. //depot/projects/mips2/src/sys/dev/ath/if_athioctl.h#5 integrate .. //depot/projects/mips2/src/sys/dev/ath/if_athvar.h#10 integrate .. //depot/projects/mips2/src/sys/dev/dcons/dcons_crom.c#4 integrate .. //depot/projects/mips2/src/sys/dev/dcons/dcons_os.c#9 integrate .. //depot/projects/mips2/src/sys/dev/exca/exca.c#3 integrate .. //depot/projects/mips2/src/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/mips2/src/sys/dev/if_ndis/if_ndis.c#14 integrate .. //depot/projects/mips2/src/sys/dev/iicbus/ad7418.c#3 integrate .. //depot/projects/mips2/src/sys/dev/iicbus/ds1672.c#3 integrate .. //depot/projects/mips2/src/sys/dev/iicbus/icee.c#4 integrate .. //depot/projects/mips2/src/sys/dev/iicbus/if_ic.c#4 integrate .. //depot/projects/mips2/src/sys/dev/iicbus/iic.c#5 integrate .. //depot/projects/mips2/src/sys/dev/iicbus/iicbus.c#5 integrate .. //depot/projects/mips2/src/sys/dev/iicbus/iicsmb.c#5 integrate .. //depot/projects/mips2/src/sys/dev/md/md.c#11 integrate .. //depot/projects/mips2/src/sys/dev/mge/if_mge.c#2 integrate .. //depot/projects/mips2/src/sys/dev/mge/if_mgevar.h#2 integrate .. //depot/projects/mips2/src/sys/dev/mpt/mpt.c#9 integrate .. //depot/projects/mips2/src/sys/dev/mpt/mpt.h#9 integrate .. //depot/projects/mips2/src/sys/dev/mpt/mpt_cam.c#9 integrate .. //depot/projects/mips2/src/sys/dev/mpt/mpt_raid.c#8 integrate .. //depot/projects/mips2/src/sys/dev/mpt/mpt_user.c#2 integrate .. //depot/projects/mips2/src/sys/dev/ofw/ofw_bus_subr.c#3 integrate .. //depot/projects/mips2/src/sys/dev/ofw/openfirm.c#5 integrate .. //depot/projects/mips2/src/sys/dev/ofw/openfirm.h#5 integrate .. //depot/projects/mips2/src/sys/dev/pccard/pccardvar.h#3 integrate .. //depot/projects/mips2/src/sys/dev/pcn/if_pcn.c#2 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/au88x0.c#5 delete .. //depot/projects/mips2/src/sys/dev/sound/pci/au88x0.h#2 delete .. //depot/projects/mips2/src/sys/dev/sound/pci/hda/hdac.c#17 integrate .. //depot/projects/mips2/src/sys/dev/sound/pcm/dsp.c#7 integrate .. //depot/projects/mips2/src/sys/dev/sound/pcm/mixer.c#6 integrate .. //depot/projects/mips2/src/sys/dev/sound/pcm/sound.c#5 integrate .. //depot/projects/mips2/src/sys/dev/sound/pcm/sound.h#7 integrate .. //depot/projects/mips2/src/sys/dev/syscons/teken/teken.c#2 integrate .. //depot/projects/mips2/src/sys/dev/syscons/teken/teken.h#2 integrate .. //depot/projects/mips2/src/sys/dev/syscons/teken/teken_demo.c#2 integrate .. //depot/projects/mips2/src/sys/dev/syscons/teken/teken_subr.h#2 integrate .. //depot/projects/mips2/src/sys/dev/uart/uart_cpu_mv.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb/ehci_mbus.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb/ehci_pci.c#11 integrate .. //depot/projects/mips2/src/sys/dev/usb/uhci_pci.c#8 integrate .. //depot/projects/mips2/src/sys/dev/usb/usbdevs#28 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/at91dci.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/ehci2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/ehci2.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/musb2_otg.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/ohci2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/ohci2_pci.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/uhci2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/uhci2.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/usb2_bus.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/usb2_controller.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/usb2_controller.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/uss820dci.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_busdma.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_core.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_device.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_device.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_dynamic.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_dynamic.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_generic.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_handle_request.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_hub.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_hub.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_msctest.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_msctest.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_request.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_request.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_transfer.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_transfer.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_axe2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_axe2_reg.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/image/uscanner2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/include/usb2_devid.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/include/usb2_devtable.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/include/usb2_ioctl.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/include/usb2_standard.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/misc/ufm2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/u3g2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/uchcom2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/ufoma2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/uftdi2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/uplcom2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/usb2_serial.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/uvscom2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/sound/uaudio2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/storage/umass2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/storage/urio2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/storage/ustorage2_fs.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_ural2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_zyd2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_zyd2_reg.h#2 integrate .. //depot/projects/mips2/src/sys/fs/devfs/devfs_vnops.c#17 integrate .. //depot/projects/mips2/src/sys/fs/msdosfs/msdosfs_denode.c#7 integrate .. //depot/projects/mips2/src/sys/fs/pseudofs/pseudofs_vncache.c#8 integrate .. //depot/projects/mips2/src/sys/geom/geom_vfs.c#5 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part.c#13 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part_pc98.c#8 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part_vtoc8.c#6 integrate .. //depot/projects/mips2/src/sys/gnu/fs/ext2fs/ext2_bitops.h#2 integrate .. //depot/projects/mips2/src/sys/i386/conf/GENERIC#21 integrate .. //depot/projects/mips2/src/sys/i386/cpufreq/est.c#10 integrate .. //depot/projects/mips2/src/sys/i386/i386/i686_mem.c#4 integrate .. //depot/projects/mips2/src/sys/i386/i386/identcpu.c#13 integrate .. //depot/projects/mips2/src/sys/i386/i386/initcpu.c#7 integrate .. //depot/projects/mips2/src/sys/kern/kern_jail.c#13 integrate .. //depot/projects/mips2/src/sys/kern/tty.c#18 integrate .. //depot/projects/mips2/src/sys/kern/uipc_cow.c#3 integrate .. //depot/projects/mips2/src/sys/kern/uipc_debug.c#5 integrate .. //depot/projects/mips2/src/sys/kern/uipc_domain.c#7 integrate .. //depot/projects/mips2/src/sys/kern/vfs_extattr.c#5 integrate .. //depot/projects/mips2/src/sys/modules/Makefile#24 integrate .. //depot/projects/mips2/src/sys/modules/iwnfw/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/sound/driver/au88x0/Makefile#2 delete .. //depot/projects/mips2/src/sys/modules/usb2/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/usb2/serial_3g/Makefile#1 branch .. //depot/projects/mips2/src/sys/net/if_loop.c#11 integrate .. //depot/projects/mips2/src/sys/net/route.c#15 integrate .. //depot/projects/mips2/src/sys/net/route.h#9 integrate .. //depot/projects/mips2/src/sys/net/rtsock.c#13 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211.c#14 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211.h#13 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_adhoc.c#5 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_ddb.c#9 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_freebsd.c#12 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_input.c#11 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_input.h#2 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_ioctl.c#13 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_ioctl.h#9 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_node.c#12 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_node.h#10 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_output.c#14 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_proto.h#9 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_scan.h#3 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_scan_sta.c#9 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_tdma.c#1 branch .. //depot/projects/mips2/src/sys/net80211/ieee80211_tdma.h#1 branch .. //depot/projects/mips2/src/sys/net80211/ieee80211_var.h#12 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_vjc.c#3 integrate .. //depot/projects/mips2/src/sys/netinet/in.c#11 integrate .. //depot/projects/mips2/src/sys/netinet/in.h#8 integrate .. //depot/projects/mips2/src/sys/netinet/in_pcb.c#19 integrate .. //depot/projects/mips2/src/sys/netinet/in_pcb.h#16 integrate .. //depot/projects/mips2/src/sys/netinet/ip_output.c#12 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_syncache.c#19 integrate .. //depot/projects/mips2/src/sys/netinet/udp_usrreq.c#13 integrate .. //depot/projects/mips2/src/sys/netinet/udp_var.h#5 integrate .. //depot/projects/mips2/src/sys/netinet6/in6.c#11 integrate .. //depot/projects/mips2/src/sys/netinet6/in6_gif.c#8 integrate .. //depot/projects/mips2/src/sys/netinet6/ip6protosw.h#3 integrate .. //depot/projects/mips2/src/sys/netinet6/udp6_usrreq.c#18 integrate .. //depot/projects/mips2/src/sys/netipsec/xform_ipip.c#8 integrate .. //depot/projects/mips2/src/sys/powerpc/powermac/grackle.c#7 integrate .. //depot/projects/mips2/src/sys/powerpc/powermac/gracklevar.h#3 integrate .. //depot/projects/mips2/src/sys/powerpc/powermac/macgpio.c#3 integrate .. //depot/projects/mips2/src/sys/powerpc/powermac/macio.c#7 integrate .. //depot/projects/mips2/src/sys/powerpc/powermac/uninorth.c#8 integrate .. //depot/projects/mips2/src/sys/powerpc/powermac/uninorthvar.h#4 integrate .. //depot/projects/mips2/src/sys/security/audit/audit.h#11 integrate .. //depot/projects/mips2/src/sys/security/audit/audit_pipe.c#12 integrate .. //depot/projects/mips2/src/sys/security/mac/mac_framework.c#3 integrate .. //depot/projects/mips2/src/sys/security/mac/mac_inet6.c#3 integrate .. //depot/projects/mips2/src/sys/security/mac/mac_internal.h#6 integrate .. //depot/projects/mips2/src/sys/security/mac/mac_policy.h#10 integrate .. //depot/projects/mips2/src/sys/security/mac_biba/mac_biba.c#10 integrate .. //depot/projects/mips2/src/sys/security/mac_bsdextended/mac_bsdextended.c#10 integrate .. //depot/projects/mips2/src/sys/security/mac_ifoff/mac_ifoff.c#6 integrate .. //depot/projects/mips2/src/sys/security/mac_lomac/mac_lomac.c#9 integrate .. //depot/projects/mips2/src/sys/security/mac_mls/mac_mls.c#11 integrate .. //depot/projects/mips2/src/sys/security/mac_none/mac_none.c#5 integrate .. //depot/projects/mips2/src/sys/security/mac_partition/mac_partition.c#7 integrate .. //depot/projects/mips2/src/sys/security/mac_portacl/mac_portacl.c#6 integrate .. //depot/projects/mips2/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#7 integrate .. //depot/projects/mips2/src/sys/security/mac_stub/mac_stub.c#10 integrate .. //depot/projects/mips2/src/sys/security/mac_test/mac_test.c#11 integrate .. //depot/projects/mips2/src/sys/sys/elf_common.h#6 integrate .. //depot/projects/mips2/src/sys/sys/mbuf.h#14 integrate .. //depot/projects/mips2/src/sys/sys/protosw.h#5 integrate .. //depot/projects/mips2/src/sys/sys/soundcard.h#3 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_vfsops.c#16 integrate .. //depot/projects/mips2/src/sys/ufs/ufs/ufs_extattr.c#8 integrate .. //depot/projects/mips2/src/sys/vm/vm_page.c#17 integrate .. //depot/projects/mips2/src/sys/vm/vm_page.h#7 integrate .. //depot/projects/mips2/src/tools/tools/ath/athdebug/athdebug.c#5 integrate .. //depot/projects/mips2/src/tools/tools/ath/athstats/Makefile#6 integrate .. //depot/projects/mips2/src/tools/tools/ath/athstats/athstats.c#6 integrate .. //depot/projects/mips2/src/tools/tools/ath/athstats/main.c#5 integrate .. //depot/projects/mips2/src/tools/tools/nanobsd/gateworks/Files/root/.profile#1 branch .. //depot/projects/mips2/src/tools/tools/nanobsd/gateworks/G2348#1 branch .. //depot/projects/mips2/src/tools/tools/nanobsd/gateworks/G2358#1 branch .. //depot/projects/mips2/src/tools/tools/nanobsd/gateworks/avila#1 branch .. //depot/projects/mips2/src/tools/tools/nanobsd/gateworks/cambria#1 branch .. //depot/projects/mips2/src/tools/tools/nanobsd/gateworks/cfg/motd#1 branch .. //depot/projects/mips2/src/tools/tools/nanobsd/gateworks/cfg/rc.conf#1 branch .. //depot/projects/mips2/src/tools/tools/nanobsd/gateworks/cfg/ssh/sshd_config#1 branch .. //depot/projects/mips2/src/tools/tools/nanobsd/gateworks/common#1 branch .. //depot/projects/mips2/src/tools/tools/net80211/Makefile#5 integrate .. //depot/projects/mips2/src/tools/tools/net80211/wlantxtime/Makefile#1 branch .. //depot/projects/mips2/src/tools/tools/net80211/wlantxtime/wlantxtime.c#1 branch .. //depot/projects/mips2/src/tools/tools/usb/print-usb-if-vids.sh#2 integrate .. //depot/projects/mips2/src/usr.bin/csplit/csplit.1#3 integrate .. //depot/projects/mips2/src/usr.bin/csup/Makefile#2 integrate .. //depot/projects/mips2/src/usr.bin/gprof/gprof.c#2 integrate .. //depot/projects/mips2/src/usr.bin/make/globals.h#5 integrate .. //depot/projects/mips2/src/usr.bin/make/job.c#7 integrate .. //depot/projects/mips2/src/usr.bin/make/main.c#11 integrate .. //depot/projects/mips2/src/usr.bin/make/make.1#10 integrate .. //depot/projects/mips2/src/usr.bin/make/var.c#3 integrate .. //depot/projects/mips2/src/usr.bin/netstat/main.c#9 integrate .. //depot/projects/mips2/src/usr.bin/netstat/netstat.1#5 integrate .. //depot/projects/mips2/src/usr.sbin/burncd/burncd.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/cpucontrol/cpucontrol.8#3 integrate .. //depot/projects/mips2/src/usr.sbin/fwcontrol/fwcontrol.c#6 integrate .. //depot/projects/mips2/src/usr.sbin/jail/jail.8#5 integrate .. //depot/projects/mips2/src/usr.sbin/kldxref/ef_i386.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/kldxref/ef_obj.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/kldxref/fileformat#2 integrate .. //depot/projects/mips2/src/usr.sbin/kldxref/kldxref.c#4 integrate .. //depot/projects/mips2/src/usr.sbin/mergemaster/mergemaster.8#4 integrate .. //depot/projects/mips2/src/usr.sbin/mergemaster/mergemaster.sh#5 integrate .. //depot/projects/mips2/src/usr.sbin/mld6query/mld6query.8#2 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/add/pkg_add.1#6 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/lib/lib.h#9 integrate .. //depot/projects/mips2/src/usr.sbin/pkg_install/lib/plist.c#4 integrate .. //depot/projects/mips2/src/usr.sbin/rrenumd/rrenumd.8#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtadvd/rtadvd.8#2 integrate .. //depot/projects/mips2/src/usr.sbin/rtsold/rtsold.8#3 integrate .. //depot/projects/mips2/src/usr.sbin/sysinstall/devices.c#9 integrate .. //depot/projects/mips2/src/usr.sbin/traceroute6/traceroute6.8#3 integrate .. //depot/projects/mips2/src/usr.sbin/wlandebug/wlandebug.c#4 integrate Differences ... ==== //depot/projects/mips2/src/ObsoleteFiles.inc#26 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.165 2008/12/23 16:52:03 bz Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.166 2009/01/03 11:25:50 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20081223: bind 9.4.3 import, nsupdate.8 moved to nsupdate.1 +OLD_FILES+=usr/share/man/man8/nsupdate.8.gz # 20081223: ipprotosw.h removed OLD_FILES+=usr/include/netinet/ipprotosw.h # 20081123: vfs_mountedon.9 removed ==== //depot/projects/mips2/src/bin/test/test.1#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)test.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/test/test.1,v 1.26 2006/12/14 10:42:46 ru Exp $ +.\" $FreeBSD: src/bin/test/test.1,v 1.27 2009/01/07 01:03:23 danger Exp $ .\" .Dd July 31, 2006 .Dt TEST 1 @@ -310,7 +310,7 @@ standards document. All other cases are subject to the ambiguity in the command semantics. -.Sh RETURN VALUES +.Sh EXIT STATUS The .Nm utility exits with one of the following values: ==== //depot/projects/mips2/src/contrib/bind9/CHANGES#9 (text+ko) ==== @@ -1,3 +1,11 @@ + --- 9.4.3-P1 released --- + +2522. [security] Handle -1 from DSA_do_verify(). + +2498. [bug] Removed a bogus function argument used with + ISC_SOCKET_USE_POLLWATCH: it could cause compiler + warning or crash named with the debug 1 level + of logging. [RT #18917] --- 9.4.3 released --- ==== //depot/projects/mips2/src/contrib/bind9/lib/dns/api#8 (text+ko) ==== @@ -1,3 +1,3 @@ LIBINTERFACE = 36 -LIBREVISION = 1 +LIBREVISION = 2 LIBAGE = 0 ==== //depot/projects/mips2/src/contrib/bind9/lib/dns/openssldsa_link.c#5 (text+ko) ==== @@ -16,7 +16,7 @@ * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: openssldsa_link.c,v 1.1.6.9 2007/08/28 07:20:04 tbox Exp $ */ +/* $Id: openssldsa_link.c,v 1.1.6.9.28.1 2008/12/24 00:21:22 marka Exp $ */ #ifdef OPENSSL @@ -133,7 +133,7 @@ status = DSA_do_verify(digest, ISC_SHA1_DIGESTLENGTH, dsasig, dsa); DSA_SIG_free(dsasig); - if (status == 0) + if (status != 1) return (dst__openssl_toresult(DST_R_VERIFYFAILURE)); return (ISC_R_SUCCESS); ==== //depot/projects/mips2/src/contrib/bind9/lib/dns/opensslrsa_link.c#4 (text+ko) ==== @@ -17,7 +17,7 @@ /* * Principal Author: Brian Wellington - * $Id: opensslrsa_link.c,v 1.1.6.11 2006/11/07 21:28:49 marka Exp $ + * $Id: opensslrsa_link.c,v 1.1.6.11.58.1 2008/12/24 00:21:22 marka Exp $ */ #ifdef OPENSSL @@ -246,7 +246,7 @@ status = RSA_verify(type, digest, digestlen, sig->base, RSA_size(rsa), rsa); - if (status == 0) + if (status != 1) return (dst__openssl_toresult(DST_R_VERIFYFAILURE)); return (ISC_R_SUCCESS); ==== //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/socket.c#7 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: socket.c,v 1.237.18.56 2008/11/12 03:58:36 marka Exp $ */ +/* $Id: socket.c,v 1.237.18.56.2.1 2008/12/23 00:14:34 marka Exp $ */ /*! \file */ @@ -501,7 +501,7 @@ if (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, (void *)&on, sizeof(on)) < 0) { - + UNEXPECTED_ERROR(__FILE__, __LINE__, "setsockopt(%d, IPV6_RECVPKTINFO) " "%s: %s", sock->fd, @@ -3163,7 +3163,6 @@ ISC_LOGCATEGORY_GENERAL, ISC_LOGMODULE_SOCKET, ISC_LOG_DEBUG(1), - ISC_LOG_INFO, "unexpected POLL timeout"); } pollstate = poll_active; @@ -4902,7 +4901,7 @@ if (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&onoff, sizeof(int)) < 0) { char strbuf[ISC_STRERRORSIZE]; - + UNEXPECTED_ERROR(__FILE__, __LINE__, "setsockopt(%d, IPV6_V6ONLY) " "%s: %s", sock->fd, ==== //depot/projects/mips2/src/contrib/bind9/version#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $Id: version,v 1.29.134.23 2008/11/12 04:17:12 marka Exp $ +# $Id: version,v 1.29.134.23.2.1 2008/12/24 00:21:22 marka Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. @@ -6,5 +6,5 @@ MAJORVER=9 MINORVER=4 PATCHVER=3 -RELEASETYPE= -RELEASEVER= +RELEASETYPE=-P +RELEASEVER=1 ==== //depot/projects/mips2/src/contrib/csup/GNUmakefile#2 (text) ==== @@ -2,7 +2,7 @@ # be used elsewhere because it assumes that the target system doesn't # support BSD extended file flags. # -# $FreeBSD: src/contrib/csup/GNUmakefile,v 1.1.1.2 2006/03/14 03:51:13 mux Exp $ +# $FreeBSD: src/contrib/csup/GNUmakefile,v 1.2 2009/01/05 15:18:16 lulf Exp $ # PREFIX?=/usr/local @@ -12,8 +12,9 @@ UNAME= $(shell uname -s) SRCS= attrstack.c config.c detailer.c diff.c fattr.c fixups.c fnmatch.c \ - globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c pathcomp.c \ - parse.c proto.c status.c stream.c threads.c token.c updater.c + globtree.c idcache.c keyword.c lex.rcs.c lister.c main.c misc.c mux.c \ + pathcomp.c parse.c proto.c rcsfile.c rcsparse.c rsyncfile.c status.c \ + stream.c threads.c token.c updater.c OBJS= $(SRCS:.c=.o) WARNS= -Wall -W -Wno-unused-parameter -Wmissing-prototypes -Wpointer-arith \ ==== //depot/projects/mips2/src/contrib/csup/Makefile#2 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/contrib/csup/Makefile,v 1.1.1.2 2006/03/14 03:51:13 mux Exp $ +# $FreeBSD: src/contrib/csup/Makefile,v 1.2 2009/01/05 15:18:16 lulf Exp $ PREFIX?= /usr/local BINDIR?= ${PREFIX}/bin @@ -9,10 +9,11 @@ PROG= csup SRCS= attrstack.c config.c detailer.c diff.c fattr.c fixups.c fnmatch.c \ globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c parse.y \ - pathcomp.c proto.c status.c stream.c threads.c token.l updater.c + pathcomp.c proto.c status.c stream.c threads.c token.l updater.c \ + rcsfile.c rcsparse.c lex.rcs.c rsyncfile.c CFLAGS+= -I. -I${.CURDIR} -g -pthread -DHAVE_FFLAGS -DNDEBUG -WARNS?= 6 +WARNS?= 1 # A bit of tweaking is needed to get this Makefile working # with the bsd.prog.mk of all the *BSD OSes... ==== //depot/projects/mips2/src/contrib/csup/TODO#2 (text) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/csup/TODO,v 1.1.1.2 2006/03/14 03:51:13 mux Exp $ +$FreeBSD: src/contrib/csup/TODO,v 1.2 2009/01/05 15:18:16 lulf Exp $ BUGS: @@ -28,4 +28,3 @@ checkout files (files in CVS/ subdirectores), a command line override to only update a specific collection and a third verbosity level to display commit log messages. -- Add support for CVS mode (maybe?). ==== //depot/projects/mips2/src/contrib/csup/config.c#2 (text) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/csup/config.c,v 1.1.1.2 2006/03/14 03:51:13 mux Exp $ + * $FreeBSD: src/contrib/csup/config.c,v 1.2 2009/01/05 15:18:16 lulf Exp $ */ #include @@ -133,7 +133,6 @@ coll->co_options &= ~CO_CHECKRCS; /* In recent versions, we always try to set the file modes. */ coll->co_options |= CO_SETMODE; - /* XXX We don't support the rsync updating algorithm yet. */ coll->co_options |= CO_NORSYNC; error = config_parse_refusefiles(coll); if (error) @@ -444,10 +443,6 @@ "\"%s\"\n", cur_coll->co_name); exit(1); } - if (!(cur_coll->co_options & CO_CHECKOUTMODE)) { - lprintf(-1, "Client only supports checkout mode\n"); - exit(1); - } if (!STAILQ_EMPTY(&colls)) { coll = STAILQ_LAST(&colls, coll, co_next); if (strcmp(coll->co_host, cur_coll->co_host) != 0) { ==== //depot/projects/mips2/src/contrib/csup/csup.1#2 (text) ==== @@ -22,7 +22,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $Id: cvsup.1,v 1.70 2003/03/04 18:23:46 jdp Exp $ -.\" $FreeBSD: src/contrib/csup/csup.1,v 1.1.1.2 2006/03/14 03:51:12 mux Exp $ +.\" $FreeBSD: src/contrib/csup/csup.1,v 1.2 2009/01/07 18:37:07 lulf Exp $ .\" .Dd February 1, 2006 .Os FreeBSD @@ -442,8 +442,6 @@ mode and .Em checkout mode. -.Nm -only supports the checkout mode for now. .Pp In CVS mode, the client receives copies of the actual RCS files making up the master CVS repository. CVS mode is the default mode of operation. ==== //depot/projects/mips2/src/contrib/csup/detailer.c#2 (text) ==== @@ -23,20 +23,28 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/csup/detailer.c,v 1.1.1.1 2006/03/03 04:11:26 mux Exp $ + * $FreeBSD: src/contrib/csup/detailer.c,v 1.2 2009/01/05 15:18:16 lulf Exp $ */ #include #include #include #include +#include +#include +#include +#include + #include "config.h" #include "detailer.h" #include "fixups.h" +#include "globtree.h" #include "misc.h" #include "mux.h" #include "proto.h" +#include "rcsfile.h" +#include "rsyncfile.h" #include "status.h" #include "stream.h" @@ -56,8 +64,16 @@ static int detailer_batch(struct detailer *); static int detailer_coll(struct detailer *, struct coll *, struct status *); -static int detailer_dofile(struct detailer *, struct coll *, +static int detailer_dofile_co(struct detailer *, struct coll *, struct status *, char *); +static int detailer_dofile_rcs(struct detailer *, struct coll *, + char *, char *); +static int detailer_dofile_regular(struct detailer *, char *, char *); +static int detailer_dofile_rsync(struct detailer *, char *, char *); +static int detailer_checkrcsattr(struct detailer *, struct coll *, char *, + struct fattr *, int); +int detailer_send_details(struct detailer *, struct coll *, char *, + char *, struct fattr *); void * detailer(void *arg) @@ -186,8 +202,13 @@ } if (fixup->f_coll != coll) break; - error = proto_printf(wr, "Y %s %s %s\n", fixup->f_name, - coll->co_tag, coll->co_date); + if (coll->co_options & CO_CHECKOUTMODE) + error = proto_printf(wr, "Y %s %s %s\n", + fixup->f_name, coll->co_tag, coll->co_date); + else { + error = proto_printf(wr, "A %s\n", + fixup->f_name); + } if (error) return (DETAILER_ERR_WRITE); fixup = NULL; @@ -208,12 +229,14 @@ static int detailer_coll(struct detailer *d, struct coll *coll, struct status *st) { + struct fattr *rcsattr; struct stream *rd, *wr; - char *cmd, *file, *line, *msg; - int error; + char *attr, *cmd, *file, *line, *msg, *path, *target; + int error, attic; rd = d->rd; wr = d->wr; + attic = 0; line = stream_getln(rd, NULL); if (line == NULL) return (DETAILER_ERR_READ); @@ -226,17 +249,84 @@ /* Delete file. */ file = proto_get_ascii(&line); if (file == NULL || line != NULL) + return (DETAILER_ERR_PROTO); + error = proto_printf(wr, "D %s\n", file); + if (error) + return (DETAILER_ERR_WRITE); + break; + case 'I': + case 'i': + case 'j': + /* Directory operations. */ + file = proto_get_ascii(&line); + if (file == NULL || line != NULL) return (DETAILER_ERR_PROTO); - error = proto_printf(wr, "D %s\n", file); + error = proto_printf(wr, "%s %s\n", cmd, file); + if (error) + return (DETAILER_ERR_WRITE); + break; + case 'J': + /* Set directory attributes. */ + file = proto_get_ascii(&line); + attr = proto_get_ascii(&line); + if (file == NULL || line != NULL || attr == NULL) + return (DETAILER_ERR_PROTO); + error = proto_printf(wr, "%s %s %s\n", cmd, file, attr); if (error) return (DETAILER_ERR_WRITE); break; + case 'H': + case 'h': + /* Create a hard link. */ + file = proto_get_ascii(&line); + target = proto_get_ascii(&line); + if (file == NULL || target == NULL) + return (DETAILER_ERR_PROTO); + error = proto_printf(wr, "%s %s %s\n", cmd, file, + target); + break; + case 't': + file = proto_get_ascii(&line); + attr = proto_get_ascii(&line); + if (file == NULL || attr == NULL || line != NULL) { + return (DETAILER_ERR_PROTO); + } + rcsattr = fattr_decode(attr); + if (rcsattr == NULL) { + return (DETAILER_ERR_PROTO); + } + error = detailer_checkrcsattr(d, coll, file, rcsattr, + 1); + break; + + case 'T': + file = proto_get_ascii(&line); + attr = proto_get_ascii(&line); + if (file == NULL || attr == NULL || line != NULL) + return (DETAILER_ERR_PROTO); + rcsattr = fattr_decode(attr); + if (rcsattr == NULL) + return (DETAILER_ERR_PROTO); + error = detailer_checkrcsattr(d, coll, file, rcsattr, + 0); + break; + case 'U': /* Add or update file. */ file = proto_get_ascii(&line); if (file == NULL || line != NULL) return (DETAILER_ERR_PROTO); - error = detailer_dofile(d, coll, st, file); + if (coll->co_options & CO_CHECKOUTMODE) { + error = detailer_dofile_co(d, coll, st, file); + } else { + path = cvspath(coll->co_prefix, file, 0); + rcsattr = fattr_frompath(path, FATTR_NOFOLLOW); + error = detailer_send_details(d, coll, file, + path, rcsattr); + if (rcsattr != NULL) + fattr_free(rcsattr); + free(path); + } if (error) return (error); break; @@ -261,14 +351,110 @@ return (0); } +/* + * Tell the server to update a regular file. + */ +static int +detailer_dofile_regular(struct detailer *d, char *name, char *path) +{ + struct stream *wr; + struct stat st; + char md5[MD5_DIGEST_SIZE]; + int error; + + wr = d->wr; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 13 10:13:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05D5C1065674; Tue, 13 Jan 2009 10:13:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B8B43106566B for ; Tue, 13 Jan 2009 10:13:12 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A85038FC12 for ; Tue, 13 Jan 2009 10:13:12 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0DADCH5097761 for ; Tue, 13 Jan 2009 10:13:12 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0DADCq3097759 for perforce@freebsd.org; Tue, 13 Jan 2009 10:13:12 GMT (envelope-from brueffer@freebsd.org) Date: Tue, 13 Jan 2009 10:13:12 GMT Message-Id: <200901131013.n0DADCq3097759@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 156074 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Jan 2009 10:13:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=156074 Change 156074 by brueffer@brueffer_haakonia on 2009/01/13 10:12:29 Fix typo in AUE_MAC_EXECVE event description. Affected files ... .. //depot/projects/trustedbsd/openbsm/etc/audit_event#35 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#35 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#34 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#35 $ # # The mapping between event identifiers and values is also hard-coded in # audit_kevents.h and audit_uevents.h, so changes must occur in both places, @@ -490,7 +490,7 @@ 43128:AUE_MAC_GET_PID:mac_get_pid(2):pc 43129:AUE_MAC_GET_LINK:mac_get_link(2):fa 43130:AUE_MAC_SET_LINK:mac_set_link(2):fm -43131:AUE_MAC_EXECVE:mac_exeve(2):ex,pc +43131:AUE_MAC_EXECVE:mac_execve(2):ex,pc 43132:AUE_GETPATH_FROMFD:getpath_fromfd(2):fa 43133:AUE_GETPATH_FROMADDR:getpath_fromaddr(2):fa 43134:AUE_MQ_OPEN:mq_open(2):ip From owner-p4-projects@FreeBSD.ORG Tue Jan 13 12:32:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B39111065672; Tue, 13 Jan 2009 12:32:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 59438106564A for ; Tue, 13 Jan 2009 12:32:34 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ED2018FC0A for ; Tue, 13 Jan 2009 12:32:33 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0DCWXZd010832 for ; Tue, 13 Jan 2009 12:32:33 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0DCWXM9010830 for perforce@freebsd.org; Tue, 13 Jan 2009 12:32:33 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 13 Jan 2009 12:32:33 GMT Message-Id: <200901131232.n0DCWXM9010830@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 156077 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Jan 2009 12:32:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=156077 Change 156077 by rene@rene_self on 2009/01/13 12:31:44 solid-state: at 22% Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/solid-state/article.sgml#4 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/solid-state/article.sgml#4 (text+ko) ==== @@ -119,27 +119,30 @@ schrijfbewerkingen per sector in hun specificaties staan. Dit getal varieert vanwege de omgevingstemperatuur. - Specifically, we will be discussing ATA compatible compact-flash - units and the M-Systems &diskonchip; flash memory unit. ATA compatible - compact-flash cards are quite popular as storage media for digital - cameras. Of particular interest is the fact that they pin out directly - to the IDE bus and are compatible with the ATA command set. Therefore, - with a very simple and low-cost adaptor, these devices can be attached - directly to an IDE bus in a computer. Once implemented in this manner, - operating systems such as FreeBSD see the device as a normal hard disk - (albeit small). The M-Systems &diskonchip; product is based on the same - underlying flash memory technology as ATA compatible compact-flash - cards, but resides in a DIP form factor and is not ATA compatible. To - use such a device, not only must you install it on a motherboard that - has a &diskonchip; socket, you must also build the `fla` driver into any - FreeBSD kernel you wish to use it with. Further, there is critical, - manufacturer-specific data residing in the boot sector of this device, - so you must take care not to install the FreeBSD (or any other) boot - loader when using this. + In het bijzonder worden ATA-compatibele compact-flash eenheden + en de M-Systems &diskonchip; flash-geheugeneenheid besproken. + ATA-compatibele flash-kaarten zijn vrij populair als opslagmedium + voor digitale camera's. Bijzonder interessant is het feit dat de + pinnen ervan precies met die van de IDE-bus overeenkomen en dat ze + compatibel zijn met de ATA-commandoverzamling. Daarom kunnen deze + apparaten direct aan een IDE-bus in een computer gekoppeld worden + met een zeer eenvoudige en goedkope adaptor. Eenmaal op deze + wijze geïmplementeerd zien besturingssystemen zoals &os; het + apparaat als een normale harde schijf (doch klein). Het product + M-Systems &diskonchip; is gebaseerd op dezelfde onderliggende + flash-geheugentechnologie als ATA-compatibele compact-flash + kaarten, maar heeft een DIP-vorm en is niet ATA-compatibel. Om + zo'n apparaat te gebruiken, moet u het niet alleen op een + moederbord installeren dat een &diskonchip;-stekker heeft, u moet + ook het stuurprogramma `fla` in elke &os;-kernel bouwen waarmee u + het wilt gebruiken. Verder verblijven er kritieke, + fabrikantspecifieke gegevens in de opstartsector van dit apparaat, + dus moet u ervoor oppassen dat u niet de &os; (of enig andere) + bootloader installeert wanneer u dit gebruikt. - Other solid state disk solutions do exist, but their expense, - obscurity, and relative unease of use places them beyond the scope of - this article. + Er bestaan nog andere solid state disk-oplossingen, maar hun + kosten, zeldzaamheid, en relatieve gebruiksongemak plaatst ze + buiten het bereik van dit artikel. From owner-p4-projects@FreeBSD.ORG Tue Jan 13 17:00:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 418D41065678; Tue, 13 Jan 2009 17:00:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F0D641065676 for ; Tue, 13 Jan 2009 17:00:13 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C41068FC1B for ; Tue, 13 Jan 2009 17:00:13 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0DH08CX056951 for ; Tue, 13 Jan 2009 17:00:08 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0DH08bx056949 for perforce@freebsd.org; Tue, 13 Jan 2009 17:00:08 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 13 Jan 2009 17:00:08 GMT Message-Id: <200901131700.n0DH08bx056949@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 156092 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Jan 2009 17:00:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=156092 Change 156092 by hselasky@hselasky_laptop001 on 2009/01/13 16:59:35 Make sure all claimed interfaces gets released at close. Affected files ... .. //depot/projects/usb/src/lib/libusb20/libusb20.c#13 edit Differences ... ==== //depot/projects/usb/src/lib/libusb20/libusb20.c#13 (text+ko) ==== @@ -486,6 +486,8 @@ pdev->is_opened = 0; + pdev->claimed_interfaces = 0; + return (error); } From owner-p4-projects@FreeBSD.ORG Tue Jan 13 17:03:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 959481065672; Tue, 13 Jan 2009 17:03:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2FE8E106567A for ; Tue, 13 Jan 2009 17:03:12 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0C8308FC08 for ; Tue, 13 Jan 2009 17:03:12 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0DH3BFD058010 for ; Tue, 13 Jan 2009 17:03:11 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0DH3BxV058008 for perforce@freebsd.org; Tue, 13 Jan 2009 17:03:11 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 13 Jan 2009 17:03:11 GMT Message-Id: <200901131703.n0DH3BxV058008@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 156093 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Jan 2009 17:03:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=156093 Change 156093 by hselasky@hselasky_laptop001 on 2009/01/13 17:02:51 IFC @ 156090 Affected files ... .. //depot/projects/usb/src/sys/amd64/amd64/amd64_mem.c#4 integrate .. //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#12 integrate .. //depot/projects/usb/src/sys/amd64/amd64/initcpu.c#5 integrate .. //depot/projects/usb/src/sys/amd64/amd64/msi.c#6 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#19 integrate .. //depot/projects/usb/src/sys/amd64/include/md_var.h#7 integrate .. //depot/projects/usb/src/sys/amd64/include/specialreg.h#12 integrate .. //depot/projects/usb/src/sys/boot/forth/support.4th#6 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/bootinfo64.c#4 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_ch.c#5 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_pass.c#8 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_pt.c#5 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_sa.c#7 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_ses.c#7 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_sg.c#5 integrate .. //depot/projects/usb/src/sys/conf/NOTES#25 integrate .. //depot/projects/usb/src/sys/conf/files.amd64#14 integrate .. //depot/projects/usb/src/sys/conf/files.powerpc#14 integrate .. //depot/projects/usb/src/sys/conf/kern.pre.mk#13 integrate .. //depot/projects/usb/src/sys/conf/options#17 integrate .. //depot/projects/usb/src/sys/crypto/via/padlock.c#7 integrate .. //depot/projects/usb/src/sys/crypto/via/padlock_hash.c#2 integrate .. //depot/projects/usb/src/sys/dev/agp/agp_amd64.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-queue.c#9 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c#2 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bce.c#14 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.c#5 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#15 integrate .. //depot/projects/usb/src/sys/dev/md/md.c#9 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#18 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/dsp.c#8 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/mixer.c#13 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/sound.c#9 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/sound.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/image/uscanner2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/misc/ufm2.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb2/storage/urio2.c#14 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_denode.c#7 integrate .. //depot/projects/usb/src/sys/geom/geom_vfs.c#5 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC#19 integrate .. //depot/projects/usb/src/sys/i386/i386/i686_mem.c#4 integrate .. //depot/projects/usb/src/sys/i386/i386/identcpu.c#11 integrate .. //depot/projects/usb/src/sys/i386/i386/initcpu.c#7 integrate .. //depot/projects/usb/src/sys/i386/i386/msi.c#6 integrate .. //depot/projects/usb/src/sys/kern/kern_timeout.c#9 integrate .. //depot/projects/usb/src/sys/modules/Makefile#25 integrate .. //depot/projects/usb/src/sys/net/if_loop.c#14 integrate .. //depot/projects/usb/src/sys/net/route.h#8 integrate .. //depot/projects/usb/src/sys/net/rtsock.c#15 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.c#14 integrate .. //depot/projects/usb/src/sys/netinet/tcp_syncache.c#18 integrate .. //depot/projects/usb/src/sys/netinet6/in6.c#14 integrate .. //depot/projects/usb/src/sys/powerpc/booke/locore.S#5 integrate .. //depot/projects/usb/src/sys/powerpc/booke/machdep.c#6 integrate .. //depot/projects/usb/src/sys/powerpc/booke/pmap.c#6 integrate .. //depot/projects/usb/src/sys/powerpc/booke/support.S#2 delete .. //depot/projects/usb/src/sys/powerpc/booke/trap_subr.S#3 integrate .. //depot/projects/usb/src/sys/powerpc/include/pcpu.h#7 integrate .. //depot/projects/usb/src/sys/powerpc/include/pmap.h#5 integrate .. //depot/projects/usb/src/sys/powerpc/include/pte.h#4 integrate .. //depot/projects/usb/src/sys/powerpc/include/tlb.h#2 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/macgpio.c#3 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/genassym.c#6 integrate .. //depot/projects/usb/src/sys/sys/soundcard.h#4 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/amd64/amd64_mem.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.30 2008/11/26 19:25:13 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.31 2009/01/12 19:17:35 jkim Exp $"); #include #include @@ -678,9 +678,17 @@ return; if ((cpu_id & 0xf00) != 0x600 && (cpu_id & 0xf00) != 0xf00) return; - if (cpu_vendor_id != CPU_VENDOR_INTEL && - cpu_vendor_id != CPU_VENDOR_AMD) + switch (cpu_vendor_id) { + case CPU_VENDOR_INTEL: + case CPU_VENDOR_AMD: + break; + case CPU_VENDOR_CENTAUR: + if (cpu_exthigh >= 0x80000008) + break; + /* FALLTHROUGH */ + default: return; + } mem_range_softc.mr_op = &amd64_mrops; } SYSINIT(amd64memdev, SI_SUB_DRIVERS, SI_ORDER_FIRST, amd64_mem_drvinit, NULL); ==== //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#12 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.169 2009/01/05 21:51:49 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.170 2009/01/12 19:17:35 jkim Exp $"); #include "opt_cpu.h" @@ -72,6 +72,7 @@ static u_int find_cpu_vendor_id(void); static void print_AMD_info(void); static void print_AMD_assoc(int i); +static void print_via_padlock_info(void); int cpu_class; char machine[] = "amd64"; @@ -132,24 +133,33 @@ } } - if (cpu_vendor_id == CPU_VENDOR_INTEL) { + switch (cpu_vendor_id) { + case CPU_VENDOR_INTEL: /* Please make up your mind folks! */ strcat(cpu_model, "EM64T"); - } else if (cpu_vendor_id == CPU_VENDOR_AMD) { + break; + case CPU_VENDOR_AMD: /* * Values taken from AMD Processor Recognition * http://www.amd.com/K6/k6docs/pdf/20734g.pdf * (also describes ``Features'' encodings. */ strcpy(cpu_model, "AMD "); - switch (cpu_id & 0xF00) { - case 0xf00: + if ((cpu_id & 0xf00) == 0xf00) strcat(cpu_model, "AMD64 Processor"); - break; - default: + else + strcat(cpu_model, "Unknown"); + break; + case CPU_VENDOR_CENTAUR: + strcpy(cpu_model, "VIA "); + if ((cpu_id & 0xff0) == 0x6f0) + strcat(cpu_model, "Nano Processor"); + else strcat(cpu_model, "Unknown"); - break; - } + break; + default: + strcat(cpu_model, "Unknown"); + break; } /* @@ -181,7 +191,8 @@ printf(" Id = 0x%x", cpu_id); if (cpu_vendor_id == CPU_VENDOR_INTEL || - cpu_vendor_id == CPU_VENDOR_AMD) { + cpu_vendor_id == CPU_VENDOR_AMD || + cpu_vendor_id == CPU_VENDOR_CENTAUR) { printf(" Stepping = %u", cpu_id & 0xf); if (cpu_high > 0) { u_int cmp = 1, htt = 1; @@ -353,6 +364,9 @@ ); } + if (cpu_vendor_id == CPU_VENDOR_CENTAUR) + print_via_padlock_info(); + if ((cpu_feature & CPUID_HTT) && cpu_vendor_id == CPU_VENDOR_AMD) cpu_feature &= ~CPUID_HTT; @@ -376,6 +390,11 @@ AMD64_CPU_MODEL(cpu_id) >= 0x3)) tsc_is_invariant = 1; break; + case CPU_VENDOR_CENTAUR: + if (AMD64_CPU_FAMILY(cpu_id) == 0x6 && + AMD64_CPU_MODEL(cpu_id) >= 0xf) + tsc_is_invariant = 1; + break; } if (tsc_is_invariant) printf("\n TSC: P-state invariant"); @@ -457,7 +476,7 @@ EVENTHANDLER_PRI_ANY); /* - * Final stage of CPU identification. -- Should I check TI? + * Final stage of CPU identification. */ void identify_cpu(void) @@ -479,7 +498,8 @@ cpu_feature2 = regs[2]; if (cpu_vendor_id == CPU_VENDOR_INTEL || - cpu_vendor_id == CPU_VENDOR_AMD) { + cpu_vendor_id == CPU_VENDOR_AMD || + cpu_vendor_id == CPU_VENDOR_CENTAUR) { do_cpuid(0x80000000, regs); cpu_exthigh = regs[0]; } @@ -600,3 +620,37 @@ print_AMD_l2_assoc((regs[2] >> 12) & 0x0f); } } + +static void +print_via_padlock_info(void) +{ + u_int regs[4]; + + /* Check for supported models. */ + switch (cpu_id & 0xff0) { + case 0x690: + if ((cpu_id & 0xf) < 3) + return; + case 0x6a0: + case 0x6d0: + case 0x6f0: + break; + default: + return; + } + + do_cpuid(0xc0000000, regs); + if (regs[0] >= 0xc0000001) + do_cpuid(0xc0000001, regs); + else + return; + + printf("\n VIA Padlock Features=0x%b", regs[3], + "\020" + "\003RNG" /* RNG */ + "\007AES" /* ACE */ + "\011AES-CTR" /* ACE2 */ + "\013SHA1,SHA256" /* PHE */ + "\015RSA" /* PMM */ + ); +} ==== //depot/projects/usb/src/sys/amd64/amd64/initcpu.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.52 2008/11/26 19:25:13 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.53 2009/01/12 19:17:35 jkim Exp $"); #include "opt_cpu.h" @@ -54,6 +54,8 @@ u_int amd_feature; /* AMD feature flags */ u_int amd_feature2; /* AMD feature flags */ u_int amd_pminfo; /* AMD advanced power management info */ +u_int via_feature_rng; /* VIA RNG features */ +u_int via_feature_xcrypt; /* VIA ACE features */ u_int cpu_high; /* Highest arg to CPUID */ u_int cpu_exthigh; /* Highest arg to extended CPUID */ u_int cpu_id; /* Stepping ID */ @@ -64,7 +66,76 @@ u_int cpu_fxsr; /* SSE enabled */ u_int cpu_mxcsr_mask; /* Valid bits in mxcsr */ +SYSCTL_UINT(_hw, OID_AUTO, via_feature_rng, CTLFLAG_RD, + &via_feature_rng, 0, "VIA C3/C7 RNG feature available in CPU"); +SYSCTL_UINT(_hw, OID_AUTO, via_feature_xcrypt, CTLFLAG_RD, + &via_feature_xcrypt, 0, "VIA C3/C7 xcrypt feature available in CPU"); + /* + * Initialize special VIA C3/C7 features + */ +static void +init_via(void) +{ + u_int regs[4], val; + u_int64_t msreg; + + do_cpuid(0xc0000000, regs); + val = regs[0]; + if (val >= 0xc0000001) { + do_cpuid(0xc0000001, regs); + val = regs[3]; + } else + val = 0; + + /* Enable RNG if present and disabled */ + if (val & VIA_CPUID_HAS_RNG) { + if (!(val & VIA_CPUID_DO_RNG)) { + msreg = rdmsr(0x110B); + msreg |= 0x40; + wrmsr(0x110B, msreg); + } + via_feature_rng = VIA_HAS_RNG; + } + /* Enable AES engine if present and disabled */ + if (val & VIA_CPUID_HAS_ACE) { + if (!(val & VIA_CPUID_DO_ACE)) { + msreg = rdmsr(0x1107); + msreg |= (0x01 << 28); + wrmsr(0x1107, msreg); + } + via_feature_xcrypt |= VIA_HAS_AES; + } + /* Enable ACE2 engine if present and disabled */ + if (val & VIA_CPUID_HAS_ACE2) { + if (!(val & VIA_CPUID_DO_ACE2)) { + msreg = rdmsr(0x1107); + msreg |= (0x01 << 28); + wrmsr(0x1107, msreg); + } + via_feature_xcrypt |= VIA_HAS_AESCTR; + } + /* Enable SHA engine if present and disabled */ + if (val & VIA_CPUID_HAS_PHE) { + if (!(val & VIA_CPUID_DO_PHE)) { + msreg = rdmsr(0x1107); + msreg |= (0x01 << 28/**/); + wrmsr(0x1107, msreg); + } + via_feature_xcrypt |= VIA_HAS_SHA; + } + /* Enable MM engine if present and disabled */ + if (val & VIA_CPUID_HAS_PMM) { + if (!(val & VIA_CPUID_DO_PMM)) { + msreg = rdmsr(0x1107); + msreg |= (0x01 << 28/**/); + wrmsr(0x1107, msreg); + } + via_feature_xcrypt |= VIA_HAS_MM; + } +} + +/* * Initialize CPU control registers */ void @@ -81,4 +152,8 @@ wrmsr(MSR_EFER, msr); pg_nx = PG_NX; } + if (cpu_vendor_id == CPU_VENDOR_CENTAUR && + AMD64_CPU_FAMILY(cpu_id) == 0x6 && + AMD64_CPU_MODEL(cpu_id) >= 0xf) + init_via(); } ==== //depot/projects/usb/src/sys/amd64/amd64/msi.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.8 2008/11/26 19:25:13 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.9 2009/01/12 19:17:35 jkim Exp $"); #include #include @@ -51,6 +51,7 @@ #include #include #include +#include #include /* Fields in address for Intel MSI messages. */ @@ -212,9 +213,18 @@ { /* Check if we have a supported CPU. */ - if (!(cpu_vendor_id == CPU_VENDOR_INTEL || - cpu_vendor_id == CPU_VENDOR_AMD)) + switch (cpu_vendor_id) { + case CPU_VENDOR_INTEL: + case CPU_VENDOR_AMD: + break; + case CPU_VENDOR_CENTAUR: + if (AMD64_CPU_FAMILY(cpu_id) == 0x6 && + AMD64_CPU_MODEL(cpu_id) >= 0xf) + break; + /* FALLTHROUGH */ + default: return; + } msi_enabled = 1; intr_register_pic(&msi_pic); ==== //depot/projects/usb/src/sys/amd64/conf/GENERIC#19 (text+ko) ==== @@ -1,8 +1,8 @@ # # GENERIC -- Generic kernel configuration file for FreeBSD/amd64 # -# For more information on this file, please read the handbook section on -# Kernel Configuration Files: +# For more information on this file, please read the config(5) manual page, +# and/or the handbook section on Kernel Configuration Files: # # http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # @@ -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.512 2009/01/05 14:21:49 rwatson Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.513 2009/01/13 12:35:33 luigi Exp $ cpu HAMMER ident GENERIC @@ -24,6 +24,12 @@ # To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" # Default places to look for devices. +# Use the following to compile in values accessible to the kernel +# through getenv() (or kenv(1) in userland). The format of the file +# is 'variable=value', see kenv(1) +# +# env "GENERIC.env" + makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols options SCHED_ULE # ULE scheduler ==== //depot/projects/usb/src/sys/amd64/include/md_var.h#7 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.83 2008/11/26 19:25:13 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.84 2009/01/12 19:17:35 jkim Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -45,6 +45,8 @@ extern u_int amd_feature; extern u_int amd_feature2; extern u_int amd_pminfo; +extern u_int via_feature_rng; +extern u_int via_feature_xcrypt; extern u_int cpu_fxsr; extern u_int cpu_high; extern u_int cpu_id; ==== //depot/projects/usb/src/sys/amd64/include/specialreg.h#12 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.52 2009/01/05 21:51:49 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.53 2009/01/12 19:17:35 jkim Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -459,4 +459,40 @@ #define MSR_TOP_MEM2 0xc001001d /* boundary for ram above 4G */ #define MSR_K8_UCODE_UPDATE 0xc0010020 /* update microcode */ +/* VIA ACE crypto featureset: for via_feature_rng */ +#define VIA_HAS_RNG 1 /* cpu has RNG */ + +/* VIA ACE crypto featureset: for via_feature_xcrypt */ +#define VIA_HAS_AES 1 /* cpu has AES */ +#define VIA_HAS_SHA 2 /* cpu has SHA1 & SHA256 */ +#define VIA_HAS_MM 4 /* cpu has RSA instructions */ +#define VIA_HAS_AESCTR 8 /* cpu has AES-CTR instructions */ + +/* Centaur Extended Feature flags */ +#define VIA_CPUID_HAS_RNG 0x000004 +#define VIA_CPUID_DO_RNG 0x000008 +#define VIA_CPUID_HAS_ACE 0x000040 +#define VIA_CPUID_DO_ACE 0x000080 +#define VIA_CPUID_HAS_ACE2 0x000100 +#define VIA_CPUID_DO_ACE2 0x000200 +#define VIA_CPUID_HAS_PHE 0x000400 +#define VIA_CPUID_DO_PHE 0x000800 +#define VIA_CPUID_HAS_PMM 0x001000 +#define VIA_CPUID_DO_PMM 0x002000 + +/* VIA ACE xcrypt-* instruction context control options */ +#define VIA_CRYPT_CWLO_ROUND_M 0x0000000f +#define VIA_CRYPT_CWLO_ALG_M 0x00000070 +#define VIA_CRYPT_CWLO_ALG_AES 0x00000000 +#define VIA_CRYPT_CWLO_KEYGEN_M 0x00000080 +#define VIA_CRYPT_CWLO_KEYGEN_HW 0x00000000 +#define VIA_CRYPT_CWLO_KEYGEN_SW 0x00000080 +#define VIA_CRYPT_CWLO_NORMAL 0x00000000 +#define VIA_CRYPT_CWLO_INTERMEDIATE 0x00000100 +#define VIA_CRYPT_CWLO_ENCRYPT 0x00000000 +#define VIA_CRYPT_CWLO_DECRYPT 0x00000200 +#define VIA_CRYPT_CWLO_KEY128 0x0000000a /* 128bit, 10 rds */ +#define VIA_CRYPT_CWLO_KEY192 0x0000040c /* 192bit, 12 rds */ +#define VIA_CRYPT_CWLO_KEY256 0x0000080e /* 256bit, 15 rds */ + #endif /* !_MACHINE_SPECIALREG_H_ */ ==== //depot/projects/usb/src/sys/boot/forth/support.4th#6 (text+ko) ==== @@ -22,7 +22,7 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD: src/sys/boot/forth/support.4th,v 1.19 2009/01/05 20:09:54 luigi Exp $ +\ $FreeBSD: src/sys/boot/forth/support.4th,v 1.20 2009/01/13 12:28:14 luigi Exp $ \ Loader.rc support functions: \ @@ -820,7 +820,7 @@ \ Interface to loading conf files : load_conf ( addr len -- ) - ." ----- Trying conf " 2dup type cr + \ ." ----- Trying conf " 2dup type cr \ debugging 0 to end_of_file? reset_line_reading O_RDONLY fopen fd ! @@ -912,7 +912,7 @@ \ loader_conf_files processing support functions : get_conf_files ( -- addr len ) \ put addr/len on stack, reset var - ." -- starting on <" conf_files strtype ." >" cr + \ ." -- starting on <" conf_files strtype ." >" cr \ debugging conf_files strget 0 0 conf_files strset ; @@ -939,8 +939,7 @@ pos char+ to pos repeat addr len pos addr r@ + pos r> - - 2dup - ." get_file_name has " type cr + \ 2dup ." get_file_name has " type cr \ debugging ; : get_next_file ( addr len ptr -- addr len ptr' addr' len' | 0 ) ==== //depot/projects/usb/src/sys/boot/i386/libi386/bootinfo64.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/bootinfo64.c,v 1.38 2008/10/07 14:05:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/bootinfo64.c,v 1.39 2009/01/12 16:28:19 jkim Exp $"); #include #include @@ -150,8 +150,9 @@ cpu_vendor = (char *)vendor; /* Check for vendors that support AMD features. */ - if (strncmp(cpu_vendor, "GenuineIntel", 12) != 0 && - strncmp(cpu_vendor, "AuthenticAMD", 12) != 0) + if (strncmp(cpu_vendor, INTEL_VENDOR_ID, 12) != 0 && + strncmp(cpu_vendor, AMD_VENDOR_ID, 12) != 0 && + strncmp(cpu_vendor, CENTAUR_VENDOR_ID, 12) != 0) return (0); /* Has to support AMD features. */ ==== //depot/projects/usb/src/sys/cam/scsi/scsi_ch.c#5 (text+ko) ==== @@ -68,7 +68,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.46 2007/05/16 16:54:23 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.47 2009/01/10 17:22:49 trasz Exp $"); #include #include @@ -262,9 +262,11 @@ softc = (struct ch_softc *)periph->softc; + xpt_print(periph->path, "removing device entry\n"); devstat_remove_entry(softc->device_stats); + cam_periph_unlock(periph); destroy_dev(softc->dev); - xpt_print(periph->path, "removing device entry\n"); + cam_periph_lock(periph); free(softc, M_DEVBUF); } ==== //depot/projects/usb/src/sys/cam/scsi/scsi_pass.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.50 2008/12/21 06:20:11 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.51 2009/01/10 17:22:49 trasz Exp $"); #include #include @@ -165,13 +165,12 @@ softc = (struct pass_softc *)periph->softc; + if (bootverbose) + xpt_print(periph->path, "removing device entry\n"); devstat_remove_entry(softc->device_stats); - + cam_periph_unlock(periph); destroy_dev(softc->dev); - - if (bootverbose) { - xpt_print(periph->path, "removing device entry\n"); - } + cam_periph_lock(periph); free(softc, M_DEVBUF); } ==== //depot/projects/usb/src/sys/cam/scsi/scsi_pt.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.47 2007/05/16 16:54:23 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.48 2009/01/10 17:22:49 trasz Exp $"); #include #include @@ -342,11 +342,11 @@ softc = (struct pt_softc *)periph->softc; + xpt_print(periph->path, "removing device entry\n"); devstat_remove_entry(softc->device_stats); - + cam_periph_unlock(periph); destroy_dev(softc->dev); - - xpt_print(periph->path, "removing device entry\n"); + cam_periph_lock(periph); free(softc, M_DEVBUF); } ==== //depot/projects/usb/src/sys/cam/scsi/scsi_sa.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.114 2008/09/27 08:51:18 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.115 2009/01/10 17:22:49 trasz Exp $"); #include #include @@ -1377,17 +1377,16 @@ softc = (struct sa_softc *)periph->softc; + xpt_print(periph->path, "removing device entry\n"); devstat_remove_entry(softc->device_stats); - + cam_periph_unlock(periph); destroy_dev(softc->devs.ctl_dev); - for (i = 0; i < SA_NUM_MODES; i++) { destroy_dev(softc->devs.mode_devs[i].r_dev); destroy_dev(softc->devs.mode_devs[i].nr_dev); destroy_dev(softc->devs.mode_devs[i].er_dev); } - - xpt_print(periph->path, "removing device entry\n"); + cam_periph_lock(periph); free(softc, M_SCSISA); } ==== //depot/projects/usb/src/sys/cam/scsi/scsi_ses.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.39 2008/09/27 08:51:18 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.40 2009/01/10 17:22:49 trasz Exp $"); #include #include @@ -227,9 +227,10 @@ softc = (struct ses_softc *)periph->softc; + xpt_print(periph->path, "removing device entry\n"); + cam_periph_unlock(periph); destroy_dev(softc->ses_dev); - - xpt_print(periph->path, "removing device entry\n"); + cam_periph_lock(periph); free(softc, M_SCSISES); } ==== //depot/projects/usb/src/sys/cam/scsi/scsi_sg.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.11 2008/12/21 06:20:11 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.12 2009/01/10 17:22:49 trasz Exp $"); #include #include @@ -200,11 +200,12 @@ struct sg_softc *softc; softc = (struct sg_softc *)periph->softc; + if (bootverbose) + xpt_print(periph->path, "removing device entry\n"); devstat_remove_entry(softc->device_stats); + cam_periph_unlock(periph); destroy_dev(softc->dev); - if (bootverbose) { - xpt_print(periph->path, "removing device entry\n"); - } + cam_periph_lock(periph); free(softc, M_DEVBUF); } ==== //depot/projects/usb/src/sys/conf/NOTES#25 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1520 2009/01/09 16:02:19 adrian Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1521 2009/01/11 11:36:00 maxim Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -635,11 +635,11 @@ # IP optional behaviour. # IP_NONLOCALBIND disables the check that bind() usually makes that the -# Address is one that is assigned to an interface on this machine. +# address is one that is assigned to an interface on this machine. # It allows transparent proxies to pretend to be other machines. # How the packet GET to that machine is a problem solved elsewhere, # smart routers, ipfw fwd, etc. -options IP_NONLOCALBIND #Allow impersonation for proxies. +options IP_NONLOCALBIND # Allow impersonation for proxies. # netgraph(4). Enable the base netgraph code with the NETGRAPH option. # Individual node types can be enabled with the corresponding option ==== //depot/projects/usb/src/sys/conf/files.amd64#14 (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.amd64,v 1.127 2009/01/01 13:26:53 ed Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.128 2009/01/12 19:23:46 jkim Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -128,6 +128,9 @@ amd64/pci/pci_cfgreg.c optional pci crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/des/des_enc.c optional crypto | ipsec | netsmb +crypto/via/padlock.c optional padlock +crypto/via/padlock_cipher.c optional padlock +crypto/via/padlock_hash.c optional padlock dev/acpica/acpi_if.m standard dev/agp/agp_amd64.c optional agp dev/agp/agp_i810.c optional agp ==== //depot/projects/usb/src/sys/conf/files.powerpc#14 (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.powerpc,v 1.88 2009/01/01 13:26:53 ed Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.89 2009/01/13 15:41:58 raj Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -84,7 +84,6 @@ powerpc/booke/locore.S optional e500 no-obj powerpc/booke/machdep.c optional e500 powerpc/booke/pmap.c optional e500 -powerpc/booke/support.S optional e500 powerpc/booke/swtch.S optional e500 powerpc/booke/trap.c optional e500 powerpc/booke/uio_machdep.c optional e500 ==== //depot/projects/usb/src/sys/conf/kern.pre.mk#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.102 2008/12/01 16:53:01 sam Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.103 2009/01/12 16:54:41 gnn Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -25,6 +25,7 @@ .else . if defined(DEBUG) _MINUS_O= -O +CTFFLAGS+= -g . else _MINUS_O= -O2 . endif ==== //depot/projects/usb/src/sys/conf/options#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.655 2009/01/09 16:02:19 adrian Exp $ +# $FreeBSD: src/sys/conf/options,v 1.656 2009/01/12 11:24:32 qingli Exp $ # # On the handling of kernel options # @@ -411,6 +411,7 @@ PPP_FILTER opt_ppp.h RADIX_MPATH opt_mpath.h ROUTETABLES opt_route.h +COMPAT_ROUTE_FLAGS opt_route.h SLIP_IFF_OPTS opt_slip.h TCPDEBUG TCP_OFFLOAD_DISABLE opt_inet.h #Disable code to dispatch tcp offloading ==== //depot/projects/usb/src/sys/crypto/via/padlock.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/crypto/via/padlock.c,v 1.21 2008/11/17 19:00:36 philip Exp $"); +__FBSDID("$FreeBSD: src/sys/crypto/via/padlock.c,v 1.22 2009/01/12 19:23:46 jkim Exp $"); #include #include @@ -35,7 +35,7 @@ #include #include #include -#if defined(__i386__) && !defined(PC98) +#if defined(__amd64__) || (defined(__i386__) && !defined(PC98)) #include #include #include @@ -85,7 +85,7 @@ { char capp[256]; -#if defined(__i386__) && !defined(PC98) +#if defined(__amd64__) || (defined(__i386__) && !defined(PC98)) /* If there is no AES support, we has nothing to do here. */ if (!(via_feature_xcrypt & VIA_HAS_AES)) { device_printf(dev, "No ACE support.\n"); ==== //depot/projects/usb/src/sys/crypto/via/padlock_hash.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/crypto/via/padlock_hash.c,v 1.2 2006/07/25 19:04:26 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/crypto/via/padlock_hash.c,v 1.3 2009/01/12 19:23:46 jkim Exp $"); #include #include @@ -34,7 +34,7 @@ #include #include #include -#if defined(__i386__) && !defined(PC98) +#if defined(__amd64__) || (defined(__i386__) && !defined(PC98)) #include #include #include ==== //depot/projects/usb/src/sys/dev/agp/agp_amd64.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/agp/agp_amd64.c,v 1.16 2007/11/12 21:51:36 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp_amd64.c,v 1.17 2009/01/12 16:07:03 jkim Exp $"); #include "opt_bus.h" @@ -167,14 +167,16 @@ { struct agp_amd64_softc *sc = device_get_softc(dev); struct agp_gatt *gatt; + uint32_t devid; int i, n, error; - for (i = 0, n = 0; i < PCI_SLOTMAX && n < AMD64_MAX_MCTRL; i++) - if (pci_cfgregread(0, i, 3, 0, 4) == 0x11031022) { + for (i = 0, n = 0; i < PCI_SLOTMAX && n < AMD64_MAX_MCTRL; i++) { + devid = pci_cfgregread(0, i, 3, 0, 4); + if (devid == 0x11031022 || devid == 0x12031022) { sc->mctrl[n] = i; n++; } - + } if (n == 0) return (ENXIO); ==== //depot/projects/usb/src/sys/dev/ata/ata-queue.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.75 2008/11/27 03:37:46 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.76 2009/01/12 17:18:58 obrien Exp $"); #include "opt_ata.h" #include @@ -434,7 +434,8 @@ printf("\n"); } - if ((request->u.atapi.sense.key & ATA_SENSE_KEY_MASK ? + if (!request->result && + (request->u.atapi.sense.key & ATA_SENSE_KEY_MASK ? request->u.atapi.sense.key & ATA_SENSE_KEY_MASK : request->error)) request->result = EIO; ==== //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5212_rfgain.c,v 1.2 2008/11/19 21:23:01 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c,v 1.2 2009/01/13 05:50:22 sam Exp $ */ #include "opt_ah.h" @@ -280,7 +280,8 @@ GAIN_VALUES *gv = &ahp->ah_gainValues; uint32_t rddata, probeType; - if (!gv->active) + /* NB: beware of touching the BB when PHY is powered down */ + if (!gv->active || !ahp->ah_phyPowerOn) return HAL_RFGAIN_INACTIVE; if (ahp->ah_rfgainState == HAL_RFGAIN_READ_REQUESTED) { ==== //depot/projects/usb/src/sys/dev/bce/if_bce.c#14 (text) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.47 2008/12/16 05:03:22 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.48 2009/01/13 07:12:32 delphij Exp $"); /* * The following controllers are supported by this driver: @@ -106,6 +106,8 @@ "HP NC370T Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5706, HP_VENDORID, 0x3106, "HP NC370i Multifunction Gigabit Server Adapter" }, + { BRCM_VENDORID, BRCM_DEVICEID_BCM5706, HP_VENDORID, 0x3070, + "HP NC380T PCI Express Dual Port Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5706, PCI_ANY_ID, PCI_ANY_ID, "Broadcom NetXtreme II BCM5706 1000Base-T" }, @@ -116,18 +118,38 @@ "Broadcom NetXtreme II BCM5706 1000Base-SX" }, /* BCM5708C controllers and OEM boards. */ + { BRCM_VENDORID, BRCM_DEVICEID_BCM5708, HP_VENDORID, 0x7037, + "HP NC373T PCI Express Multifunction Gigabit Server Adapter" }, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 13 17:04:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADBE51065673; Tue, 13 Jan 2009 17:04:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 626701065670 for ; Tue, 13 Jan 2009 17:04:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4C0898FC1B for ; Tue, 13 Jan 2009 17:04:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0DH4aCO058093 for ; Tue, 13 Jan 2009 17:04:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0DH4DZi058075 for perforce@freebsd.org; Tue, 13 Jan 2009 17:04:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 13 Jan 2009 17:04:13 GMT Message-Id: <200901131704.n0DH4DZi058075@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156094 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Jan 2009 17:04:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=156094 Change 156094 by rwatson@rwatson_freebsd_capabilities on 2009/01/13 17:03:34 Integrate TrustedBSD capabilities branch. Probably doesn't compile / work since it was last integrated some time ago so needs further merging. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/COPYRIGHT#2 integrate .. //depot/projects/trustedbsd/capabilities/src/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/Makefile.inc1#5 integrate .. //depot/projects/trustedbsd/capabilities/src/ObsoleteFiles.inc#5 integrate .. //depot/projects/trustedbsd/capabilities/src/UPDATING#5 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/cat/cat.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/chio/chio.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/cp/utils.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/df/df.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/df/df.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/kenv/kenv.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/pkill/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/bin/pkill/pkill.1#1 branch .. //depot/projects/trustedbsd/capabilities/src/bin/pkill/pkill.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/bin/ps/print.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/rcp/rcp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/setfacl/setfacl.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/eval.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/exec.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/options.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/sh.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/test/test.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/compat/opensolaris/include/libshare.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/cddl/compat/opensolaris/include/mnttab.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/compat/opensolaris/misc/deviceid.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/compat/opensolaris/misc/mnttab.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/compat/opensolaris/misc/zmount.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/compat/opensolaris/misc/zone.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zdb/zdb.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zinject/translate.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zinject/zinject.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zinject/zinject.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/ztest/ztest.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/head/assert.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/head/libintl.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/head/synch.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/head/thread.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzpool/common/util.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/lib/libzfs/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/lib/libzpool/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/sbin/zpool/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/usr.bin/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/usr.bin/zinject/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/cddl/usr.bin/ztest/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/usr.sbin/zdb/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/CHANGES#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/FAQ#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/README#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/aclocal.m4#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/check/check-tool.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/check/named-checkconf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/check/named-checkzone.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/client.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/lwaddr.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/lwdgnba.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/lwdnoop.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/main.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/server.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/unix/include/named/os.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/unix/os.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/nsupdate/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/nsupdate/nsupdate.1#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/nsupdate/nsupdate.8#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/rndc-confgen.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/rndc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/config.h.in#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/configure.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.pdf#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.dig.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.host.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.named.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.rndc.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/misc/format-options.pl#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/misc/migration#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/misc/options#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/misc/sort-options.pl#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc4648.txt#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc4701.txt#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc5155.txt#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/aclocal.m4#3 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/api#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/bsd/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/bsd/strerror.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/bsd/strtoul.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/config.h.in#3 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/configure.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/dst/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/dst/support.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/arpa/nameser.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/isc/assertions.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/isc/misc.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/isc/platform.h.in#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/netdb.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/resolv.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/inet/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/inet/inet_net_pton.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/inet/inet_network.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/getnetgrent.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/getnetgrent_r.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/irp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/assertions.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/bitncmp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/ctl_srvr.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/logging.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/nameser/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/port_after.h.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/resolv/res_mkquery.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/resolv/res_query.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind9/check.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/acache.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/api#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/dispatch.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/dst_parse.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/dst_parse.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/dispatch.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/journal.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/master.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rbt.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/txt_16.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/request.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/resolver.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rootns.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/sdb.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/view.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/assertions.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/assertions.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/lex.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/mem.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/msgs.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/platform.h.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/portset.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/resource.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/socket.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/types.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/portset.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/print.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/unix/app.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/unix/include/isc/net.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/unix/resource.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/unix/socket.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/unix/socket_p.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/unix/time.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isccfg/api#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isccfg/namedconf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/version#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/binutils/bfd/config.bfd#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/binutils/gas/config/tc-mips.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bsnmp/snmp_mibII/mibII_route.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/GNUmakefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/TODO#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/config.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/csup.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/detailer.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/diff.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/diff.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/fattr.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/fattr.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/keyword.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/keyword.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/lex.rcs.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/lister.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/misc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/misc.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/mux.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/proto.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/proto.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/rcsfile.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/rcsfile.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/rcsparse.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/rcsparse.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/rcstokenizer.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/rcstokenizer.l#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/rsyncfile.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/rsyncfile.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/status.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/stream.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/stream.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/updater.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/AUTHORS#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/COPYING#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/ChangeLog#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/FREEBSD-upgrade#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/file/INSTALL#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/LEGAL.NOTICE#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/file/MAINT#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/adventure#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/animation#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/apple#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/archive#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/audio#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/c-lang#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/c64#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/cafebabe#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/cddb#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/clarion#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/commands#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/compress#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/console#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/cracklib#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/ctags#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/database#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/diff#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/dump#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/elf#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/erlang#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/flash#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/fonts#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/fortran#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/frame#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/freebsd#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/fsav#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/games#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/gimp#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/gnome-keyring#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/gnu#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/gnumeric#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/graphviz#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/hp#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/iff#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/images#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/inform#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/java#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/jpeg#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/kde#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/lex#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/linux#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/llvm#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/lua#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/luks#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/mail.news#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/mathcad#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/mathematica#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/mercurial#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/misctools#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/mozilla#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/mup#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/netware#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/ole2compounddocs#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/os2#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/palm#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/pdf#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/perl#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/pgp#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/pkgadd#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/printer#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/psion#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/revision#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/riff#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/rpm#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/rtf#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/ruby#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/sc#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/scientific#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/securitycerts#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/sgml#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/sharc#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/sketch#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/softquad#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/spectrum#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/tex#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/troff#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/unicode#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/uuencode#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/varied.script#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/vorbis#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/warc#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/weak#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/windows#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/wordprocessors#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Magdir/xilinx#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Makefile.am#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/Makefile.std#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/file/NEWS#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/PORTING#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/file/README#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/TODO#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/acinclude.m4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/aclocal.m4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/apprentice.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/ascmagic.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/asprintf.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/compile#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/compress.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/config.guess#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/config.h.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/config.sub#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/configure#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/configure.ac#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/configure.in#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/file/elfclass.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/file.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/file.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/file.man#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/fsmagic.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/funcs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/getopt_long.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/is_tar.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/libmagic.man#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/magic.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/magic.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/magic.man#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/magic.mime#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/file/magic2mime#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/file/mkinstalldirs#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/file/mygetopt.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/names.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/patchlevel.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/print.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/readelf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/readelf.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/softmagic.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/tar.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/test.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/file/tests/Makefile.am#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/tests/Makefile.in#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/tests/README#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/tests/gedcom.magic#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/tests/gedcom.result#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/tests/gedcom.testfile#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/tests/test.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/file/vasprintf.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/config/arm/arm.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/config/freebsd-spec.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/config/freebsd.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/config/i386/freebsd64.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/config/mips/freebsd.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/gdb/gdb/arm-tdep.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/README#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/dtoa.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/gdtoa.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/gdtoaimp.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/gethex.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/strtoIg.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/strtod.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/strtodg.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/strtof.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/README#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/f.out#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/getround.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/xsum0.out#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/xsum0.out#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ipfilter/ipsend/44arp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-bpf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-int.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/lukemftpd/src/extern.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/lukemftpd/src/ftpcmd.y#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/lukemftpd/src/ftpd.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ANNOUNCE#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/FREEBSD-vendor#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/INSTALL#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/MANIFEST#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/NEWS#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/TO-DO#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/aclocal.m4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/announce.html.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/config.guess#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/config.sub#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/configure#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/configure.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/dist.mk#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/doc/html/announce.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/form/form.priv.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/form/frm_def.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/form/frm_driver.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/form/frm_req_name.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/include/MKterm.h.awk.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/include/capdefaults.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/include/curses.h.in#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/include/curses.tail#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/include/nc_alloc.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/include/nc_panel.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/include/ncurses_defs#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/include/term_entry.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/man/curs_getcchar.3x#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/man/curs_memleaks.3x#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/man/curs_terminfo.3x#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/man/curs_util.3x#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/man/form.3x#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/man/form_driver.3x#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/man/form_field_buffer.3x#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/man/man_db.renames#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/man/menu_attributes.3x#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/man/menu_driver.3x#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/man/menu_pattern.3x#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/man/ncurses.3x#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/menu/m_driver.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/menu/m_req_name.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/misc/ncu-indent#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/misc/ncurses.supp#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/misc/terminfo.src#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/MKkeyname.awk#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/MKlib_gen.sh#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/MKunctrl.awk#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/lib_addch.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/lib_delwin.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/lib_freeall.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/lib_getch.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/lib_getstr.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/lib_initscr.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/lib_mouse.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/lib_newterm.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/lib_newwin.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/lib_overlay.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/lib_restart.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/lib_screen.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/lib_set_term.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/lib_slk.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/lib_slkrefr.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/lib_ungetch.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/lib_window.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/resizeterm.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/tries.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/use_window.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/wresize.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/curses.priv.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/fifo_defs.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/llib-lncurses#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/llib-lncursest#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/llib-lncursesw#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/MKcodes.awk#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/MKnames.awk#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/alloc_entry.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/alloc_ttype.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/captoinfo.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/comp_expand.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/comp_hash.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/comp_parse.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/comp_scan.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/entries.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/home_terminfo.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/init_keytry.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/lib_acs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/lib_cur_term.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/lib_data.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/lib_options.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/lib_raw.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/lib_setup.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/lib_termcap.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/lib_tgoto.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/lib_tparm.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/lib_tputs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/make_keys.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/name_match.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/parse_entry.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/read_entry.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/use_screen.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tinfo/write_entry.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/trace/lib_trace.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/trace/lib_traceatr.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/trace/lib_tracebits.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/trace/lib_tracechr.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/trace/lib_tracedmp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/trace/lib_tracemse.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/trace/trace_buf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/trace/trace_tries.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/trace/varargs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/trace/visbuf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tty/hardscroll.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tty/lib_mvcur.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tty/lib_twait.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/tty/tty_update.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/widechar/charable.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/widechar/lib_get_wch.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/widechar/lib_get_wstr.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/widechar/lib_key_name.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/panel/p_new.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/panel/panel.priv.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/progs/MKtermsort.sh#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/progs/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/progs/dump_entry.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/progs/dump_entry.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/progs/infocmp.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/progs/progs.priv.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/progs/tic.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/progs/toe.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/progs/tput.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/progs/tset.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/netcat/FREEBSD-vendor#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/netcat/nc.1#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/netcat/netcat.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/libparse/clk_rawdcf.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/CREDITS#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/HISTORY#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/INSTALL#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/LICENSE#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/Makefile.am#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/NEWS#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/README#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/TODO#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/VERSION#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/audit/Makefile.am#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/audit/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/audit/audit.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/audit/audit.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditd/Makefile.am#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditd/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditd/audit_triggers.defs#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditd/audit_warn.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditd/auditd.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditd/auditd.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditd/auditd.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditd/auditd_control.defs#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditd/auditd_darwin.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditd/auditd_fbsd.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditfilterd/Makefile.am#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditfilterd/auditfilterd.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditreduce/Makefile.am#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditreduce/auditreduce.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditreduce/auditreduce.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditreduce/auditreduce.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/praudit/Makefile.am#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/praudit/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/praudit/praudit.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/praudit/praudit.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bsm/Makefile.am#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bsm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bsm/audit_uevents.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bsm/auditd_lib.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bsm/libbsm.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/compat/clock_gettime.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/compat/endian.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/compat/strlcat.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/compat/strlcpy.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/config/config.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/config/config.h.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/configure#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/configure.ac#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/etc/audit_event#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libauditd/Makefile.am#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libauditd/Makefile.in#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libauditd/auditd_lib.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/Makefile.am#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/au_class.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/au_errno.3#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/au_free_token.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/au_token.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/audit_submit.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_audit.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_class.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_control.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_errno.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_event.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_flags.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_io.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_mask.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_notify.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_token.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_user.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_wrappers.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/libbsm.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/man/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/man/audit.2#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/man/audit.log.5#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/man/audit_class.5#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/man/audit_control.5#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/man/audit_event.5#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/man/audit_user.5#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/man/audit_warn.5#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/man/auditctl.2#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/man/auditon.2#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/man/getaudit.2#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/man/getauid.2#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/man/setaudit.2#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/man/setauid.2#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/modules/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/modules/auditfilter_noop/Makefile.am#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/sys/Makefile.am#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/sys/Makefile.in#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/sys/bsm/Makefile.am#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/sys/bsm/Makefile.in#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/sys/bsm/audit.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/sys/bsm/audit_errno.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/sys/bsm/audit_internal.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/sys/bsm/audit_record.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/Makefile.am#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/bsm/Makefile.am#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/bsm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/bsm/generate.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/E2BIG_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EACCES_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EBADF_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EBUSY_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ECHILD_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EDEADLK_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EEXIST_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EFAULT_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EFBIG_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EINTR_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EINVAL_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EIO_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EISDIR_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EMFILE_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EMLINK_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ENFILE_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ENODEV_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ENOENT_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ENOEXEC_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ENOMEM_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ENOSPC_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ENOTBLK_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ENOTDIR_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ENOTTY_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ENXIO_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EPERM_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EPIPE_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EROFS_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ESPIPE_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ESRCH_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ETXTBSY_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EXDEV_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/arg32_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/data_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/file_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/header32_token#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/in_addr_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ip_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ipc_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/iport_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/opaque_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/path_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/process32_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/process32ex_record-IPv4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/process32ex_record-IPv6#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/process64_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/process64ex_record-IPv4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/process64ex_record-IPv6#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/return32_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/return32_token#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/seq_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/socketex_record#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/socketex_token#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/subject32_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/subject32ex_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/text_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/zonename_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/tools/Makefile.am#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/tools/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/KNOWNBUGS#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/PGPKEYS#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/README#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/RELEASE_NOTES#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/cf/README#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/cf/cf/submit.cf#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/cf/m4/version.m4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/include/libmilter/mfapi.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libmilter/Makefile.m4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libmilter/docs/smfi_opensocket.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libmilter/docs/smfi_version.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libmilter/main.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/libmilter/worker.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/mail.local/mail.local.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/makemap/makemap.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/makemap/makemap.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/smrsh/README#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/smrsh/smrsh.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/Makefile.m4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/README#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/collect.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/conf.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/daemon.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/envelope.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/err.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/mailq.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/mci.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/parseaddr.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/queue.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/ratectrl.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/readcf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/savemail.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/sfsasl.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/sm_resolve.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/srvrsmtp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/usersmtp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/util.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/sendmail/src/version.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/smbfs/lib/smb/nb_name.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcsh/sh.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcsh/tc.const.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/telnet/arpa/telnet.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/telnet/telnetd/ext.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/telnet/telnetd/sys_term.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/telnet/telnetd/telnetd.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/config.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/loginrec.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/moduli.5#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/fake-queue.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/tree.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/scp.1#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sftp-server.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sftp.1#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh-add.1#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh-agent.1#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh-keygen.1#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh-keyscan.1#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh-keysign.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh.1#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh_config.5#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshconnect2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshd.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshd.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshd_config.5#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/FREEBSD-Xlist#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/FREEBSD-upgrade#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/apps/speed.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/apps/spkac.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/apps/verify.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/apps/x509.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/ssl/s2_clnt.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/ssl/s2_srvr.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/ssl/s3_clnt.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/ssl/s3_srvr.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/ssl/ssltest.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/defaults/rc.conf#5 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/devd.conf#4 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/devd/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/etc/devd/asus.conf#1 branch .. //depot/projects/trustedbsd/capabilities/src/etc/etc.amd64/ttys#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/etc.arm/ttys#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/etc.i386/ttys#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/etc.ia64/ttys#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/etc.mips/ttys#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/etc.powerpc/ttys#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/etc.sparc64/ttys#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/gss/mech#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/mtree/BSD.include.dist#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/mtree/BSD.root.dist#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/mtree/BSD.usr.dist#4 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/network.subr#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/newsyslog.conf#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/periodic/daily/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/periodic/monthly/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/periodic/security/200.chkmounts#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/periodic/security/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/periodic/weekly/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/defaultroute#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/gssd#1 branch .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/jail#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/kernel_symlink#3 delete .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/netif#4 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/nfsd#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/savecore#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.initdiskless#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.subr#4 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/regdomain.xml#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/remote#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/sendmail/freebsd.mc#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/syslog.conf#2 integrate .. //depot/projects/trustedbsd/capabilities/src/games/fortune/datfiles/fortunes#5 integrate .. //depot/projects/trustedbsd/capabilities/src/games/fortune/datfiles/freebsd-tips#3 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/lib/csu/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/lib/libgcc/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/lib/libgomp/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/lib/libgomp/config.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/lib/libstdc++/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/binutils/as/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/binutils/as/mips-freebsd/targ-cpu.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/binutils/ld/Makefile.mips#1 branch .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh#1 branch .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh#1 branch .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh#1 branch .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh#1 branch .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/binutils/libbfd/Makefile.amd64#2 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/binutils/libbfd/Makefile.mips#1 branch .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/binutils/libbfd/bfd.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/binutils/libopcodes/Makefile.mips#1 branch .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/cc/Makefile.tgt#2 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/cc/cc_tools/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/cc/cc_tools/elfos-undef.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/cc/libiberty/config.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/gdb/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/gdb/arch/amd64/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/gdb/arch/i386/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/gdb/gdbserver/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/gdb/gdbserver/fbsd-arm-low.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/gdb/gdbserver/reg-arm.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/gdb/kgdb/kld.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/groff/tmac/mdoc.local#4 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/man/man/man.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/man/manpath/manpath.config#2 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/sort/config.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/include/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/include/arpa/nameser.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/include/arpa/telnet.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/include/resolv.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/include/rpc/svc_auth.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/include/rpc/xdr.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/include/string.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/include/strings.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/include/unistd.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/include/utmp.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/include/uuid.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/kerberos5/include/config.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/bind/bind/config.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/bind/bind/port_after.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/bind/bind/port_before.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/bind/config.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/bind/dns/code.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/bind/dns/dns/enumclass.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/bind/dns/dns/enumtype.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/bind/dns/dns/rdatastruct.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/bind/isc/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/bind/isc/isc/platform.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_check_magic.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_endian.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_entry.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_entry.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_entry_copy_stat.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_entry_link_resolver.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 13 17:15:48 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A6D3F1065675; Tue, 13 Jan 2009 17:15:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 64B64106564A for ; Tue, 13 Jan 2009 17:15:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1CB698FC08 for ; Tue, 13 Jan 2009 17:15:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0DHFlo0058983 for ; Tue, 13 Jan 2009 17:15:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0DHFloj058981 for perforce@freebsd.org; Tue, 13 Jan 2009 17:15:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 13 Jan 2009 17:15:47 GMT Message-Id: <200901131715.n0DHFloj058981@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156096 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Jan 2009 17:15:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=156096 Change 156096 by rwatson@rwatson_freebsd_capabilities on 2009/01/13 17:15:39 OpenSolaris compat code now hides fget_{read,write}() behind getf(), so update it to capability support. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/sys/file.h#2 edit .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#4 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/sys/file.h#2 (text+ko) ==== @@ -39,9 +39,11 @@ { struct file *fp; - if (write && fget_write(curthread, fd, &fp) == 0) + if (write && fget_write(curthread, fd, CAP_WRITE | CAP_SEEK, &fp) == + 0) return (fp); - else if (!write && fget_read(curthread, fd, &fp) == 0) + else if (!write && fget_read(curthread, CAP_READ | CAP_SEEK, fd, + &fp) == 0) return (fp); return (NULL); } ==== //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#4 (text+ko) ==== @@ -2466,10 +2466,6 @@ &props)) != 0) return (error); -#if 0 - /* XXXRW: Is this the right capability? */ - error = fget_read(td, zc->zc_cookie, CAP_READ | CAP_SEEK, &fp); -#endif fd = zc->zc_cookie; fp = getf(fd, 0); if (fp == NULL) { @@ -2619,12 +2615,6 @@ fp = getf(zc->zc_cookie, 1); if (fp == NULL) { -#if 0 - fd = zc->zc_cookie; - /* XXXRW: Is this the right capability? */ - error = fget_write(td, fd, CAP_WRITE | CAP_SEEK, &fp); - if (error) { -#endif dmu_objset_close(tosnap); if (fromsnap) dmu_objset_close(fromsnap); From owner-p4-projects@FreeBSD.ORG Tue Jan 13 19:15:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E4A7A1065C1C; Tue, 13 Jan 2009 19:15:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D5381065C3B for ; Tue, 13 Jan 2009 19:15:02 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AA83B8FC20 for ; Tue, 13 Jan 2009 19:14:59 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0DJExjm073386 for ; Tue, 13 Jan 2009 19:14:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0DJExOb073384 for perforce@freebsd.org; Tue, 13 Jan 2009 19:14:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 13 Jan 2009 19:14:59 GMT Message-Id: <200901131914.n0DJExOb073384@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156104 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Jan 2009 19:15:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=156104 Change 156104 by rwatson@rwatson_freebsd_capabilities on 2009/01/13 19:14:43 Fix capability syscall numbering post-integ, regenerate. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#21 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.master#13 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#21 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#21 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#21 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#21 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#21 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.230 2008/11/09 10:48:06 ed Exp $ - * created from FreeBSD: head/sys/kern/syscalls.master 184789 2008-11-09 10:45:13Z ed + * $FreeBSD$ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.249 2008/11/09 10:45:13 ed Exp */ const char *syscallnames[] = { @@ -513,4 +513,8 @@ "unlinkat", /* 503 = unlinkat */ "posix_openpt", /* 504 = posix_openpt */ "gssd_syscall", /* 505 = gssd_syscall */ + "cap_new", /* 506 = cap_new */ + "cap_getrights", /* 507 = cap_getrights */ + "cap_enter", /* 508 = cap_enter */ + "cap_getmode", /* 509 = cap_getmode */ }; ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.master#13 (text+ko) ==== @@ -897,10 +897,10 @@ 504 AUE_POSIX_OPENPT STD { int posix_openpt(int flags); } ; 505 is initialised by the kgssapi code, if present. 505 AUE_NULL NOSTD { int gssd_syscall(char *path); } -505 AUE_CAP_NEW STD { int cap_new(int fd, u_int64_t rights); } -506 AUE_CAP_GETRIGHTS STD { int cap_getrights(int fd, \ +506 AUE_CAP_NEW STD { int cap_new(int fd, u_int64_t rights); } +507 AUE_CAP_GETRIGHTS STD { int cap_getrights(int fd, \ u_int64_t *rightsp); } -507 AUE_CAP_ENTER STD { int cap_enter(void); } -508 AUE_CAP_GETMODE STD { int cap_getmode(u_int *modep); } +508 AUE_CAP_ENTER STD { int cap_enter(void); } +509 AUE_CAP_GETMODE STD { int cap_getmode(u_int *modep); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#21 (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.28 2008/11/09 10:48:06 ed Exp $ + * $FreeBSD$ * This file is part of the DTrace syscall provider. */ @@ -3040,6 +3040,34 @@ *n_args = 1; break; } + /* cap_new */ + case 506: { + struct cap_new_args *p = params; + iarg[0] = p->fd; /* int */ + uarg[1] = p->rights; /* u_int64_t */ + *n_args = 2; + break; + } + /* cap_getrights */ + case 507: { + struct cap_getrights_args *p = params; + iarg[0] = p->fd; /* int */ + uarg[1] = (intptr_t) p->rightsp; /* u_int64_t * */ + *n_args = 2; + break; + } + /* cap_enter */ + case 508: { + *n_args = 0; + break; + } + /* cap_getmode */ + case 509: { + struct cap_getmode_args *p = params; + uarg[0] = (intptr_t) p->modep; /* u_int * */ + *n_args = 1; + break; + } default: *n_args = 0; break; @@ -8070,6 +8098,45 @@ break; }; break; + /* cap_new */ + case 506: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "u_int64_t"; + break; + default: + break; + }; + break; + /* cap_getrights */ + case 507: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "u_int64_t *"; + break; + default: + break; + }; + break; + /* cap_enter */ + case 508: + break; + /* cap_getmode */ + case 509: + switch(ndx) { + case 0: + p = "u_int *"; + break; + default: + break; + }; + break; default: break; }; ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#21 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/syscall.h,v 1.227 2008/11/09 10:48:06 ed Exp $ - * created from FreeBSD: head/sys/kern/syscalls.master 184789 2008-11-09 10:45:13Z ed + * $FreeBSD$ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.249 2008/11/09 10:45:13 ed Exp */ #define SYS_syscall 0 @@ -421,4 +421,8 @@ #define SYS_unlinkat 503 #define SYS_posix_openpt 504 #define SYS_gssd_syscall 505 -#define SYS_MAXSYSCALL 506 +#define SYS_cap_new 506 +#define SYS_cap_getrights 507 +#define SYS_cap_enter 508 +#define SYS_cap_getmode 509 +#define SYS_MAXSYSCALL 510 ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#21 (text+ko) ==== @@ -1,7 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.182 2008/11/09 10:48:06 ed Exp $ -# created from FreeBSD: head/sys/kern/syscalls.master 184789 2008-11-09 10:45:13Z ed +# $FreeBSD$ +# created from FreeBSD: src/sys/kern/syscalls.master,v 1.249 2008/11/09 10:45:13 ed Exp MIASM = \ syscall.o \ exit.o \ @@ -369,4 +369,8 @@ symlinkat.o \ unlinkat.o \ posix_openpt.o \ - gssd_syscall.o + gssd_syscall.o \ + cap_new.o \ + cap_getrights.o \ + cap_enter.o \ + cap_getmode.o ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#21 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.231 2008/11/09 10:48:06 ed Exp $ - * created from FreeBSD: head/sys/kern/syscalls.master 184789 2008-11-09 10:45:13Z ed + * $FreeBSD$ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.249 2008/11/09 10:45:13 ed Exp */ #ifndef _SYS_SYSPROTO_H_ @@ -1625,6 +1625,20 @@ struct gssd_syscall_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; }; +struct cap_new_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char rights_l_[PADL_(u_int64_t)]; u_int64_t rights; char rights_r_[PADR_(u_int64_t)]; +}; +struct cap_getrights_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char rightsp_l_[PADL_(u_int64_t *)]; u_int64_t * rightsp; char rightsp_r_[PADR_(u_int64_t *)]; +}; +struct cap_enter_args { + register_t dummy; +}; +struct cap_getmode_args { + char modep_l_[PADL_(u_int *)]; u_int * modep; char modep_r_[PADR_(u_int *)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); int fork(struct thread *, struct fork_args *); @@ -1979,6 +1993,10 @@ int unlinkat(struct thread *, struct unlinkat_args *); int posix_openpt(struct thread *, struct posix_openpt_args *); int gssd_syscall(struct thread *, struct gssd_syscall_args *); +int cap_new(struct thread *, struct cap_new_args *); +int cap_getrights(struct thread *, struct cap_getrights_args *); +int cap_enter(struct thread *, struct cap_enter_args *); +int cap_getmode(struct thread *, struct cap_getmode_args *); #ifdef COMPAT_43 @@ -2572,6 +2590,10 @@ #define SYS_AUE_unlinkat AUE_UNLINKAT #define SYS_AUE_posix_openpt AUE_POSIX_OPENPT #define SYS_AUE_gssd_syscall AUE_NULL +#define SYS_AUE_cap_new AUE_CAP_NEW +#define SYS_AUE_cap_getrights AUE_CAP_GETRIGHTS +#define SYS_AUE_cap_enter AUE_CAP_ENTER +#define SYS_AUE_cap_getmode AUE_CAP_GETMODE #undef PAD_ #undef PADL_ From owner-p4-projects@FreeBSD.ORG Tue Jan 13 19:22:07 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 979681065689; Tue, 13 Jan 2009 19:22:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 50EDD106567A for ; Tue, 13 Jan 2009 19:22:07 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3AFBF8FC17 for ; Tue, 13 Jan 2009 19:22:07 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0DJM7Z5074032 for ; Tue, 13 Jan 2009 19:22:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0DJM73w074030 for perforce@freebsd.org; Tue, 13 Jan 2009 19:22:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 13 Jan 2009 19:22:07 GMT Message-Id: <200901131922.n0DJM73w074030@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156107 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Jan 2009 19:22:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=156107 Change 156107 by rwatson@rwatson_freebsd_capabilities on 2009/01/13 19:21:16 Regenerate 32-bit compat syscalls for capabilities. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_proto.h#9 edit .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscall.h#9 edit .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscalls.c#9 edit .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_sysent.c#9 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_proto.h#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.98 2008/12/10 20:57:16 jhb Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185878 2008-12-10 20:56:19Z jhb + * $FreeBSD$ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.113 2008/12/10 20:56:19 jhb Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -439,6 +439,20 @@ char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char times_l_[PADL_(struct timeval *)]; struct timeval * times; char times_r_[PADR_(struct timeval *)]; }; +struct cap_new_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char rights_l_[PADL_(u_int64_t)]; u_int64_t rights; char rights_r_[PADR_(u_int64_t)]; +}; +struct cap_getrights_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char rightsp_l_[PADL_(u_int64_t *)]; u_int64_t * rightsp; char rightsp_r_[PADR_(u_int64_t *)]; +}; +struct cap_enter_args { + register_t dummy; +}; +struct cap_getmode_args { + char modep_l_[PADL_(u_int *)]; u_int * modep; char modep_r_[PADR_(u_int *)]; +}; int freebsd32_wait4(struct thread *, struct freebsd32_wait4_args *); int freebsd32_recvmsg(struct thread *, struct freebsd32_recvmsg_args *); int freebsd32_sendmsg(struct thread *, struct freebsd32_sendmsg_args *); @@ -519,6 +533,10 @@ int freebsd32_fexecve(struct thread *, struct freebsd32_fexecve_args *); int freebsd32_fstatat(struct thread *, struct freebsd32_fstatat_args *); int freebsd32_futimesat(struct thread *, struct freebsd32_futimesat_args *); +int cap_new(struct thread *, struct cap_new_args *); +int cap_getrights(struct thread *, struct cap_getrights_args *); +int cap_enter(struct thread *, struct cap_enter_args *); +int cap_getmode(struct thread *, struct cap_getmode_args *); #ifdef COMPAT_43 @@ -745,6 +763,10 @@ #define FREEBSD32_SYS_AUE_freebsd32_fexecve AUE_FEXECVE #define FREEBSD32_SYS_AUE_freebsd32_fstatat AUE_FSTATAT #define FREEBSD32_SYS_AUE_freebsd32_futimesat AUE_FUTIMESAT +#define FREEBSD32_SYS_AUE_cap_new AUE_CAP_NEW +#define FREEBSD32_SYS_AUE_cap_getrights AUE_CAP_GETRIGHTS +#define FREEBSD32_SYS_AUE_cap_enter AUE_CAP_ENTER +#define FREEBSD32_SYS_AUE_cap_getmode AUE_CAP_GETMODE #undef PAD_ #undef PADL_ ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscall.h#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.97 2008/12/10 20:57:16 jhb Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185878 2008-12-10 20:56:19Z jhb + * $FreeBSD$ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.113 2008/12/10 20:56:19 jhb Exp */ #define FREEBSD32_SYS_syscall 0 @@ -368,4 +368,9 @@ #define FREEBSD32_SYS_symlinkat 502 #define FREEBSD32_SYS_unlinkat 503 #define FREEBSD32_SYS_posix_openpt 504 -#define FREEBSD32_SYS_MAXSYSCALL 506 +#define FREEBSD32_SYS_posix_openpt 506 +#define FREEBSD32_SYS_cap_new 507 +#define FREEBSD32_SYS_cap_getrights 508 +#define FREEBSD32_SYS_cap_enter 509 +#define FREEBSD32_SYS_cap_getmode 510 +#define FREEBSD32_SYS_MAXSYSCALL 511 ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscalls.c#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.88 2008/12/10 20:57:16 jhb Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185878 2008-12-10 20:56:19Z jhb + * $FreeBSD$ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.113 2008/12/10 20:56:19 jhb Exp */ const char *freebsd32_syscallnames[] = { @@ -513,4 +513,9 @@ "unlinkat", /* 503 = unlinkat */ "posix_openpt", /* 504 = posix_openpt */ "#505", /* 505 = gssd_syscall */ + "posix_openpt", /* 506 = posix_openpt */ + "cap_new", /* 507 = cap_new */ + "cap_getrights", /* 508 = cap_getrights */ + "cap_enter", /* 509 = cap_enter */ + "cap_getmode", /* 510 = cap_getmode */ }; ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_sysent.c#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.98 2008/12/10 20:57:16 jhb Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185878 2008-12-10 20:56:19Z jhb + * $FreeBSD$ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.113 2008/12/10 20:56:19 jhb Exp */ #include "opt_compat.h" @@ -38,510 +38,515 @@ /* The casts are bogus but will do for now. */ struct sysent freebsd32_sysent[] = { - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 0 = syscall */ - { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0 }, /* 1 = exit */ - { 0, (sy_call_t *)fork, AUE_FORK, NULL, 0, 0 }, /* 2 = fork */ - { AS(read_args), (sy_call_t *)read, AUE_READ, NULL, 0, 0 }, /* 3 = read */ - { AS(write_args), (sy_call_t *)write, AUE_WRITE, NULL, 0, 0 }, /* 4 = write */ - { AS(open_args), (sy_call_t *)open, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 5 = open */ - { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0 }, /* 6 = close */ - { AS(freebsd32_wait4_args), (sy_call_t *)freebsd32_wait4, AUE_WAIT4, NULL, 0, 0 }, /* 7 = freebsd32_wait4 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 8 = obsolete old creat */ - { AS(link_args), (sy_call_t *)link, AUE_LINK, NULL, 0, 0 }, /* 9 = link */ - { AS(unlink_args), (sy_call_t *)unlink, AUE_UNLINK, NULL, 0, 0 }, /* 10 = unlink */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 11 = obsolete execv */ - { AS(chdir_args), (sy_call_t *)chdir, AUE_CHDIR, NULL, 0, 0 }, /* 12 = chdir */ - { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR, NULL, 0, 0 }, /* 13 = fchdir */ - { AS(mknod_args), (sy_call_t *)mknod, AUE_MKNOD, NULL, 0, 0 }, /* 14 = mknod */ - { AS(chmod_args), (sy_call_t *)chmod, AUE_CHMOD, NULL, 0, 0 }, /* 15 = chmod */ - { AS(chown_args), (sy_call_t *)chown, AUE_CHOWN, NULL, 0, 0 }, /* 16 = chown */ - { AS(obreak_args), (sy_call_t *)obreak, AUE_NULL, NULL, 0, 0 }, /* 17 = break */ - { compat4(AS(freebsd4_freebsd32_getfsstat_args),freebsd32_getfsstat), AUE_GETFSSTAT, NULL, 0, 0 }, /* 18 = old freebsd32_getfsstat */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 19 = obsolete olseek */ - { 0, (sy_call_t *)getpid, AUE_GETPID, NULL, 0, 0 }, /* 20 = getpid */ - { AS(mount_args), (sy_call_t *)mount, AUE_MOUNT, NULL, 0, 0 }, /* 21 = mount */ - { AS(unmount_args), (sy_call_t *)unmount, AUE_UMOUNT, NULL, 0, 0 }, /* 22 = unmount */ - { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID, NULL, 0, 0 }, /* 23 = setuid */ - { 0, (sy_call_t *)getuid, AUE_GETUID, NULL, 0, 0 }, /* 24 = getuid */ - { 0, (sy_call_t *)geteuid, AUE_GETEUID, NULL, 0, 0 }, /* 25 = geteuid */ - { AS(ptrace_args), (sy_call_t *)ptrace, AUE_PTRACE, NULL, 0, 0 }, /* 26 = ptrace */ - { AS(freebsd32_recvmsg_args), (sy_call_t *)freebsd32_recvmsg, AUE_RECVMSG, NULL, 0, 0 }, /* 27 = freebsd32_recvmsg */ - { AS(freebsd32_sendmsg_args), (sy_call_t *)freebsd32_sendmsg, AUE_SENDMSG, NULL, 0, 0 }, /* 28 = freebsd32_sendmsg */ - { AS(freebsd32_recvfrom_args), (sy_call_t *)freebsd32_recvfrom, AUE_RECVFROM, NULL, 0, 0 }, /* 29 = freebsd32_recvfrom */ - { AS(accept_args), (sy_call_t *)accept, AUE_ACCEPT, NULL, 0, 0 }, /* 30 = accept */ - { AS(getpeername_args), (sy_call_t *)getpeername, AUE_GETPEERNAME, NULL, 0, 0 }, /* 31 = getpeername */ - { AS(getsockname_args), (sy_call_t *)getsockname, AUE_GETSOCKNAME, NULL, 0, 0 }, /* 32 = getsockname */ - { AS(access_args), (sy_call_t *)access, AUE_ACCESS, NULL, 0, 0 }, /* 33 = access */ - { AS(chflags_args), (sy_call_t *)chflags, AUE_CHFLAGS, NULL, 0, 0 }, /* 34 = chflags */ - { AS(fchflags_args), (sy_call_t *)fchflags, AUE_FCHFLAGS, NULL, 0, 0 }, /* 35 = fchflags */ - { 0, (sy_call_t *)sync, AUE_SYNC, NULL, 0, 0 }, /* 36 = sync */ - { AS(kill_args), (sy_call_t *)kill, AUE_KILL, NULL, 0, 0 }, /* 37 = kill */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 38 = ostat */ - { 0, (sy_call_t *)getppid, AUE_GETPPID, NULL, 0, 0 }, /* 39 = getppid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 40 = olstat */ - { AS(dup_args), (sy_call_t *)dup, AUE_DUP, NULL, 0, 0 }, /* 41 = dup */ - { 0, (sy_call_t *)pipe, AUE_PIPE, NULL, 0, 0 }, /* 42 = pipe */ - { 0, (sy_call_t *)getegid, AUE_GETEGID, NULL, 0, 0 }, /* 43 = getegid */ - { AS(profil_args), (sy_call_t *)profil, AUE_PROFILE, NULL, 0, 0 }, /* 44 = profil */ - { AS(ktrace_args), (sy_call_t *)ktrace, AUE_KTRACE, NULL, 0, 0 }, /* 45 = ktrace */ - { compat(AS(ofreebsd32_sigaction_args),freebsd32_sigaction), AUE_SIGACTION, NULL, 0, 0 }, /* 46 = old freebsd32_sigaction */ - { 0, (sy_call_t *)getgid, AUE_GETGID, NULL, 0, 0 }, /* 47 = getgid */ - { compat(AS(ofreebsd32_sigprocmask_args),freebsd32_sigprocmask), AUE_SIGPROCMASK, NULL, 0, 0 }, /* 48 = old freebsd32_sigprocmask */ - { AS(getlogin_args), (sy_call_t *)getlogin, AUE_GETLOGIN, NULL, 0, 0 }, /* 49 = getlogin */ - { AS(setlogin_args), (sy_call_t *)setlogin, AUE_SETLOGIN, NULL, 0, 0 }, /* 50 = setlogin */ - { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0 }, /* 51 = acct */ - { compat(0,freebsd32_sigpending), AUE_SIGPENDING, NULL, 0, 0 }, /* 52 = old freebsd32_sigpending */ - { AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack, AUE_SIGALTSTACK, NULL, 0, 0 }, /* 53 = freebsd32_sigaltstack */ - { AS(freebsd32_ioctl_args), (sy_call_t *)freebsd32_ioctl, AUE_NULL, NULL, 0, 0 }, /* 54 = freebsd32_ioctl */ - { AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT, NULL, 0, 0 }, /* 55 = reboot */ - { AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE, NULL, 0, 0 }, /* 56 = revoke */ - { AS(symlink_args), (sy_call_t *)symlink, AUE_SYMLINK, NULL, 0, 0 }, /* 57 = symlink */ - { AS(readlink_args), (sy_call_t *)readlink, AUE_READLINK, NULL, 0, 0 }, /* 58 = readlink */ - { AS(freebsd32_execve_args), (sy_call_t *)freebsd32_execve, AUE_EXECVE, NULL, 0, 0 }, /* 59 = freebsd32_execve */ - { AS(umask_args), (sy_call_t *)umask, AUE_UMASK, NULL, 0, 0 }, /* 60 = umask */ - { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT, NULL, 0, 0 }, /* 61 = chroot */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 62 = obsolete ofstat */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 63 = obsolete ogetkerninfo */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 64 = obsolete ogetpagesize */ - { AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0 }, /* 65 = msync */ - { 0, (sy_call_t *)vfork, AUE_VFORK, NULL, 0, 0 }, /* 66 = vfork */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 67 = obsolete vread */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 68 = obsolete vwrite */ - { AS(sbrk_args), (sy_call_t *)sbrk, AUE_SBRK, NULL, 0, 0 }, /* 69 = sbrk */ - { AS(sstk_args), (sy_call_t *)sstk, AUE_SSTK, NULL, 0, 0 }, /* 70 = sstk */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 71 = obsolete ommap */ - { AS(ovadvise_args), (sy_call_t *)ovadvise, AUE_O_VADVISE, NULL, 0, 0 }, /* 72 = vadvise */ - { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0 }, /* 73 = munmap */ - { AS(mprotect_args), (sy_call_t *)mprotect, AUE_MPROTECT, NULL, 0, 0 }, /* 74 = mprotect */ - { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0 }, /* 75 = madvise */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 76 = obsolete vhangup */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 77 = obsolete vlimit */ - { AS(mincore_args), (sy_call_t *)mincore, AUE_MINCORE, NULL, 0, 0 }, /* 78 = mincore */ - { AS(getgroups_args), (sy_call_t *)getgroups, AUE_GETGROUPS, NULL, 0, 0 }, /* 79 = getgroups */ - { AS(setgroups_args), (sy_call_t *)setgroups, AUE_SETGROUPS, NULL, 0, 0 }, /* 80 = setgroups */ - { 0, (sy_call_t *)getpgrp, AUE_GETPGRP, NULL, 0, 0 }, /* 81 = getpgrp */ - { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP, NULL, 0, 0 }, /* 82 = setpgid */ - { AS(freebsd32_setitimer_args), (sy_call_t *)freebsd32_setitimer, AUE_SETITIMER, NULL, 0, 0 }, /* 83 = freebsd32_setitimer */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 84 = obsolete owait */ - { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON, NULL, 0, 0 }, /* 85 = swapon */ - { AS(freebsd32_getitimer_args), (sy_call_t *)freebsd32_getitimer, AUE_GETITIMER, NULL, 0, 0 }, /* 86 = freebsd32_getitimer */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 87 = obsolete ogethostname */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 88 = obsolete osethostname */ - { 0, (sy_call_t *)getdtablesize, AUE_GETDTABLESIZE, NULL, 0, 0 }, /* 89 = getdtablesize */ - { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2, NULL, 0, 0 }, /* 90 = dup2 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 91 = getdopt */ - { AS(fcntl_args), (sy_call_t *)fcntl, AUE_FCNTL, NULL, 0, 0 }, /* 92 = fcntl */ - { AS(freebsd32_select_args), (sy_call_t *)freebsd32_select, AUE_SELECT, NULL, 0, 0 }, /* 93 = freebsd32_select */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 94 = setdopt */ - { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0 }, /* 95 = fsync */ - { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY, NULL, 0, 0 }, /* 96 = setpriority */ - { AS(socket_args), (sy_call_t *)socket, AUE_SOCKET, NULL, 0, 0 }, /* 97 = socket */ - { AS(connect_args), (sy_call_t *)connect, AUE_CONNECT, NULL, 0, 0 }, /* 98 = connect */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 99 = obsolete oaccept */ - { AS(getpriority_args), (sy_call_t *)getpriority, AUE_GETPRIORITY, NULL, 0, 0 }, /* 100 = getpriority */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 101 = obsolete osend */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 102 = obsolete orecv */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 103 = obsolete osigreturn */ - { AS(bind_args), (sy_call_t *)bind, AUE_BIND, NULL, 0, 0 }, /* 104 = bind */ - { AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT, NULL, 0, 0 }, /* 105 = setsockopt */ - { AS(listen_args), (sy_call_t *)listen, AUE_LISTEN, NULL, 0, 0 }, /* 106 = listen */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 107 = obsolete vtimes */ - { compat(AS(ofreebsd32_sigvec_args),freebsd32_sigvec), AUE_O_SIGVEC, NULL, 0, 0 }, /* 108 = old freebsd32_sigvec */ - { compat(AS(ofreebsd32_sigblock_args),freebsd32_sigblock), AUE_O_SIGBLOCK, NULL, 0, 0 }, /* 109 = old freebsd32_sigblock */ - { compat(AS(ofreebsd32_sigsetmask_args),freebsd32_sigsetmask), AUE_O_SIGSETMASK, NULL, 0, 0 }, /* 110 = old freebsd32_sigsetmask */ - { compat(AS(ofreebsd32_sigsuspend_args),freebsd32_sigsuspend), AUE_SIGSUSPEND, NULL, 0, 0 }, /* 111 = old freebsd32_sigsuspend */ - { compat(AS(ofreebsd32_sigstack_args),freebsd32_sigstack), AUE_O_SIGSTACK, NULL, 0, 0 }, /* 112 = old freebsd32_sigstack */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 113 = obsolete orecvmsg */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 114 = obsolete osendmsg */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 115 = obsolete vtrace */ - { AS(freebsd32_gettimeofday_args), (sy_call_t *)freebsd32_gettimeofday, AUE_GETTIMEOFDAY, NULL, 0, 0 }, /* 116 = freebsd32_gettimeofday */ - { AS(freebsd32_getrusage_args), (sy_call_t *)freebsd32_getrusage, AUE_GETRUSAGE, NULL, 0, 0 }, /* 117 = freebsd32_getrusage */ - { AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_GETSOCKOPT, NULL, 0, 0 }, /* 118 = getsockopt */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 119 = resuba */ - { AS(freebsd32_readv_args), (sy_call_t *)freebsd32_readv, AUE_READV, NULL, 0, 0 }, /* 120 = freebsd32_readv */ - { AS(freebsd32_writev_args), (sy_call_t *)freebsd32_writev, AUE_WRITEV, NULL, 0, 0 }, /* 121 = freebsd32_writev */ - { AS(freebsd32_settimeofday_args), (sy_call_t *)freebsd32_settimeofday, AUE_SETTIMEOFDAY, NULL, 0, 0 }, /* 122 = freebsd32_settimeofday */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN, NULL, 0, 0 }, /* 123 = fchown */ - { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD, NULL, 0, 0 }, /* 124 = fchmod */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 125 = obsolete orecvfrom */ - { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID, NULL, 0, 0 }, /* 126 = setreuid */ - { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID, NULL, 0, 0 }, /* 127 = setregid */ - { AS(rename_args), (sy_call_t *)rename, AUE_RENAME, NULL, 0, 0 }, /* 128 = rename */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 129 = obsolete otruncate */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 130 = obsolete ftruncate */ - { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0 }, /* 131 = flock */ - { AS(mkfifo_args), (sy_call_t *)mkfifo, AUE_MKFIFO, NULL, 0, 0 }, /* 132 = mkfifo */ - { AS(sendto_args), (sy_call_t *)sendto, AUE_SENDTO, NULL, 0, 0 }, /* 133 = sendto */ - { AS(shutdown_args), (sy_call_t *)shutdown, AUE_SHUTDOWN, NULL, 0, 0 }, /* 134 = shutdown */ - { AS(socketpair_args), (sy_call_t *)socketpair, AUE_SOCKETPAIR, NULL, 0, 0 }, /* 135 = socketpair */ - { AS(mkdir_args), (sy_call_t *)mkdir, AUE_MKDIR, NULL, 0, 0 }, /* 136 = mkdir */ - { AS(rmdir_args), (sy_call_t *)rmdir, AUE_RMDIR, NULL, 0, 0 }, /* 137 = rmdir */ - { AS(freebsd32_utimes_args), (sy_call_t *)freebsd32_utimes, AUE_UTIMES, NULL, 0, 0 }, /* 138 = freebsd32_utimes */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 139 = obsolete 4.2 sigreturn */ - { AS(freebsd32_adjtime_args), (sy_call_t *)freebsd32_adjtime, AUE_ADJTIME, NULL, 0, 0 }, /* 140 = freebsd32_adjtime */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 141 = obsolete ogetpeername */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 142 = obsolete ogethostid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 143 = obsolete sethostid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 144 = obsolete getrlimit */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 145 = obsolete setrlimit */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 146 = obsolete killpg */ - { 0, (sy_call_t *)setsid, AUE_SETSID, NULL, 0, 0 }, /* 147 = setsid */ - { AS(quotactl_args), (sy_call_t *)quotactl, AUE_QUOTACTL, NULL, 0, 0 }, /* 148 = quotactl */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 149 = obsolete oquota */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 150 = obsolete ogetsockname */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 151 = sem_lock */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 152 = sem_wakeup */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 153 = asyncdaemon */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 154 = nlm_syscall */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 155 = nfssvc */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 156 = obsolete ogetdirentries */ - { compat4(AS(freebsd4_freebsd32_statfs_args),freebsd32_statfs), AUE_STATFS, NULL, 0, 0 }, /* 157 = old freebsd32_statfs */ - { compat4(AS(freebsd4_freebsd32_fstatfs_args),freebsd32_fstatfs), AUE_FSTATFS, NULL, 0, 0 }, /* 158 = old freebsd32_fstatfs */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 159 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 160 = lgetfh */ - { AS(getfh_args), (sy_call_t *)getfh, AUE_NFS_GETFH, NULL, 0, 0 }, /* 161 = getfh */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 162 = obsolete getdomainname */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 163 = obsolete setdomainname */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 164 = obsolete uname */ - { AS(sysarch_args), (sy_call_t *)sysarch, AUE_SYSARCH, NULL, 0, 0 }, /* 165 = sysarch */ - { AS(rtprio_args), (sy_call_t *)rtprio, AUE_RTPRIO, NULL, 0, 0 }, /* 166 = rtprio */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 167 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 168 = nosys */ - { AS(freebsd32_semsys_args), (sy_call_t *)freebsd32_semsys, AUE_SEMSYS, NULL, 0, 0 }, /* 169 = freebsd32_semsys */ - { AS(freebsd32_msgsys_args), (sy_call_t *)freebsd32_msgsys, AUE_MSGSYS, NULL, 0, 0 }, /* 170 = freebsd32_msgsys */ - { AS(freebsd32_shmsys_args), (sy_call_t *)freebsd32_shmsys, AUE_SHMSYS, NULL, 0, 0 }, /* 171 = freebsd32_shmsys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 172 = nosys */ - { compat6(AS(freebsd6_freebsd32_pread_args),freebsd32_pread), AUE_PREAD, NULL, 0, 0 }, /* 173 = old freebsd32_pread */ - { compat6(AS(freebsd6_freebsd32_pwrite_args),freebsd32_pwrite), AUE_PWRITE, NULL, 0, 0 }, /* 174 = old freebsd32_pwrite */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 175 = nosys */ - { AS(ntp_adjtime_args), (sy_call_t *)ntp_adjtime, AUE_NTP_ADJTIME, NULL, 0, 0 }, /* 176 = ntp_adjtime */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 177 = sfork */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 178 = getdescriptor */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 179 = setdescriptor */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 180 = nosys */ - { AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID, NULL, 0, 0 }, /* 181 = setgid */ - { AS(setegid_args), (sy_call_t *)setegid, AUE_SETEGID, NULL, 0, 0 }, /* 182 = setegid */ - { AS(seteuid_args), (sy_call_t *)seteuid, AUE_SETEUID, NULL, 0, 0 }, /* 183 = seteuid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 184 = lfs_bmapv */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 185 = lfs_markv */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 186 = lfs_segclean */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 187 = lfs_segwait */ - { AS(freebsd32_stat_args), (sy_call_t *)freebsd32_stat, AUE_STAT, NULL, 0, 0 }, /* 188 = freebsd32_stat */ - { AS(freebsd32_fstat_args), (sy_call_t *)freebsd32_fstat, AUE_FSTAT, NULL, 0, 0 }, /* 189 = freebsd32_fstat */ - { AS(freebsd32_lstat_args), (sy_call_t *)freebsd32_lstat, AUE_LSTAT, NULL, 0, 0 }, /* 190 = freebsd32_lstat */ - { AS(pathconf_args), (sy_call_t *)pathconf, AUE_PATHCONF, NULL, 0, 0 }, /* 191 = pathconf */ - { AS(fpathconf_args), (sy_call_t *)fpathconf, AUE_FPATHCONF, NULL, 0, 0 }, /* 192 = fpathconf */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 193 = nosys */ - { AS(__getrlimit_args), (sy_call_t *)getrlimit, AUE_GETRLIMIT, NULL, 0, 0 }, /* 194 = getrlimit */ - { AS(__setrlimit_args), (sy_call_t *)setrlimit, AUE_SETRLIMIT, NULL, 0, 0 }, /* 195 = setrlimit */ - { AS(freebsd32_getdirentries_args), (sy_call_t *)freebsd32_getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 196 = freebsd32_getdirentries */ - { compat6(AS(freebsd6_freebsd32_mmap_args),freebsd32_mmap), AUE_MMAP, NULL, 0, 0 }, /* 197 = old freebsd32_mmap */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 198 = __syscall */ - { compat6(AS(freebsd6_freebsd32_lseek_args),freebsd32_lseek), AUE_LSEEK, NULL, 0, 0 }, /* 199 = old freebsd32_lseek */ - { compat6(AS(freebsd6_freebsd32_truncate_args),freebsd32_truncate), AUE_TRUNCATE, NULL, 0, 0 }, /* 200 = old freebsd32_truncate */ - { compat6(AS(freebsd6_freebsd32_ftruncate_args),freebsd32_ftruncate), AUE_FTRUNCATE, NULL, 0, 0 }, /* 201 = old freebsd32_ftruncate */ - { AS(freebsd32_sysctl_args), (sy_call_t *)freebsd32_sysctl, AUE_SYSCTL, NULL, 0, 0 }, /* 202 = freebsd32_sysctl */ - { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK, NULL, 0, 0 }, /* 203 = mlock */ - { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK, NULL, 0, 0 }, /* 204 = munlock */ - { AS(undelete_args), (sy_call_t *)undelete, AUE_UNDELETE, NULL, 0, 0 }, /* 205 = undelete */ - { AS(freebsd32_futimes_args), (sy_call_t *)freebsd32_futimes, AUE_FUTIMES, NULL, 0, 0 }, /* 206 = freebsd32_futimes */ - { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0 }, /* 207 = getpgid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 208 = newreboot */ - { AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0 }, /* 209 = poll */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 210 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 211 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 212 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 213 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 214 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 215 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 216 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 217 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 218 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 219 = lkmnosys */ - { AS(freebsd32_semctl_args), (sy_call_t *)freebsd32_semctl, AUE_SEMCTL, NULL, 0, 0 }, /* 220 = freebsd32_semctl */ - { AS(semget_args), (sy_call_t *)semget, AUE_SEMGET, NULL, 0, 0 }, /* 221 = semget */ - { AS(semop_args), (sy_call_t *)semop, AUE_SEMOP, NULL, 0, 0 }, /* 222 = semop */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 223 = semconfig */ - { AS(freebsd32_msgctl_args), (sy_call_t *)freebsd32_msgctl, AUE_MSGCTL, NULL, 0, 0 }, /* 224 = freebsd32_msgctl */ - { AS(msgget_args), (sy_call_t *)msgget, AUE_MSGGET, NULL, 0, 0 }, /* 225 = msgget */ - { AS(freebsd32_msgsnd_args), (sy_call_t *)freebsd32_msgsnd, AUE_MSGSND, NULL, 0, 0 }, /* 226 = freebsd32_msgsnd */ - { AS(freebsd32_msgrcv_args), (sy_call_t *)freebsd32_msgrcv, AUE_MSGRCV, NULL, 0, 0 }, /* 227 = freebsd32_msgrcv */ - { AS(shmat_args), (sy_call_t *)shmat, AUE_SHMAT, NULL, 0, 0 }, /* 228 = shmat */ - { AS(freebsd32_shmctl_args), (sy_call_t *)freebsd32_shmctl, AUE_SHMCTL, NULL, 0, 0 }, /* 229 = freebsd32_shmctl */ - { AS(shmdt_args), (sy_call_t *)shmdt, AUE_SHMDT, NULL, 0, 0 }, /* 230 = shmdt */ - { AS(shmget_args), (sy_call_t *)shmget, AUE_SHMGET, NULL, 0, 0 }, /* 231 = shmget */ - { AS(freebsd32_clock_gettime_args), (sy_call_t *)freebsd32_clock_gettime, AUE_NULL, NULL, 0, 0 }, /* 232 = freebsd32_clock_gettime */ - { AS(freebsd32_clock_settime_args), (sy_call_t *)freebsd32_clock_settime, AUE_CLOCK_SETTIME, NULL, 0, 0 }, /* 233 = freebsd32_clock_settime */ - { AS(freebsd32_clock_getres_args), (sy_call_t *)freebsd32_clock_getres, AUE_NULL, NULL, 0, 0 }, /* 234 = freebsd32_clock_getres */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 235 = timer_create */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 236 = timer_delete */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 237 = timer_settime */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 238 = timer_gettime */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 239 = timer_getoverrun */ - { AS(freebsd32_nanosleep_args), (sy_call_t *)freebsd32_nanosleep, AUE_NULL, NULL, 0, 0 }, /* 240 = freebsd32_nanosleep */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 241 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 242 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 243 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 244 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 245 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 246 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 247 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 248 = ntp_gettime */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 249 = nosys */ - { AS(minherit_args), (sy_call_t *)minherit, AUE_MINHERIT, NULL, 0, 0 }, /* 250 = minherit */ - { AS(rfork_args), (sy_call_t *)rfork, AUE_RFORK, NULL, 0, 0 }, /* 251 = rfork */ - { AS(openbsd_poll_args), (sy_call_t *)openbsd_poll, AUE_POLL, NULL, 0, 0 }, /* 252 = openbsd_poll */ - { 0, (sy_call_t *)issetugid, AUE_ISSETUGID, NULL, 0, 0 }, /* 253 = issetugid */ - { AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0 }, /* 254 = lchown */ - { AS(freebsd32_aio_read_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 255 = freebsd32_aio_read */ - { AS(freebsd32_aio_write_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 256 = freebsd32_aio_write */ - { AS(freebsd32_lio_listio_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 257 = freebsd32_lio_listio */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 258 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 259 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 260 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 261 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 262 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 263 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 264 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 265 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 266 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 267 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 268 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 269 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 270 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 271 = nosys */ - { AS(getdents_args), (sy_call_t *)getdents, AUE_O_GETDENTS, NULL, 0, 0 }, /* 272 = getdents */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 273 = nosys */ - { AS(lchmod_args), (sy_call_t *)lchmod, AUE_LCHMOD, NULL, 0, 0 }, /* 274 = lchmod */ - { AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0 }, /* 275 = netbsd_lchown */ - { AS(freebsd32_lutimes_args), (sy_call_t *)freebsd32_lutimes, AUE_LUTIMES, NULL, 0, 0 }, /* 276 = freebsd32_lutimes */ - { AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0 }, /* 277 = netbsd_msync */ - { AS(nstat_args), (sy_call_t *)nstat, AUE_STAT, NULL, 0, 0 }, /* 278 = nstat */ - { AS(nfstat_args), (sy_call_t *)nfstat, AUE_FSTAT, NULL, 0, 0 }, /* 279 = nfstat */ - { AS(nlstat_args), (sy_call_t *)nlstat, AUE_LSTAT, NULL, 0, 0 }, /* 280 = nlstat */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 281 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 282 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 283 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 284 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 285 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 286 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 287 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 288 = nosys */ - { AS(freebsd32_preadv_args), (sy_call_t *)freebsd32_preadv, AUE_PREADV, NULL, 0, 0 }, /* 289 = freebsd32_preadv */ - { AS(freebsd32_pwritev_args), (sy_call_t *)freebsd32_pwritev, AUE_PWRITEV, NULL, 0, 0 }, /* 290 = freebsd32_pwritev */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 291 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 292 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 293 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 294 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 295 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 296 = nosys */ - { compat4(AS(freebsd4_freebsd32_fhstatfs_args),freebsd32_fhstatfs), AUE_FHSTATFS, NULL, 0, 0 }, /* 297 = old freebsd32_fhstatfs */ - { AS(fhopen_args), (sy_call_t *)fhopen, AUE_FHOPEN, NULL, 0, 0 }, /* 298 = fhopen */ - { AS(fhstat_args), (sy_call_t *)fhstat, AUE_FHSTAT, NULL, 0, 0 }, /* 299 = fhstat */ - { AS(modnext_args), (sy_call_t *)modnext, AUE_NULL, NULL, 0, 0 }, /* 300 = modnext */ - { AS(freebsd32_modstat_args), (sy_call_t *)freebsd32_modstat, AUE_NULL, NULL, 0, 0 }, /* 301 = freebsd32_modstat */ - { AS(modfnext_args), (sy_call_t *)modfnext, AUE_NULL, NULL, 0, 0 }, /* 302 = modfnext */ - { AS(modfind_args), (sy_call_t *)modfind, AUE_NULL, NULL, 0, 0 }, /* 303 = modfind */ - { AS(kldload_args), (sy_call_t *)kldload, AUE_MODLOAD, NULL, 0, 0 }, /* 304 = kldload */ - { AS(kldunload_args), (sy_call_t *)kldunload, AUE_MODUNLOAD, NULL, 0, 0 }, /* 305 = kldunload */ - { AS(kldfind_args), (sy_call_t *)kldfind, AUE_NULL, NULL, 0, 0 }, /* 306 = kldfind */ - { AS(kldnext_args), (sy_call_t *)kldnext, AUE_NULL, NULL, 0, 0 }, /* 307 = kldnext */ - { AS(kldstat_args), (sy_call_t *)kldstat, AUE_NULL, NULL, 0, 0 }, /* 308 = kldstat */ - { AS(kldfirstmod_args), (sy_call_t *)kldfirstmod, AUE_NULL, NULL, 0, 0 }, /* 309 = kldfirstmod */ - { AS(getsid_args), (sy_call_t *)getsid, AUE_GETSID, NULL, 0, 0 }, /* 310 = getsid */ - { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID, NULL, 0, 0 }, /* 311 = setresuid */ - { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID, NULL, 0, 0 }, /* 312 = setresgid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 313 = obsolete signanosleep */ - { AS(freebsd32_aio_return_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 314 = freebsd32_aio_return */ - { AS(freebsd32_aio_suspend_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 315 = freebsd32_aio_suspend */ - { AS(freebsd32_aio_cancel_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 316 = freebsd32_aio_cancel */ - { AS(freebsd32_aio_error_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 317 = freebsd32_aio_error */ - { AS(freebsd32_oaio_read_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 318 = freebsd32_oaio_read */ - { AS(freebsd32_oaio_write_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 319 = freebsd32_oaio_write */ - { AS(freebsd32_olio_listio_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 320 = freebsd32_olio_listio */ - { 0, (sy_call_t *)yield, AUE_NULL, NULL, 0, 0 }, /* 321 = yield */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 322 = obsolete thr_sleep */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 323 = obsolete thr_wakeup */ - { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL, NULL, 0, 0 }, /* 324 = mlockall */ - { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL, NULL, 0, 0 }, /* 325 = munlockall */ - { AS(__getcwd_args), (sy_call_t *)__getcwd, AUE_GETCWD, NULL, 0, 0 }, /* 326 = __getcwd */ - { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL, NULL, 0, 0 }, /* 327 = sched_setparam */ - { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL, NULL, 0, 0 }, /* 328 = sched_getparam */ - { AS(sched_setscheduler_args), (sy_call_t *)sched_setscheduler, AUE_NULL, NULL, 0, 0 }, /* 329 = sched_setscheduler */ - { AS(sched_getscheduler_args), (sy_call_t *)sched_getscheduler, AUE_NULL, NULL, 0, 0 }, /* 330 = sched_getscheduler */ - { 0, (sy_call_t *)sched_yield, AUE_NULL, NULL, 0, 0 }, /* 331 = sched_yield */ - { AS(sched_get_priority_max_args), (sy_call_t *)sched_get_priority_max, AUE_NULL, NULL, 0, 0 }, /* 332 = sched_get_priority_max */ - { AS(sched_get_priority_min_args), (sy_call_t *)sched_get_priority_min, AUE_NULL, NULL, 0, 0 }, /* 333 = sched_get_priority_min */ - { AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_NULL, NULL, 0, 0 }, /* 334 = sched_rr_get_interval */ - { AS(utrace_args), (sy_call_t *)utrace, AUE_NULL, NULL, 0, 0 }, /* 335 = utrace */ - { compat4(AS(freebsd4_freebsd32_sendfile_args),freebsd32_sendfile), AUE_SENDFILE, NULL, 0, 0 }, /* 336 = old freebsd32_sendfile */ - { AS(kldsym_args), (sy_call_t *)kldsym, AUE_NULL, NULL, 0, 0 }, /* 337 = kldsym */ - { AS(freebsd32_jail_args), (sy_call_t *)freebsd32_jail, AUE_JAIL, NULL, 0, 0 }, /* 338 = freebsd32_jail */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 339 = pioctl */ - { AS(sigprocmask_args), (sy_call_t *)sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0 }, /* 340 = sigprocmask */ - { AS(sigsuspend_args), (sy_call_t *)sigsuspend, AUE_SIGSUSPEND, NULL, 0, 0 }, /* 341 = sigsuspend */ - { compat4(AS(freebsd4_freebsd32_sigaction_args),freebsd32_sigaction), AUE_SIGACTION, NULL, 0, 0 }, /* 342 = old freebsd32_sigaction */ - { AS(sigpending_args), (sy_call_t *)sigpending, AUE_SIGPENDING, NULL, 0, 0 }, /* 343 = sigpending */ - { compat4(AS(freebsd4_freebsd32_sigreturn_args),freebsd32_sigreturn), AUE_SIGRETURN, NULL, 0, 0 }, /* 344 = old freebsd32_sigreturn */ - { AS(freebsd32_sigtimedwait_args), (sy_call_t *)freebsd32_sigtimedwait, AUE_SIGWAIT, NULL, 0, 0 }, /* 345 = freebsd32_sigtimedwait */ - { AS(freebsd32_sigwaitinfo_args), (sy_call_t *)freebsd32_sigwaitinfo, AUE_NULL, NULL, 0, 0 }, /* 346 = freebsd32_sigwaitinfo */ - { AS(__acl_get_file_args), (sy_call_t *)__acl_get_file, AUE_NULL, NULL, 0, 0 }, /* 347 = __acl_get_file */ - { AS(__acl_set_file_args), (sy_call_t *)__acl_set_file, AUE_NULL, NULL, 0, 0 }, /* 348 = __acl_set_file */ - { AS(__acl_get_fd_args), (sy_call_t *)__acl_get_fd, AUE_NULL, NULL, 0, 0 }, /* 349 = __acl_get_fd */ - { AS(__acl_set_fd_args), (sy_call_t *)__acl_set_fd, AUE_NULL, NULL, 0, 0 }, /* 350 = __acl_set_fd */ - { AS(__acl_delete_file_args), (sy_call_t *)__acl_delete_file, AUE_NULL, NULL, 0, 0 }, /* 351 = __acl_delete_file */ - { AS(__acl_delete_fd_args), (sy_call_t *)__acl_delete_fd, AUE_NULL, NULL, 0, 0 }, /* 352 = __acl_delete_fd */ - { AS(__acl_aclcheck_file_args), (sy_call_t *)__acl_aclcheck_file, AUE_NULL, NULL, 0, 0 }, /* 353 = __acl_aclcheck_file */ - { AS(__acl_aclcheck_fd_args), (sy_call_t *)__acl_aclcheck_fd, AUE_NULL, NULL, 0, 0 }, /* 354 = __acl_aclcheck_fd */ - { AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_EXTATTRCTL, NULL, 0, 0 }, /* 355 = extattrctl */ - { AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_EXTATTR_SET_FILE, NULL, 0, 0 }, /* 356 = extattr_set_file */ - { AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_EXTATTR_GET_FILE, NULL, 0, 0 }, /* 357 = extattr_get_file */ - { AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_EXTATTR_DELETE_FILE, NULL, 0, 0 }, /* 358 = extattr_delete_file */ - { AS(freebsd32_aio_waitcomplete_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 359 = freebsd32_aio_waitcomplete */ - { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0 }, /* 360 = getresuid */ - { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0 }, /* 361 = getresgid */ - { 0, (sy_call_t *)kqueue, AUE_KQUEUE, NULL, 0, 0 }, /* 362 = kqueue */ - { AS(freebsd32_kevent_args), (sy_call_t *)freebsd32_kevent, AUE_NULL, NULL, 0, 0 }, /* 363 = freebsd32_kevent */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 364 = __cap_get_proc */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 365 = __cap_set_proc */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 366 = __cap_get_fd */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 367 = __cap_get_file */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 368 = __cap_set_fd */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 369 = __cap_set_file */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 370 = nosys */ - { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_EXTATTR_SET_FD, NULL, 0, 0 }, /* 371 = extattr_set_fd */ - { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_EXTATTR_GET_FD, NULL, 0, 0 }, /* 372 = extattr_get_fd */ - { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_EXTATTR_DELETE_FD, NULL, 0, 0 }, /* 373 = extattr_delete_fd */ - { AS(__setugid_args), (sy_call_t *)__setugid, AUE_NULL, NULL, 0, 0 }, /* 374 = __setugid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 375 = nfsclnt */ - { AS(eaccess_args), (sy_call_t *)eaccess, AUE_EACCESS, NULL, 0, 0 }, /* 376 = eaccess */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 377 = afs_syscall */ - { AS(freebsd32_nmount_args), (sy_call_t *)freebsd32_nmount, AUE_NMOUNT, NULL, 0, 0 }, /* 378 = freebsd32_nmount */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 379 = kse_exit */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 380 = kse_wakeup */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 381 = kse_create */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 382 = kse_thr_interrupt */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 383 = kse_release */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 384 = __mac_get_proc */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 385 = __mac_set_proc */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 386 = __mac_get_fd */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 387 = __mac_get_file */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 388 = __mac_set_fd */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 389 = __mac_set_file */ - { AS(kenv_args), (sy_call_t *)kenv, AUE_NULL, NULL, 0, 0 }, /* 390 = kenv */ - { AS(lchflags_args), (sy_call_t *)lchflags, AUE_LCHFLAGS, NULL, 0, 0 }, /* 391 = lchflags */ - { AS(uuidgen_args), (sy_call_t *)uuidgen, AUE_NULL, NULL, 0, 0 }, /* 392 = uuidgen */ - { AS(freebsd32_sendfile_args), (sy_call_t *)freebsd32_sendfile, AUE_SENDFILE, NULL, 0, 0 }, /* 393 = freebsd32_sendfile */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 394 = mac_syscall */ - { AS(getfsstat_args), (sy_call_t *)getfsstat, AUE_GETFSSTAT, NULL, 0, 0 }, /* 395 = getfsstat */ - { AS(statfs_args), (sy_call_t *)statfs, AUE_STATFS, NULL, 0, 0 }, /* 396 = statfs */ - { AS(fstatfs_args), (sy_call_t *)fstatfs, AUE_FSTATFS, NULL, 0, 0 }, /* 397 = fstatfs */ - { AS(fhstatfs_args), (sy_call_t *)fhstatfs, AUE_FHSTATFS, NULL, 0, 0 }, /* 398 = fhstatfs */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 399 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 400 = ksem_close */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 401 = ksem_post */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 402 = ksem_wait */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 403 = ksem_trywait */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 404 = ksem_init */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 405 = ksem_open */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 406 = ksem_unlink */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 407 = ksem_getvalue */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 408 = ksem_destroy */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 409 = __mac_get_pid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 410 = __mac_get_link */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 411 = __mac_set_link */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 412 = extattr_set_link */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 413 = extattr_get_link */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 414 = extattr_delete_link */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 415 = __mac_execve */ - { AS(freebsd32_sigaction_args), (sy_call_t *)freebsd32_sigaction, AUE_SIGACTION, NULL, 0, 0 }, /* 416 = freebsd32_sigaction */ - { AS(freebsd32_sigreturn_args), (sy_call_t *)freebsd32_sigreturn, AUE_SIGRETURN, NULL, 0, 0 }, /* 417 = freebsd32_sigreturn */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 418 = __xstat */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 419 = __xfstat */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 420 = __xlstat */ - { AS(freebsd32_getcontext_args), (sy_call_t *)freebsd32_getcontext, AUE_NULL, NULL, 0, 0 }, /* 421 = freebsd32_getcontext */ - { AS(freebsd32_setcontext_args), (sy_call_t *)freebsd32_setcontext, AUE_NULL, NULL, 0, 0 }, /* 422 = freebsd32_setcontext */ - { AS(freebsd32_swapcontext_args), (sy_call_t *)freebsd32_swapcontext, AUE_NULL, NULL, 0, 0 }, /* 423 = freebsd32_swapcontext */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 424 = swapoff */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 425 = __acl_get_link */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 426 = __acl_set_link */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 427 = __acl_delete_link */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 428 = __acl_aclcheck_link */ - { AS(sigwait_args), (sy_call_t *)sigwait, AUE_SIGWAIT, NULL, 0, 0 }, /* 429 = sigwait */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 430 = thr_create; */ - { AS(thr_exit_args), (sy_call_t *)thr_exit, AUE_NULL, NULL, 0, 0 }, /* 431 = thr_exit */ - { AS(thr_self_args), (sy_call_t *)thr_self, AUE_NULL, NULL, 0, 0 }, /* 432 = thr_self */ - { AS(thr_kill_args), (sy_call_t *)thr_kill, AUE_NULL, NULL, 0, 0 }, /* 433 = thr_kill */ - { AS(freebsd32_umtx_lock_args), (sy_call_t *)freebsd32_umtx_lock, AUE_NULL, NULL, 0, 0 }, /* 434 = freebsd32_umtx_lock */ - { AS(freebsd32_umtx_unlock_args), (sy_call_t *)freebsd32_umtx_unlock, AUE_NULL, NULL, 0, 0 }, /* 435 = freebsd32_umtx_unlock */ - { AS(jail_attach_args), (sy_call_t *)jail_attach, AUE_NULL, NULL, 0, 0 }, /* 436 = jail_attach */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 437 = extattr_list_fd */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 438 = extattr_list_file */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 439 = extattr_list_link */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 440 = kse_switchin */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 441 = ksem_timedwait */ - { AS(freebsd32_thr_suspend_args), (sy_call_t *)freebsd32_thr_suspend, AUE_NULL, NULL, 0, 0 }, /* 442 = freebsd32_thr_suspend */ - { AS(thr_wake_args), (sy_call_t *)thr_wake, AUE_NULL, NULL, 0, 0 }, /* 443 = thr_wake */ - { AS(kldunloadf_args), (sy_call_t *)kldunloadf, AUE_MODUNLOAD, NULL, 0, 0 }, /* 444 = kldunloadf */ - { AS(audit_args), (sy_call_t *)audit, AUE_AUDIT, NULL, 0, 0 }, /* 445 = audit */ - { AS(auditon_args), (sy_call_t *)auditon, AUE_AUDITON, NULL, 0, 0 }, /* 446 = auditon */ - { AS(getauid_args), (sy_call_t *)getauid, AUE_GETAUID, NULL, 0, 0 }, /* 447 = getauid */ - { AS(setauid_args), (sy_call_t *)setauid, AUE_SETAUID, NULL, 0, 0 }, /* 448 = setauid */ - { AS(getaudit_args), (sy_call_t *)getaudit, AUE_GETAUDIT, NULL, 0, 0 }, /* 449 = getaudit */ - { AS(setaudit_args), (sy_call_t *)setaudit, AUE_SETAUDIT, NULL, 0, 0 }, /* 450 = setaudit */ - { AS(getaudit_addr_args), (sy_call_t *)getaudit_addr, AUE_GETAUDIT_ADDR, NULL, 0, 0 }, /* 451 = getaudit_addr */ - { AS(setaudit_addr_args), (sy_call_t *)setaudit_addr, AUE_SETAUDIT_ADDR, NULL, 0, 0 }, /* 452 = setaudit_addr */ - { AS(auditctl_args), (sy_call_t *)auditctl, AUE_AUDITCTL, NULL, 0, 0 }, /* 453 = auditctl */ - { AS(freebsd32_umtx_op_args), (sy_call_t *)freebsd32_umtx_op, AUE_NULL, NULL, 0, 0 }, /* 454 = freebsd32_umtx_op */ - { AS(freebsd32_thr_new_args), (sy_call_t *)freebsd32_thr_new, AUE_NULL, NULL, 0, 0 }, /* 455 = freebsd32_thr_new */ - { AS(sigqueue_args), (sy_call_t *)sigqueue, AUE_NULL, NULL, 0, 0 }, /* 456 = sigqueue */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 457 = kmq_open */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 458 = kmq_setattr */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 459 = kmq_timedreceive */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 460 = kmq_timedsend */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 461 = kmq_notify */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 462 = kmq_unlink */ - { AS(abort2_args), (sy_call_t *)abort2, AUE_NULL, NULL, 0, 0 }, /* 463 = abort2 */ - { AS(thr_set_name_args), (sy_call_t *)thr_set_name, AUE_NULL, NULL, 0, 0 }, /* 464 = thr_set_name */ - { AS(freebsd32_aio_fsync_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 465 = freebsd32_aio_fsync */ - { AS(rtprio_thread_args), (sy_call_t *)rtprio_thread, AUE_RTPRIO, NULL, 0, 0 }, /* 466 = rtprio_thread */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 467 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 468 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 469 = __getpath_fromfd */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 470 = __getpath_fromaddr */ - { AS(sctp_peeloff_args), (sy_call_t *)sctp_peeloff, AUE_NULL, NULL, 0, 0 }, /* 471 = sctp_peeloff */ - { 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(freebsd32_pread_args), (sy_call_t *)freebsd32_pread, AUE_PREAD, NULL, 0, 0 }, /* 475 = freebsd32_pread */ - { AS(freebsd32_pwrite_args), (sy_call_t *)freebsd32_pwrite, AUE_PWRITE, NULL, 0, 0 }, /* 476 = freebsd32_pwrite */ - { AS(freebsd32_mmap_args), (sy_call_t *)freebsd32_mmap, AUE_MMAP, NULL, 0, 0 }, /* 477 = freebsd32_mmap */ - { AS(freebsd32_lseek_args), (sy_call_t *)freebsd32_lseek, AUE_LSEEK, NULL, 0, 0 }, /* 478 = freebsd32_lseek */ - { AS(freebsd32_truncate_args), (sy_call_t *)freebsd32_truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 479 = freebsd32_truncate */ - { AS(freebsd32_ftruncate_args), (sy_call_t *)freebsd32_ftruncate, AUE_FTRUNCATE, NULL, 0, 0 }, /* 480 = freebsd32_ftruncate */ - { AS(thr_kill2_args), (sy_call_t *)thr_kill2, AUE_KILL, NULL, 0, 0 }, /* 481 = thr_kill2 */ - { AS(shm_open_args), (sy_call_t *)shm_open, AUE_SHMOPEN, NULL, 0, 0 }, /* 482 = shm_open */ - { AS(shm_unlink_args), (sy_call_t *)shm_unlink, AUE_SHMUNLINK, NULL, 0, 0 }, /* 483 = shm_unlink */ - { AS(cpuset_args), (sy_call_t *)cpuset, AUE_NULL, NULL, 0, 0 }, /* 484 = cpuset */ - { AS(freebsd32_cpuset_setid_args), (sy_call_t *)freebsd32_cpuset_setid, AUE_NULL, NULL, 0, 0 }, /* 485 = freebsd32_cpuset_setid */ - { AS(freebsd32_cpuset_getid_args), (sy_call_t *)freebsd32_cpuset_getid, AUE_NULL, NULL, 0, 0 }, /* 486 = freebsd32_cpuset_getid */ - { AS(freebsd32_cpuset_getaffinity_args), (sy_call_t *)freebsd32_cpuset_getaffinity, AUE_NULL, NULL, 0, 0 }, /* 487 = freebsd32_cpuset_getaffinity */ - { AS(freebsd32_cpuset_setaffinity_args), (sy_call_t *)freebsd32_cpuset_setaffinity, AUE_NULL, NULL, 0, 0 }, /* 488 = freebsd32_cpuset_setaffinity */ - { AS(faccessat_args), (sy_call_t *)faccessat, AUE_FACCESSAT, NULL, 0, 0 }, /* 489 = faccessat */ - { AS(fchmodat_args), (sy_call_t *)fchmodat, AUE_FCHMODAT, NULL, 0, 0 }, /* 490 = fchmodat */ - { AS(fchownat_args), (sy_call_t *)fchownat, AUE_FCHOWNAT, NULL, 0, 0 }, /* 491 = fchownat */ - { AS(freebsd32_fexecve_args), (sy_call_t *)freebsd32_fexecve, AUE_FEXECVE, NULL, 0, 0 }, /* 492 = freebsd32_fexecve */ - { AS(freebsd32_fstatat_args), (sy_call_t *)freebsd32_fstatat, AUE_FSTATAT, NULL, 0, 0 }, /* 493 = freebsd32_fstatat */ - { AS(freebsd32_futimesat_args), (sy_call_t *)freebsd32_futimesat, AUE_FUTIMESAT, NULL, 0, 0 }, /* 494 = freebsd32_futimesat */ - { AS(linkat_args), (sy_call_t *)linkat, AUE_LINKAT, NULL, 0, 0 }, /* 495 = linkat */ - { AS(mkdirat_args), (sy_call_t *)mkdirat, AUE_MKDIRAT, NULL, 0, 0 }, /* 496 = mkdirat */ - { AS(mkfifoat_args), (sy_call_t *)mkfifoat, AUE_MKFIFOAT, NULL, 0, 0 }, /* 497 = mkfifoat */ - { AS(mknodat_args), (sy_call_t *)mknodat, AUE_MKNODAT, NULL, 0, 0 }, /* 498 = mknodat */ - { AS(openat_args), (sy_call_t *)openat, AUE_OPENAT_RWTC, NULL, 0, 0 }, /* 499 = openat */ - { AS(readlinkat_args), (sy_call_t *)readlinkat, AUE_READLINKAT, NULL, 0, 0 }, /* 500 = readlinkat */ - { AS(renameat_args), (sy_call_t *)renameat, AUE_RENAMEAT, NULL, 0, 0 }, /* 501 = renameat */ - { AS(symlinkat_args), (sy_call_t *)symlinkat, AUE_SYMLINKAT, NULL, 0, 0 }, /* 502 = symlinkat */ - { AS(unlinkat_args), (sy_call_t *)unlinkat, AUE_UNLINKAT, NULL, 0, 0 }, /* 503 = unlinkat */ - { AS(posix_openpt_args), (sy_call_t *)posix_openpt, AUE_POSIX_OPENPT, NULL, 0, 0 }, /* 504 = posix_openpt */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 505 = gssd_syscall */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 0 = syscall */ + { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0, 0 }, /* 1 = exit */ + { 0, (sy_call_t *)fork, AUE_FORK, NULL, 0, 0, 0 }, /* 2 = fork */ + { AS(read_args), (sy_call_t *)read, AUE_READ, NULL, 0, 0, 0 }, /* 3 = read */ + { AS(write_args), (sy_call_t *)write, AUE_WRITE, NULL, 0, 0, 0 }, /* 4 = write */ + { AS(open_args), (sy_call_t *)open, AUE_OPEN_RWTC, NULL, 0, 0, 0 }, /* 5 = open */ + { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0, 0 }, /* 6 = close */ + { AS(freebsd32_wait4_args), (sy_call_t *)freebsd32_wait4, AUE_WAIT4, NULL, 0, 0, 0 }, /* 7 = freebsd32_wait4 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 8 = obsolete old creat */ + { AS(link_args), (sy_call_t *)link, AUE_LINK, NULL, 0, 0, 0 }, /* 9 = link */ + { AS(unlink_args), (sy_call_t *)unlink, AUE_UNLINK, NULL, 0, 0, 0 }, /* 10 = unlink */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 11 = obsolete execv */ + { AS(chdir_args), (sy_call_t *)chdir, AUE_CHDIR, NULL, 0, 0, 0 }, /* 12 = chdir */ + { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR, NULL, 0, 0, 0 }, /* 13 = fchdir */ + { AS(mknod_args), (sy_call_t *)mknod, AUE_MKNOD, NULL, 0, 0, 0 }, /* 14 = mknod */ + { AS(chmod_args), (sy_call_t *)chmod, AUE_CHMOD, NULL, 0, 0, 0 }, /* 15 = chmod */ + { AS(chown_args), (sy_call_t *)chown, AUE_CHOWN, NULL, 0, 0, 0 }, /* 16 = chown */ + { AS(obreak_args), (sy_call_t *)obreak, AUE_NULL, NULL, 0, 0, 0 }, /* 17 = break */ + { compat4(AS(freebsd4_freebsd32_getfsstat_args),freebsd32_getfsstat), AUE_GETFSSTAT, NULL, 0, 0, 0 }, /* 18 = old freebsd32_getfsstat */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 19 = obsolete olseek */ + { 0, (sy_call_t *)getpid, AUE_GETPID, NULL, 0, 0, 0 }, /* 20 = getpid */ + { AS(mount_args), (sy_call_t *)mount, AUE_MOUNT, NULL, 0, 0, 0 }, /* 21 = mount */ + { AS(unmount_args), (sy_call_t *)unmount, AUE_UMOUNT, NULL, 0, 0, 0 }, /* 22 = unmount */ + { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID, NULL, 0, 0, 0 }, /* 23 = setuid */ + { 0, (sy_call_t *)getuid, AUE_GETUID, NULL, 0, 0, 0 }, /* 24 = getuid */ + { 0, (sy_call_t *)geteuid, AUE_GETEUID, NULL, 0, 0, 0 }, /* 25 = geteuid */ + { AS(ptrace_args), (sy_call_t *)ptrace, AUE_PTRACE, NULL, 0, 0, 0 }, /* 26 = ptrace */ + { AS(freebsd32_recvmsg_args), (sy_call_t *)freebsd32_recvmsg, AUE_RECVMSG, NULL, 0, 0, 0 }, /* 27 = freebsd32_recvmsg */ + { AS(freebsd32_sendmsg_args), (sy_call_t *)freebsd32_sendmsg, AUE_SENDMSG, NULL, 0, 0, 0 }, /* 28 = freebsd32_sendmsg */ + { AS(freebsd32_recvfrom_args), (sy_call_t *)freebsd32_recvfrom, AUE_RECVFROM, NULL, 0, 0, 0 }, /* 29 = freebsd32_recvfrom */ + { AS(accept_args), (sy_call_t *)accept, AUE_ACCEPT, NULL, 0, 0, 0 }, /* 30 = accept */ + { AS(getpeername_args), (sy_call_t *)getpeername, AUE_GETPEERNAME, NULL, 0, 0, 0 }, /* 31 = getpeername */ + { AS(getsockname_args), (sy_call_t *)getsockname, AUE_GETSOCKNAME, NULL, 0, 0, 0 }, /* 32 = getsockname */ + { AS(access_args), (sy_call_t *)access, AUE_ACCESS, NULL, 0, 0, 0 }, /* 33 = access */ + { AS(chflags_args), (sy_call_t *)chflags, AUE_CHFLAGS, NULL, 0, 0, 0 }, /* 34 = chflags */ + { AS(fchflags_args), (sy_call_t *)fchflags, AUE_FCHFLAGS, NULL, 0, 0, 0 }, /* 35 = fchflags */ + { 0, (sy_call_t *)sync, AUE_SYNC, NULL, 0, 0, 0 }, /* 36 = sync */ + { AS(kill_args), (sy_call_t *)kill, AUE_KILL, NULL, 0, 0, 0 }, /* 37 = kill */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 38 = ostat */ + { 0, (sy_call_t *)getppid, AUE_GETPPID, NULL, 0, 0, 0 }, /* 39 = getppid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 40 = olstat */ + { AS(dup_args), (sy_call_t *)dup, AUE_DUP, NULL, 0, 0, 0 }, /* 41 = dup */ + { 0, (sy_call_t *)pipe, AUE_PIPE, NULL, 0, 0, 0 }, /* 42 = pipe */ + { 0, (sy_call_t *)getegid, AUE_GETEGID, NULL, 0, 0, 0 }, /* 43 = getegid */ + { AS(profil_args), (sy_call_t *)profil, AUE_PROFILE, NULL, 0, 0, 0 }, /* 44 = profil */ + { AS(ktrace_args), (sy_call_t *)ktrace, AUE_KTRACE, NULL, 0, 0, 0 }, /* 45 = ktrace */ + { compat(AS(ofreebsd32_sigaction_args),freebsd32_sigaction), AUE_SIGACTION, NULL, 0, 0, 0 }, /* 46 = old freebsd32_sigaction */ + { 0, (sy_call_t *)getgid, AUE_GETGID, NULL, 0, 0, 0 }, /* 47 = getgid */ + { compat(AS(ofreebsd32_sigprocmask_args),freebsd32_sigprocmask), AUE_SIGPROCMASK, NULL, 0, 0, 0 }, /* 48 = old freebsd32_sigprocmask */ + { AS(getlogin_args), (sy_call_t *)getlogin, AUE_GETLOGIN, NULL, 0, 0, 0 }, /* 49 = getlogin */ + { AS(setlogin_args), (sy_call_t *)setlogin, AUE_SETLOGIN, NULL, 0, 0, 0 }, /* 50 = setlogin */ + { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0, 0 }, /* 51 = acct */ + { compat(0,freebsd32_sigpending), AUE_SIGPENDING, NULL, 0, 0, 0 }, /* 52 = old freebsd32_sigpending */ + { AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack, AUE_SIGALTSTACK, NULL, 0, 0, 0 }, /* 53 = freebsd32_sigaltstack */ + { AS(freebsd32_ioctl_args), (sy_call_t *)freebsd32_ioctl, AUE_NULL, NULL, 0, 0, 0 }, /* 54 = freebsd32_ioctl */ + { AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT, NULL, 0, 0, 0 }, /* 55 = reboot */ + { AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE, NULL, 0, 0, 0 }, /* 56 = revoke */ + { AS(symlink_args), (sy_call_t *)symlink, AUE_SYMLINK, NULL, 0, 0, 0 }, /* 57 = symlink */ + { AS(readlink_args), (sy_call_t *)readlink, AUE_READLINK, NULL, 0, 0, 0 }, /* 58 = readlink */ + { AS(freebsd32_execve_args), (sy_call_t *)freebsd32_execve, AUE_EXECVE, NULL, 0, 0, 0 }, /* 59 = freebsd32_execve */ + { AS(umask_args), (sy_call_t *)umask, AUE_UMASK, NULL, 0, 0, 0 }, /* 60 = umask */ + { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT, NULL, 0, 0, 0 }, /* 61 = chroot */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 62 = obsolete ofstat */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 63 = obsolete ogetkerninfo */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 64 = obsolete ogetpagesize */ + { AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0, 0 }, /* 65 = msync */ + { 0, (sy_call_t *)vfork, AUE_VFORK, NULL, 0, 0, 0 }, /* 66 = vfork */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 67 = obsolete vread */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 68 = obsolete vwrite */ + { AS(sbrk_args), (sy_call_t *)sbrk, AUE_SBRK, NULL, 0, 0, 0 }, /* 69 = sbrk */ + { AS(sstk_args), (sy_call_t *)sstk, AUE_SSTK, NULL, 0, 0, 0 }, /* 70 = sstk */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 71 = obsolete ommap */ + { AS(ovadvise_args), (sy_call_t *)ovadvise, AUE_O_VADVISE, NULL, 0, 0, 0 }, /* 72 = vadvise */ + { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0, 0 }, /* 73 = munmap */ + { AS(mprotect_args), (sy_call_t *)mprotect, AUE_MPROTECT, NULL, 0, 0, 0 }, /* 74 = mprotect */ + { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0, 0 }, /* 75 = madvise */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 76 = obsolete vhangup */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 77 = obsolete vlimit */ + { AS(mincore_args), (sy_call_t *)mincore, AUE_MINCORE, NULL, 0, 0, 0 }, /* 78 = mincore */ + { AS(getgroups_args), (sy_call_t *)getgroups, AUE_GETGROUPS, NULL, 0, 0, 0 }, /* 79 = getgroups */ + { AS(setgroups_args), (sy_call_t *)setgroups, AUE_SETGROUPS, NULL, 0, 0, 0 }, /* 80 = setgroups */ + { 0, (sy_call_t *)getpgrp, AUE_GETPGRP, NULL, 0, 0, 0 }, /* 81 = getpgrp */ + { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP, NULL, 0, 0, 0 }, /* 82 = setpgid */ + { AS(freebsd32_setitimer_args), (sy_call_t *)freebsd32_setitimer, AUE_SETITIMER, NULL, 0, 0, 0 }, /* 83 = freebsd32_setitimer */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 84 = obsolete owait */ + { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON, NULL, 0, 0, 0 }, /* 85 = swapon */ + { AS(freebsd32_getitimer_args), (sy_call_t *)freebsd32_getitimer, AUE_GETITIMER, NULL, 0, 0, 0 }, /* 86 = freebsd32_getitimer */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 87 = obsolete ogethostname */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 88 = obsolete osethostname */ + { 0, (sy_call_t *)getdtablesize, AUE_GETDTABLESIZE, NULL, 0, 0, 0 }, /* 89 = getdtablesize */ + { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2, NULL, 0, 0, 0 }, /* 90 = dup2 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 91 = getdopt */ + { AS(fcntl_args), (sy_call_t *)fcntl, AUE_FCNTL, NULL, 0, 0, 0 }, /* 92 = fcntl */ + { AS(freebsd32_select_args), (sy_call_t *)freebsd32_select, AUE_SELECT, NULL, 0, 0, 0 }, /* 93 = freebsd32_select */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 94 = setdopt */ + { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0, 0 }, /* 95 = fsync */ + { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY, NULL, 0, 0, 0 }, /* 96 = setpriority */ + { AS(socket_args), (sy_call_t *)socket, AUE_SOCKET, NULL, 0, 0, 0 }, /* 97 = socket */ + { AS(connect_args), (sy_call_t *)connect, AUE_CONNECT, NULL, 0, 0, 0 }, /* 98 = connect */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 99 = obsolete oaccept */ + { AS(getpriority_args), (sy_call_t *)getpriority, AUE_GETPRIORITY, NULL, 0, 0, 0 }, /* 100 = getpriority */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 101 = obsolete osend */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 102 = obsolete orecv */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 103 = obsolete osigreturn */ + { AS(bind_args), (sy_call_t *)bind, AUE_BIND, NULL, 0, 0, 0 }, /* 104 = bind */ + { AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT, NULL, 0, 0, 0 }, /* 105 = setsockopt */ + { AS(listen_args), (sy_call_t *)listen, AUE_LISTEN, NULL, 0, 0, 0 }, /* 106 = listen */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 107 = obsolete vtimes */ + { compat(AS(ofreebsd32_sigvec_args),freebsd32_sigvec), AUE_O_SIGVEC, NULL, 0, 0, 0 }, /* 108 = old freebsd32_sigvec */ + { compat(AS(ofreebsd32_sigblock_args),freebsd32_sigblock), AUE_O_SIGBLOCK, NULL, 0, 0, 0 }, /* 109 = old freebsd32_sigblock */ + { compat(AS(ofreebsd32_sigsetmask_args),freebsd32_sigsetmask), AUE_O_SIGSETMASK, NULL, 0, 0, 0 }, /* 110 = old freebsd32_sigsetmask */ + { compat(AS(ofreebsd32_sigsuspend_args),freebsd32_sigsuspend), AUE_SIGSUSPEND, NULL, 0, 0, 0 }, /* 111 = old freebsd32_sigsuspend */ + { compat(AS(ofreebsd32_sigstack_args),freebsd32_sigstack), AUE_O_SIGSTACK, NULL, 0, 0, 0 }, /* 112 = old freebsd32_sigstack */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 113 = obsolete orecvmsg */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 114 = obsolete osendmsg */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 115 = obsolete vtrace */ + { AS(freebsd32_gettimeofday_args), (sy_call_t *)freebsd32_gettimeofday, AUE_GETTIMEOFDAY, NULL, 0, 0, 0 }, /* 116 = freebsd32_gettimeofday */ + { AS(freebsd32_getrusage_args), (sy_call_t *)freebsd32_getrusage, AUE_GETRUSAGE, NULL, 0, 0, 0 }, /* 117 = freebsd32_getrusage */ + { AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_GETSOCKOPT, NULL, 0, 0, 0 }, /* 118 = getsockopt */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 119 = resuba */ + { AS(freebsd32_readv_args), (sy_call_t *)freebsd32_readv, AUE_READV, NULL, 0, 0, 0 }, /* 120 = freebsd32_readv */ + { AS(freebsd32_writev_args), (sy_call_t *)freebsd32_writev, AUE_WRITEV, NULL, 0, 0, 0 }, /* 121 = freebsd32_writev */ + { AS(freebsd32_settimeofday_args), (sy_call_t *)freebsd32_settimeofday, AUE_SETTIMEOFDAY, NULL, 0, 0, 0 }, /* 122 = freebsd32_settimeofday */ + { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN, NULL, 0, 0, 0 }, /* 123 = fchown */ + { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD, NULL, 0, 0, 0 }, /* 124 = fchmod */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 125 = obsolete orecvfrom */ + { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID, NULL, 0, 0, 0 }, /* 126 = setreuid */ + { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID, NULL, 0, 0, 0 }, /* 127 = setregid */ + { AS(rename_args), (sy_call_t *)rename, AUE_RENAME, NULL, 0, 0, 0 }, /* 128 = rename */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 129 = obsolete otruncate */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 130 = obsolete ftruncate */ + { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0, 0 }, /* 131 = flock */ + { AS(mkfifo_args), (sy_call_t *)mkfifo, AUE_MKFIFO, NULL, 0, 0, 0 }, /* 132 = mkfifo */ + { AS(sendto_args), (sy_call_t *)sendto, AUE_SENDTO, NULL, 0, 0, 0 }, /* 133 = sendto */ + { AS(shutdown_args), (sy_call_t *)shutdown, AUE_SHUTDOWN, NULL, 0, 0, 0 }, /* 134 = shutdown */ + { AS(socketpair_args), (sy_call_t *)socketpair, AUE_SOCKETPAIR, NULL, 0, 0, 0 }, /* 135 = socketpair */ + { AS(mkdir_args), (sy_call_t *)mkdir, AUE_MKDIR, NULL, 0, 0, 0 }, /* 136 = mkdir */ + { AS(rmdir_args), (sy_call_t *)rmdir, AUE_RMDIR, NULL, 0, 0, 0 }, /* 137 = rmdir */ + { AS(freebsd32_utimes_args), (sy_call_t *)freebsd32_utimes, AUE_UTIMES, NULL, 0, 0, 0 }, /* 138 = freebsd32_utimes */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 139 = obsolete 4.2 sigreturn */ + { AS(freebsd32_adjtime_args), (sy_call_t *)freebsd32_adjtime, AUE_ADJTIME, NULL, 0, 0, 0 }, /* 140 = freebsd32_adjtime */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 141 = obsolete ogetpeername */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 142 = obsolete ogethostid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 143 = obsolete sethostid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 144 = obsolete getrlimit */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 145 = obsolete setrlimit */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 146 = obsolete killpg */ + { 0, (sy_call_t *)setsid, AUE_SETSID, NULL, 0, 0, 0 }, /* 147 = setsid */ + { AS(quotactl_args), (sy_call_t *)quotactl, AUE_QUOTACTL, NULL, 0, 0, 0 }, /* 148 = quotactl */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 149 = obsolete oquota */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 150 = obsolete ogetsockname */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 151 = sem_lock */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 152 = sem_wakeup */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 153 = asyncdaemon */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 154 = nlm_syscall */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 155 = nfssvc */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 156 = obsolete ogetdirentries */ + { compat4(AS(freebsd4_freebsd32_statfs_args),freebsd32_statfs), AUE_STATFS, NULL, 0, 0, 0 }, /* 157 = old freebsd32_statfs */ + { compat4(AS(freebsd4_freebsd32_fstatfs_args),freebsd32_fstatfs), AUE_FSTATFS, NULL, 0, 0, 0 }, /* 158 = old freebsd32_fstatfs */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 159 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 160 = lgetfh */ + { AS(getfh_args), (sy_call_t *)getfh, AUE_NFS_GETFH, NULL, 0, 0, 0 }, /* 161 = getfh */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 162 = obsolete getdomainname */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 163 = obsolete setdomainname */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 164 = obsolete uname */ + { AS(sysarch_args), (sy_call_t *)sysarch, AUE_SYSARCH, NULL, 0, 0, 0 }, /* 165 = sysarch */ + { AS(rtprio_args), (sy_call_t *)rtprio, AUE_RTPRIO, NULL, 0, 0, 0 }, /* 166 = rtprio */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 167 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 168 = nosys */ + { AS(freebsd32_semsys_args), (sy_call_t *)freebsd32_semsys, AUE_SEMSYS, NULL, 0, 0, 0 }, /* 169 = freebsd32_semsys */ + { AS(freebsd32_msgsys_args), (sy_call_t *)freebsd32_msgsys, AUE_MSGSYS, NULL, 0, 0, 0 }, /* 170 = freebsd32_msgsys */ + { AS(freebsd32_shmsys_args), (sy_call_t *)freebsd32_shmsys, AUE_SHMSYS, NULL, 0, 0, 0 }, /* 171 = freebsd32_shmsys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 172 = nosys */ + { compat6(AS(freebsd6_freebsd32_pread_args),freebsd32_pread), AUE_PREAD, NULL, 0, 0, 0 }, /* 173 = old freebsd32_pread */ + { compat6(AS(freebsd6_freebsd32_pwrite_args),freebsd32_pwrite), AUE_PWRITE, NULL, 0, 0, 0 }, /* 174 = old freebsd32_pwrite */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 175 = nosys */ + { AS(ntp_adjtime_args), (sy_call_t *)ntp_adjtime, AUE_NTP_ADJTIME, NULL, 0, 0, 0 }, /* 176 = ntp_adjtime */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 177 = sfork */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 178 = getdescriptor */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 179 = setdescriptor */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 180 = nosys */ + { AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID, NULL, 0, 0, 0 }, /* 181 = setgid */ + { AS(setegid_args), (sy_call_t *)setegid, AUE_SETEGID, NULL, 0, 0, 0 }, /* 182 = setegid */ + { AS(seteuid_args), (sy_call_t *)seteuid, AUE_SETEUID, NULL, 0, 0, 0 }, /* 183 = seteuid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 184 = lfs_bmapv */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 185 = lfs_markv */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 186 = lfs_segclean */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 187 = lfs_segwait */ + { AS(freebsd32_stat_args), (sy_call_t *)freebsd32_stat, AUE_STAT, NULL, 0, 0, 0 }, /* 188 = freebsd32_stat */ + { AS(freebsd32_fstat_args), (sy_call_t *)freebsd32_fstat, AUE_FSTAT, NULL, 0, 0, 0 }, /* 189 = freebsd32_fstat */ + { AS(freebsd32_lstat_args), (sy_call_t *)freebsd32_lstat, AUE_LSTAT, NULL, 0, 0, 0 }, /* 190 = freebsd32_lstat */ + { AS(pathconf_args), (sy_call_t *)pathconf, AUE_PATHCONF, NULL, 0, 0, 0 }, /* 191 = pathconf */ + { AS(fpathconf_args), (sy_call_t *)fpathconf, AUE_FPATHCONF, NULL, 0, 0, 0 }, /* 192 = fpathconf */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 193 = nosys */ + { AS(__getrlimit_args), (sy_call_t *)getrlimit, AUE_GETRLIMIT, NULL, 0, 0, 0 }, /* 194 = getrlimit */ + { AS(__setrlimit_args), (sy_call_t *)setrlimit, AUE_SETRLIMIT, NULL, 0, 0, 0 }, /* 195 = setrlimit */ + { AS(freebsd32_getdirentries_args), (sy_call_t *)freebsd32_getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0, 0 }, /* 196 = freebsd32_getdirentries */ + { compat6(AS(freebsd6_freebsd32_mmap_args),freebsd32_mmap), AUE_MMAP, NULL, 0, 0, 0 }, /* 197 = old freebsd32_mmap */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 198 = __syscall */ + { compat6(AS(freebsd6_freebsd32_lseek_args),freebsd32_lseek), AUE_LSEEK, NULL, 0, 0, 0 }, /* 199 = old freebsd32_lseek */ + { compat6(AS(freebsd6_freebsd32_truncate_args),freebsd32_truncate), AUE_TRUNCATE, NULL, 0, 0, 0 }, /* 200 = old freebsd32_truncate */ + { compat6(AS(freebsd6_freebsd32_ftruncate_args),freebsd32_ftruncate), AUE_FTRUNCATE, NULL, 0, 0, 0 }, /* 201 = old freebsd32_ftruncate */ + { AS(freebsd32_sysctl_args), (sy_call_t *)freebsd32_sysctl, AUE_SYSCTL, NULL, 0, 0, 0 }, /* 202 = freebsd32_sysctl */ + { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK, NULL, 0, 0, 0 }, /* 203 = mlock */ + { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK, NULL, 0, 0, 0 }, /* 204 = munlock */ + { AS(undelete_args), (sy_call_t *)undelete, AUE_UNDELETE, NULL, 0, 0, 0 }, /* 205 = undelete */ + { AS(freebsd32_futimes_args), (sy_call_t *)freebsd32_futimes, AUE_FUTIMES, NULL, 0, 0, 0 }, /* 206 = freebsd32_futimes */ + { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0, 0 }, /* 207 = getpgid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 208 = newreboot */ + { AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0, 0 }, /* 209 = poll */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 210 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 211 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 212 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 213 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 214 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 215 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 216 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 217 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 218 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 219 = lkmnosys */ + { AS(freebsd32_semctl_args), (sy_call_t *)freebsd32_semctl, AUE_SEMCTL, NULL, 0, 0, 0 }, /* 220 = freebsd32_semctl */ + { AS(semget_args), (sy_call_t *)semget, AUE_SEMGET, NULL, 0, 0, 0 }, /* 221 = semget */ + { AS(semop_args), (sy_call_t *)semop, AUE_SEMOP, NULL, 0, 0, 0 }, /* 222 = semop */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 223 = semconfig */ + { AS(freebsd32_msgctl_args), (sy_call_t *)freebsd32_msgctl, AUE_MSGCTL, NULL, 0, 0, 0 }, /* 224 = freebsd32_msgctl */ + { AS(msgget_args), (sy_call_t *)msgget, AUE_MSGGET, NULL, 0, 0, 0 }, /* 225 = msgget */ + { AS(freebsd32_msgsnd_args), (sy_call_t *)freebsd32_msgsnd, AUE_MSGSND, NULL, 0, 0, 0 }, /* 226 = freebsd32_msgsnd */ + { AS(freebsd32_msgrcv_args), (sy_call_t *)freebsd32_msgrcv, AUE_MSGRCV, NULL, 0, 0, 0 }, /* 227 = freebsd32_msgrcv */ + { AS(shmat_args), (sy_call_t *)shmat, AUE_SHMAT, NULL, 0, 0, 0 }, /* 228 = shmat */ + { AS(freebsd32_shmctl_args), (sy_call_t *)freebsd32_shmctl, AUE_SHMCTL, NULL, 0, 0, 0 }, /* 229 = freebsd32_shmctl */ + { AS(shmdt_args), (sy_call_t *)shmdt, AUE_SHMDT, NULL, 0, 0, 0 }, /* 230 = shmdt */ + { AS(shmget_args), (sy_call_t *)shmget, AUE_SHMGET, NULL, 0, 0, 0 }, /* 231 = shmget */ + { AS(freebsd32_clock_gettime_args), (sy_call_t *)freebsd32_clock_gettime, AUE_NULL, NULL, 0, 0, 0 }, /* 232 = freebsd32_clock_gettime */ + { AS(freebsd32_clock_settime_args), (sy_call_t *)freebsd32_clock_settime, AUE_CLOCK_SETTIME, NULL, 0, 0, 0 }, /* 233 = freebsd32_clock_settime */ + { AS(freebsd32_clock_getres_args), (sy_call_t *)freebsd32_clock_getres, AUE_NULL, NULL, 0, 0, 0 }, /* 234 = freebsd32_clock_getres */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 235 = timer_create */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 236 = timer_delete */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 237 = timer_settime */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 238 = timer_gettime */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 239 = timer_getoverrun */ + { AS(freebsd32_nanosleep_args), (sy_call_t *)freebsd32_nanosleep, AUE_NULL, NULL, 0, 0, 0 }, /* 240 = freebsd32_nanosleep */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 241 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 242 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 243 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 244 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 245 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 246 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 247 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 248 = ntp_gettime */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 249 = nosys */ + { AS(minherit_args), (sy_call_t *)minherit, AUE_MINHERIT, NULL, 0, 0, 0 }, /* 250 = minherit */ + { AS(rfork_args), (sy_call_t *)rfork, AUE_RFORK, NULL, 0, 0, 0 }, /* 251 = rfork */ + { AS(openbsd_poll_args), (sy_call_t *)openbsd_poll, AUE_POLL, NULL, 0, 0, 0 }, /* 252 = openbsd_poll */ + { 0, (sy_call_t *)issetugid, AUE_ISSETUGID, NULL, 0, 0, 0 }, /* 253 = issetugid */ + { AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0, 0 }, /* 254 = lchown */ + { AS(freebsd32_aio_read_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 255 = freebsd32_aio_read */ + { AS(freebsd32_aio_write_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 256 = freebsd32_aio_write */ + { AS(freebsd32_lio_listio_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 257 = freebsd32_lio_listio */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 258 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 259 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 260 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 261 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 262 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 263 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 264 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 265 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 266 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 267 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 268 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 269 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 270 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 271 = nosys */ + { AS(getdents_args), (sy_call_t *)getdents, AUE_O_GETDENTS, NULL, 0, 0, 0 }, /* 272 = getdents */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 273 = nosys */ + { AS(lchmod_args), (sy_call_t *)lchmod, AUE_LCHMOD, NULL, 0, 0, 0 }, /* 274 = lchmod */ + { AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0, 0 }, /* 275 = netbsd_lchown */ + { AS(freebsd32_lutimes_args), (sy_call_t *)freebsd32_lutimes, AUE_LUTIMES, NULL, 0, 0, 0 }, /* 276 = freebsd32_lutimes */ + { AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0, 0 }, /* 277 = netbsd_msync */ + { AS(nstat_args), (sy_call_t *)nstat, AUE_STAT, NULL, 0, 0, 0 }, /* 278 = nstat */ + { AS(nfstat_args), (sy_call_t *)nfstat, AUE_FSTAT, NULL, 0, 0, 0 }, /* 279 = nfstat */ + { AS(nlstat_args), (sy_call_t *)nlstat, AUE_LSTAT, NULL, 0, 0, 0 }, /* 280 = nlstat */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 281 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 282 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 283 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 284 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 285 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 286 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 287 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 288 = nosys */ + { AS(freebsd32_preadv_args), (sy_call_t *)freebsd32_preadv, AUE_PREADV, NULL, 0, 0, 0 }, /* 289 = freebsd32_preadv */ + { AS(freebsd32_pwritev_args), (sy_call_t *)freebsd32_pwritev, AUE_PWRITEV, NULL, 0, 0, 0 }, /* 290 = freebsd32_pwritev */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 291 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 292 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 293 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 294 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 295 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 296 = nosys */ + { compat4(AS(freebsd4_freebsd32_fhstatfs_args),freebsd32_fhstatfs), AUE_FHSTATFS, NULL, 0, 0, 0 }, /* 297 = old freebsd32_fhstatfs */ + { AS(fhopen_args), (sy_call_t *)fhopen, AUE_FHOPEN, NULL, 0, 0, 0 }, /* 298 = fhopen */ + { AS(fhstat_args), (sy_call_t *)fhstat, AUE_FHSTAT, NULL, 0, 0, 0 }, /* 299 = fhstat */ + { AS(modnext_args), (sy_call_t *)modnext, AUE_NULL, NULL, 0, 0, 0 }, /* 300 = modnext */ + { AS(freebsd32_modstat_args), (sy_call_t *)freebsd32_modstat, AUE_NULL, NULL, 0, 0, 0 }, /* 301 = freebsd32_modstat */ + { AS(modfnext_args), (sy_call_t *)modfnext, AUE_NULL, NULL, 0, 0, 0 }, /* 302 = modfnext */ + { AS(modfind_args), (sy_call_t *)modfind, AUE_NULL, NULL, 0, 0, 0 }, /* 303 = modfind */ + { AS(kldload_args), (sy_call_t *)kldload, AUE_MODLOAD, NULL, 0, 0, 0 }, /* 304 = kldload */ + { AS(kldunload_args), (sy_call_t *)kldunload, AUE_MODUNLOAD, NULL, 0, 0, 0 }, /* 305 = kldunload */ + { AS(kldfind_args), (sy_call_t *)kldfind, AUE_NULL, NULL, 0, 0, 0 }, /* 306 = kldfind */ + { AS(kldnext_args), (sy_call_t *)kldnext, AUE_NULL, NULL, 0, 0, 0 }, /* 307 = kldnext */ + { AS(kldstat_args), (sy_call_t *)kldstat, AUE_NULL, NULL, 0, 0, 0 }, /* 308 = kldstat */ + { AS(kldfirstmod_args), (sy_call_t *)kldfirstmod, AUE_NULL, NULL, 0, 0, 0 }, /* 309 = kldfirstmod */ + { AS(getsid_args), (sy_call_t *)getsid, AUE_GETSID, NULL, 0, 0, 0 }, /* 310 = getsid */ + { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID, NULL, 0, 0, 0 }, /* 311 = setresuid */ + { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID, NULL, 0, 0, 0 }, /* 312 = setresgid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 313 = obsolete signanosleep */ + { AS(freebsd32_aio_return_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 314 = freebsd32_aio_return */ + { AS(freebsd32_aio_suspend_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 315 = freebsd32_aio_suspend */ + { AS(freebsd32_aio_cancel_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 316 = freebsd32_aio_cancel */ + { AS(freebsd32_aio_error_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 317 = freebsd32_aio_error */ + { AS(freebsd32_oaio_read_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 318 = freebsd32_oaio_read */ + { AS(freebsd32_oaio_write_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 319 = freebsd32_oaio_write */ + { AS(freebsd32_olio_listio_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 320 = freebsd32_olio_listio */ + { 0, (sy_call_t *)yield, AUE_NULL, NULL, 0, 0, 0 }, /* 321 = yield */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 322 = obsolete thr_sleep */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 323 = obsolete thr_wakeup */ + { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL, NULL, 0, 0, 0 }, /* 324 = mlockall */ + { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL, NULL, 0, 0, 0 }, /* 325 = munlockall */ + { AS(__getcwd_args), (sy_call_t *)__getcwd, AUE_GETCWD, NULL, 0, 0, 0 }, /* 326 = __getcwd */ + { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL, NULL, 0, 0, 0 }, /* 327 = sched_setparam */ + { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL, NULL, 0, 0, 0 }, /* 328 = sched_getparam */ + { AS(sched_setscheduler_args), (sy_call_t *)sched_setscheduler, AUE_NULL, NULL, 0, 0, 0 }, /* 329 = sched_setscheduler */ + { AS(sched_getscheduler_args), (sy_call_t *)sched_getscheduler, AUE_NULL, NULL, 0, 0, 0 }, /* 330 = sched_getscheduler */ + { 0, (sy_call_t *)sched_yield, AUE_NULL, NULL, 0, 0, 0 }, /* 331 = sched_yield */ + { AS(sched_get_priority_max_args), (sy_call_t *)sched_get_priority_max, AUE_NULL, NULL, 0, 0, 0 }, /* 332 = sched_get_priority_max */ + { AS(sched_get_priority_min_args), (sy_call_t *)sched_get_priority_min, AUE_NULL, NULL, 0, 0, 0 }, /* 333 = sched_get_priority_min */ + { AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_NULL, NULL, 0, 0, 0 }, /* 334 = sched_rr_get_interval */ + { AS(utrace_args), (sy_call_t *)utrace, AUE_NULL, NULL, 0, 0, 0 }, /* 335 = utrace */ + { compat4(AS(freebsd4_freebsd32_sendfile_args),freebsd32_sendfile), AUE_SENDFILE, NULL, 0, 0, 0 }, /* 336 = old freebsd32_sendfile */ + { AS(kldsym_args), (sy_call_t *)kldsym, AUE_NULL, NULL, 0, 0, 0 }, /* 337 = kldsym */ + { AS(freebsd32_jail_args), (sy_call_t *)freebsd32_jail, AUE_JAIL, NULL, 0, 0, 0 }, /* 338 = freebsd32_jail */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 339 = pioctl */ + { AS(sigprocmask_args), (sy_call_t *)sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0, 0 }, /* 340 = sigprocmask */ + { AS(sigsuspend_args), (sy_call_t *)sigsuspend, AUE_SIGSUSPEND, NULL, 0, 0, 0 }, /* 341 = sigsuspend */ + { compat4(AS(freebsd4_freebsd32_sigaction_args),freebsd32_sigaction), AUE_SIGACTION, NULL, 0, 0, 0 }, /* 342 = old freebsd32_sigaction */ + { AS(sigpending_args), (sy_call_t *)sigpending, AUE_SIGPENDING, NULL, 0, 0, 0 }, /* 343 = sigpending */ + { compat4(AS(freebsd4_freebsd32_sigreturn_args),freebsd32_sigreturn), AUE_SIGRETURN, NULL, 0, 0, 0 }, /* 344 = old freebsd32_sigreturn */ + { AS(freebsd32_sigtimedwait_args), (sy_call_t *)freebsd32_sigtimedwait, AUE_SIGWAIT, NULL, 0, 0, 0 }, /* 345 = freebsd32_sigtimedwait */ + { AS(freebsd32_sigwaitinfo_args), (sy_call_t *)freebsd32_sigwaitinfo, AUE_NULL, NULL, 0, 0, 0 }, /* 346 = freebsd32_sigwaitinfo */ + { AS(__acl_get_file_args), (sy_call_t *)__acl_get_file, AUE_NULL, NULL, 0, 0, 0 }, /* 347 = __acl_get_file */ + { AS(__acl_set_file_args), (sy_call_t *)__acl_set_file, AUE_NULL, NULL, 0, 0, 0 }, /* 348 = __acl_set_file */ + { AS(__acl_get_fd_args), (sy_call_t *)__acl_get_fd, AUE_NULL, NULL, 0, 0, 0 }, /* 349 = __acl_get_fd */ + { AS(__acl_set_fd_args), (sy_call_t *)__acl_set_fd, AUE_NULL, NULL, 0, 0, 0 }, /* 350 = __acl_set_fd */ + { AS(__acl_delete_file_args), (sy_call_t *)__acl_delete_file, AUE_NULL, NULL, 0, 0, 0 }, /* 351 = __acl_delete_file */ + { AS(__acl_delete_fd_args), (sy_call_t *)__acl_delete_fd, AUE_NULL, NULL, 0, 0, 0 }, /* 352 = __acl_delete_fd */ + { AS(__acl_aclcheck_file_args), (sy_call_t *)__acl_aclcheck_file, AUE_NULL, NULL, 0, 0, 0 }, /* 353 = __acl_aclcheck_file */ + { AS(__acl_aclcheck_fd_args), (sy_call_t *)__acl_aclcheck_fd, AUE_NULL, NULL, 0, 0, 0 }, /* 354 = __acl_aclcheck_fd */ + { AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_EXTATTRCTL, NULL, 0, 0, 0 }, /* 355 = extattrctl */ + { AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_EXTATTR_SET_FILE, NULL, 0, 0, 0 }, /* 356 = extattr_set_file */ + { AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_EXTATTR_GET_FILE, NULL, 0, 0, 0 }, /* 357 = extattr_get_file */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 13 19:37:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41B1D1065675; Tue, 13 Jan 2009 19:37:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 020A91065670 for ; Tue, 13 Jan 2009 19:37:23 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E2F078FC19 for ; Tue, 13 Jan 2009 19:37:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0DJbMqr075649 for ; Tue, 13 Jan 2009 19:37:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0DJbMRX075647 for perforce@freebsd.org; Tue, 13 Jan 2009 19:37:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 13 Jan 2009 19:37:22 GMT Message-Id: <200901131937.n0DJbMRX075647@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156109 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Jan 2009 19:37:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=156109 Change 156109 by rwatson@rwatson_freebsd_capabilities on 2009/01/13 19:37:09 Add an explicit sy_flags field to make up for the removal of the previously abused and overloaded sy_count field. Define the SYF_CAPENABLED flag again. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/sys/sysent.h#4 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/sysent.h#4 (text+ko) ==== @@ -60,8 +60,14 @@ /* optional argument conversion function. */ u_int32_t sy_entry; /* DTrace entry ID for systrace. */ u_int32_t sy_return; /* DTrace return ID for systrace. */ + u_int32_t sy_flags; /* General flags for system calls. */ }; +/* + * struct sysent flags + */ +#define SYF_CAPENABLED 0x00000001 + struct image_params; struct __sigset; struct trapframe; From owner-p4-projects@FreeBSD.ORG Tue Jan 13 21:59:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2884F1065673; Tue, 13 Jan 2009 21:59:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D9E231065670 for ; Tue, 13 Jan 2009 21:59:52 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AA8FF8FC1B for ; Tue, 13 Jan 2009 21:59:52 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0DLxqiR015402 for ; Tue, 13 Jan 2009 21:59:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0DLxqoa015400 for perforce@freebsd.org; Tue, 13 Jan 2009 21:59:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 13 Jan 2009 21:59:52 GMT Message-Id: <200901132159.n0DLxqoa015400@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156116 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Jan 2009 21:59:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=156116 Change 156116 by rwatson@rwatson_freebsd_capabilities on 2009/01/13 21:59:41 Add CAP_SOCK_ALL, a mask of all capabilities that may be used with sockets, and use it when a socket gets used by the NFS server. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/nfsserver/nfs_srvkrpc.c#2 edit .. //depot/projects/trustedbsd/capabilities/src/sys/nfsserver/nfs_syscalls.c#6 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#18 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/nfsserver/nfs_srvkrpc.c#2 (text+ko) ==== @@ -39,6 +39,7 @@ #include "opt_kgssapi.h" #include +#include #include #include #include @@ -187,7 +188,8 @@ sizeof(addsockarg)); if (error) return (error); - if ((error = fget(td, addsockarg.sock, &fp)) != 0) + if ((error = fget(td, addsockarg.sock, CAP_SOCK_ALL, &fp)) + != 0) return (error); if (fp->f_type != DTYPE_SOCKET) { fdrop(fp, td); ==== //depot/projects/trustedbsd/capabilities/src/sys/nfsserver/nfs_syscalls.c#6 (text+ko) ==== @@ -152,12 +152,7 @@ error = copyin(uap->argp, (caddr_t)&nfsdarg, sizeof(nfsdarg)); if (error) return (error); - /* - * XXXRW: Really want CAP_SOCK_ALL? - */ - if ((error = fget(td, nfsdarg.sock, CAP_READ | CAP_WRITE | - CAP_GETSOCKNAME | CAP_BIND | CAP_CONNECT | CAP_EVENT, - &fp)) != 0) + if ((error = fget(td, nfsdarg.sock, CAP_SOCK_ALL, &fp)) != 0) return (error); if (fp->f_type != DTYPE_SOCKET) { fdrop(fp, td); ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#18 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 Robert N. M. Watson + * Copyright (c) 2008-2009 Robert N. M. Watson * All rights reserved. * * WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#17 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#18 $ */ /* @@ -116,6 +116,18 @@ * Socket checks don't generally pass CAP_SEEK but perhaps should? */ +/* + * A mask of multiple capabilities useful for situation where a socket will + * be used in a general-purpose way by the kernel, such as a socket used by + * the NFS server. + */ +#define CAP_SOCK_ALL (CAP_READ | CAP_WRITE | CAP_SEEK | CAP_GETPEERNAME | \ + CAP_GETSOCKNAME | CAP_IOCTL | CAP_FSTAT | \ + CAP_FCNTL | CAP_EVENT | CAP_ACCEPT | \ + CAP_CONNECT | CAP_BIND | CAP_GETSOCKOPT | \ + CAP_SETSOCKOPT | CAP_LISTEN | CAP_SHUTDOWN | \ + CAP_PEELOFF) + #ifdef _KERNEL struct file; From owner-p4-projects@FreeBSD.ORG Tue Jan 13 22:15:09 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 298B4106567C; Tue, 13 Jan 2009 22:15:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C8F20106567A for ; Tue, 13 Jan 2009 22:15:08 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B14DF8FC0A for ; Tue, 13 Jan 2009 22:15:08 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0DMF8Fx017433 for ; Tue, 13 Jan 2009 22:15:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0DMF8NS017431 for perforce@freebsd.org; Tue, 13 Jan 2009 22:15:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 13 Jan 2009 22:15:08 GMT Message-Id: <200901132215.n0DMF8NS017431@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156118 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Jan 2009 22:15:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=156118 Change 156118 by rwatson@rwatson_freebsd_capabilities on 2009/01/13 22:14:08 Integrate capabilities branch. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/bin/kenv/kenv.1#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ln/ln.1#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpd/ntp_crypto.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libusb20/libusb20.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/conf/USB2#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/files#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/files.powerpc#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/at91dci.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/at91dci.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/at91dci_atmelarm.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/atmegadci.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/atmegadci.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/atmegadci_atmelarm.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/ehci2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/ehci2.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/ehci2_pci.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/musb2_otg.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/musb2_otg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/ohci2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/ohci2.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/ohci2_atmelarm.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/ohci2_pci.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/uhci2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/uhci2.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/uhci2_pci.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/usb2_bus.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/usb2_controller.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/usb2_controller.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/uss820dci.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/uss820dci.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/core/usb2_busdma.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/core/usb2_compat_linux.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/core/usb2_core.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/core/usb2_debug.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/core/usb2_device.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/core/usb2_generic.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/core/usb2_handle_request.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/core/usb2_hub.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/core/usb2_mbuf.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/core/usb2_parse.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/core/usb2_request.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/core/usb2_sw_transfer.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/core/usb2_transfer.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/core/usb2_transfer.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_aue2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_aue2_reg.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_auereg.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_axe2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_axe2_reg.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_axereg.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_cdce2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_cdce2_reg.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_cdcereg.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_cue2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_cue2_reg.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_cuereg.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_kue2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_kue2_fw.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_kue2_reg.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_kuefw.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_kuereg.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_rue2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_rue2_reg.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_ruereg.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_udav2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_udav2_reg.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_udavreg.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/include/usb2_defs.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/include/usb2_devid.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/include/usb2_devtable.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/include/usb2_standard.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/u3g2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/uark2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/ubsa2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/ubser2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/uchcom2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/ucycom2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/ufoma2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/uftdi2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/ugensa2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/uipaq2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/ulpt2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/umct2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/umodem2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/umoscom2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/uplcom2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/usb2_serial.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/usb2_serial.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/uvisor2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/uvscom2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/sound/uaudio2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/storage/ata-usb2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/storage/umass2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/wlan/if_rum2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/wlan/if_rum2_fw.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/wlan/if_rum2_reg.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/wlan/if_rum2_var.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/wlan/if_rumfw.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/wlan/if_rumreg.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/wlan/if_rumvar.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/wlan/if_ural2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/wlan/if_ural2_reg.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/wlan/if_ural2_var.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/wlan/if_uralreg.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/wlan/if_uralvar.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/wlan/if_zyd2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/wlan/if_zyd2_fw.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/wlan/if_zyd2_reg.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/wlan/if_zydfw.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/wlan/if_zydreg.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/i386/conf/USB2#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/msi.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_timeout.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/usb2/controller_atmegadci/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/booke/locore.S#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/booke/machdep.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/booke/pmap.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/booke/support.S#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/booke/trap_subr.S#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/include/pcpu.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/include/pmap.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/include/pte.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/include/tlb.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/powerpc/genassym.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/tools/sched/schedgraph.py#4 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/usbconfig/usbconfig.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/capabilities/src/bin/kenv/kenv.1#3 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/kenv/kenv.1,v 1.15 2009/01/13 12:37:02 luigi Exp $ +.\" $FreeBSD: src/bin/kenv/kenv.1,v 1.16 2009/01/13 18:25:56 maxim Exp $ .\" -.Dd September 13, 2005 +.Dd January 13, 2009 .Dt KENV 1 .Os .Sh NAME @@ -77,7 +77,7 @@ in the kernel config file. The file can contain lines of the form .Pp -.Dl name = "value" # this is a coment +.Dl name = "value" # this is a comment .Pp where whitespace around name and '=', and everything after a '#' character, are ignored. Almost any printable ==== //depot/projects/trustedbsd/capabilities/src/bin/ln/ln.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ln.1 8.2 (Berkeley) 12/30/93 -.\" $FreeBSD: src/bin/ln/ln.1,v 1.33 2008/06/06 08:27:59 keramida Exp $ +.\" $FreeBSD: src/bin/ln/ln.1,v 1.34 2009/01/13 15:24:35 trhodes Exp $ .\" .Dd June 6, 2008 .Dt LN 1 @@ -38,7 +38,7 @@ .Sh NAME .Nm ln , .Nm link -.Nd make links +.Nd link files .Sh SYNOPSIS .Nm .Op Fl s Op Fl F @@ -57,8 +57,13 @@ .Sh DESCRIPTION The .Nm -utility creates a new directory entry (linked file) which has the -same modes as the original file. +utility creates a new directory entry (linked file) for the file name +specified by +.Ar target_file . +The +.Ar target_file +will be created with the same file modes as the +.Ar source_file . It is useful for maintaining multiple copies of a file in many places at once without using up storage for the .Dq copies ; @@ -148,7 +153,7 @@ A hard link to a file is indistinguishable from the original directory entry; any changes to a file are effectively independent of the name used to reference the file. -Hard links may not normally refer to directories and may not span file systems. +Directories may not be hardlinked, and hard links may not span file systems. .Pp A symbolic link contains the name of the file to which it is linked. ==== //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpd/ntp_crypto.c#3 (text+ko) ==== @@ -1612,7 +1612,7 @@ */ EVP_VerifyInit(&ctx, peer->digest); EVP_VerifyUpdate(&ctx, (u_char *)&ep->tstamp, vallen + 12); - if (!EVP_VerifyFinal(&ctx, (u_char *)&ep->pkt[i], siglen, pkey)) + if (EVP_VerifyFinal(&ctx, (u_char *)&ep->pkt[i], siglen, pkey) <= 0) return (XEVNT_SIG); if (peer->crypto & CRYPTO_FLAG_VRFY) { ==== //depot/projects/trustedbsd/capabilities/src/lib/libusb20/libusb20.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb20/libusb20.c,v 1.2 2008/11/19 08:56:35 alfred Exp $ */ +/* $FreeBSD: src/lib/libusb20/libusb20.c,v 1.3 2009/01/13 19:06:02 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -486,6 +486,8 @@ pdev->is_opened = 0; + pdev->claimed_interfaces = 0; + return (error); } ==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/conf/USB2#2 (text+ko) ==== @@ -2,7 +2,7 @@ # USB2 -- Generic kernel configuration file for FreeBSD/amd64 with USBng # stack. # -# $FreeBSD: src/sys/amd64/conf/USB2,v 1.2 2008/12/30 20:13:20 rpaulo Exp $ +# $FreeBSD: src/sys/amd64/conf/USB2,v 1.3 2009/01/13 19:05:10 thompsa Exp $ include GENERIC @@ -108,3 +108,7 @@ # USB sound and MIDI device support #device usb2_sound + +# USB scanner support +device usb2_image +device usb2_scanner ==== //depot/projects/trustedbsd/capabilities/src/sys/conf/files#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1363 2009/01/08 17:12:47 sam Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1364 2009/01/13 19:18:43 thompsa Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1609,6 +1609,7 @@ # # USB2 serial and parallel port drivers # +dev/usb2/serial/u3g2.c optional usb2_core usb2_serial usb2_serial_3g dev/usb2/serial/uark2.c optional usb2_core usb2_serial usb2_serial_ark dev/usb2/serial/ubsa2.c optional usb2_core usb2_serial usb2_serial_bsa dev/usb2/serial/ubser2.c optional usb2_core usb2_serial usb2_serial_bser ==== //depot/projects/trustedbsd/capabilities/src/sys/conf/files.powerpc#5 (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.powerpc,v 1.88 2009/01/01 13:26:53 ed Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.89 2009/01/13 15:41:58 raj Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -84,7 +84,6 @@ powerpc/booke/locore.S optional e500 no-obj powerpc/booke/machdep.c optional e500 powerpc/booke/pmap.c optional e500 -powerpc/booke/support.S optional e500 powerpc/booke/swtch.S optional e500 powerpc/booke/trap.c optional e500 powerpc/booke/uio_machdep.c optional e500 ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac.c#4 (text+ko) ==== @@ -83,9 +83,9 @@ #include "mixer_if.h" -#define HDA_DRV_TEST_REV "20090110_0123" +#define HDA_DRV_TEST_REV "20090113_0124" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.88 2009/01/11 12:04:18 mav Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.89 2009/01/13 16:27:04 mav Exp $"); #define HDA_BOOTVERBOSE(stmt) do { \ if (bootverbose != 0 || snd_verbose > 3) { \ @@ -6111,6 +6111,29 @@ } static void +hdac_audio_ctl_commit(struct hdac_devinfo *devinfo) +{ + struct hdac_audio_ctl *ctl; + int i, z; + + i = 0; + while ((ctl = hdac_audio_ctl_each(devinfo, &i)) != NULL) { + if (ctl->enable == 0 || ctl->ossmask != 0) { + /* Mute disabled and mixer controllable controls. + * Last will be initialized by mixer_init(). + * This expected to reduce click on startup. */ + hdac_audio_ctl_amp_set(ctl, HDA_AMP_MUTE_ALL, 0, 0); + continue; + } + /* Init fixed controls to 0dB amplification. */ + z = ctl->offset; + if (z > ctl->step) + z = ctl->step; + hdac_audio_ctl_amp_set(ctl, HDA_AMP_MUTE_NONE, z, z); + } +} + +static void hdac_audio_commit(struct hdac_devinfo *devinfo) { struct hdac_softc *sc = devinfo->codec->sc; @@ -6126,11 +6149,41 @@ hdac_command(sc, HDA_CMD_12BIT(cad, devinfo->nid, 0x7e7, 0), cad); + /* Commit controls. */ + hdac_audio_ctl_commit(devinfo); + + /* Commit selectors, pins and EAPD. */ + for (i = 0; i < devinfo->nodecnt; i++) { + w = &devinfo->widget[i]; + if (w == NULL) + continue; + if (w->selconn == -1) + w->selconn = 0; + if (w->nconns > 0) + hdac_widget_connection_select(w, w->selconn); + if (w->type == HDA_PARAM_AUDIO_WIDGET_CAP_TYPE_PIN_COMPLEX) { + hdac_command(sc, + HDA_CMD_SET_PIN_WIDGET_CTRL(cad, w->nid, + w->wclass.pin.ctrl), cad); + } + if (w->param.eapdbtl != HDAC_INVALID) { + uint32_t val; + + val = w->param.eapdbtl; + if (devinfo->function.audio.quirks & + HDA_QUIRK_EAPDINV) + val ^= HDA_CMD_SET_EAPD_BTL_ENABLE_EAPD; + hdac_command(sc, + HDA_CMD_SET_EAPD_BTL_ENABLE(cad, w->nid, + val), cad); + } + } + + /* Commit GPIOs. */ gdata = 0; gmask = 0; gdir = 0; commitgpio = 0; - numgpio = HDA_PARAM_GPIO_COUNT_NUM_GPIO( devinfo->function.audio.gpio); @@ -6185,57 +6238,9 @@ HDA_CMD_SET_GPIO_DATA(cad, devinfo->nid, gdata), cad); } - - for (i = 0; i < devinfo->nodecnt; i++) { - w = &devinfo->widget[i]; - if (w == NULL) - continue; - if (w->selconn == -1) - w->selconn = 0; - if (w->nconns > 0) - hdac_widget_connection_select(w, w->selconn); - if (w->type == HDA_PARAM_AUDIO_WIDGET_CAP_TYPE_PIN_COMPLEX) { - hdac_command(sc, - HDA_CMD_SET_PIN_WIDGET_CTRL(cad, w->nid, - w->wclass.pin.ctrl), cad); - } - if (w->param.eapdbtl != HDAC_INVALID) { - uint32_t val; - - val = w->param.eapdbtl; - if (devinfo->function.audio.quirks & - HDA_QUIRK_EAPDINV) - val ^= HDA_CMD_SET_EAPD_BTL_ENABLE_EAPD; - hdac_command(sc, - HDA_CMD_SET_EAPD_BTL_ENABLE(cad, w->nid, - val), cad); - - } - } } static void -hdac_audio_ctl_commit(struct hdac_devinfo *devinfo) -{ - struct hdac_audio_ctl *ctl; - int i, z; - - i = 0; - while ((ctl = hdac_audio_ctl_each(devinfo, &i)) != NULL) { - if (ctl->enable == 0) { - /* Mute disabled controls. */ - hdac_audio_ctl_amp_set(ctl, HDA_AMP_MUTE_ALL, 0, 0); - continue; - } - /* Init controls to 0dB amplification. */ - z = ctl->offset; - if (z > ctl->step) - z = ctl->step; - hdac_audio_ctl_amp_set(ctl, HDA_AMP_MUTE_NONE, z, z); - } -} - -static void hdac_powerup(struct hdac_devinfo *devinfo) { struct hdac_softc *sc = devinfo->codec->sc; @@ -7477,10 +7482,6 @@ ); hdac_audio_commit(devinfo); HDA_BOOTHVERBOSE( - device_printf(sc->dev, "Ctls commit...\n"); - ); - hdac_audio_ctl_commit(devinfo); - HDA_BOOTHVERBOSE( device_printf(sc->dev, "HP switch init...\n"); ); hdac_hp_switch_init(devinfo); @@ -7730,10 +7731,6 @@ ); hdac_audio_commit(devinfo); HDA_BOOTHVERBOSE( - device_printf(dev, "Ctls commit...\n"); - ); - hdac_audio_ctl_commit(devinfo); - HDA_BOOTHVERBOSE( device_printf(dev, "HP switch init...\n"); ); hdac_hp_switch_init(devinfo); ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usbdevs#8 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.392 2009/01/09 04:38:22 thompsa Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.393 2009/01/13 19:01:25 thompsa Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -151,6 +151,7 @@ vendor KYOCERA 0x0482 Kyocera Wireless Corp. vendor STMICRO 0x0483 STMicroelectronics vendor FOXCONN 0x0489 Foxconn +vendor MEIZU 0x0492 Meizu Electronics vendor YAMAHA 0x0499 YAMAHA vendor COMPAQ 0x049f Compaq vendor HITACHI 0x04a4 Hitachi @@ -1657,6 +1658,9 @@ product MCT USB232 0x0210 USB-232 Interface product MCT SITECOM_USB232 0x0230 Sitecom USB-232 Products +/* Meizu Electronics */ +product MEIZU M6_SL 0x0140 MiniPlayer M6 (SL) + /* Melco, Inc products */ product MELCO LUATX1 0x0001 LUA-TX Ethernet product MELCO LUATX5 0x0005 LUA-TX Ethernet ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/at91dci.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/at91dci.c,v 1.6 2009/01/04 00:12:01 alfred Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/at91dci.c,v 1.11 2009/01/13 19:05:51 thompsa Exp $"); /*- * Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved. @@ -50,14 +50,11 @@ #include #define USB_DEBUG_VAR at91dcidebug -#define usb2_config_td_cc at91dci_config_copy -#define usb2_config_td_softc at91dci_softc #include #include #include #include -#include #include #include #include @@ -106,7 +103,6 @@ static usb2_sw_transfer_func_t at91dci_root_intr_done; static usb2_sw_transfer_func_t at91dci_root_ctrl_done; -static usb2_config_td_command_t at91dci_root_ctrl_task; /* * NOTE: Some of the bits in the CSR register have inverse meaning so @@ -263,13 +259,13 @@ static void at91dci_wakeup_peer(struct usb2_xfer *xfer) { - struct at91dci_softc *sc = xfer->usb2_sc; + struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); uint8_t use_polling; if (!(sc->sc_flags.status_suspend)) { return; } - use_polling = mtx_owned(xfer->xfer_mtx) ? 1 : 0; + use_polling = mtx_owned(xfer->xroot->xfer_mtx) ? 1 : 0; AT91_UDP_WRITE_4(sc, AT91_UDP_GSTATE, AT91_UDP_GSTATE_ESR); @@ -702,7 +698,7 @@ return (1); /* not complete */ done: - sc = xfer->usb2_sc; + sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); temp = (xfer->endpoint & UE_ADDR); /* update FIFO bank flag and multi buffer */ @@ -733,11 +729,9 @@ } } -static void -at91dci_vbus_interrupt(struct usb2_bus *bus, uint8_t is_on) +void +at91dci_vbus_interrupt(struct at91dci_softc *sc, uint8_t is_on) { - struct at91dci_softc *sc = AT9100_DCI_BUS2SC(bus); - DPRINTFN(5, "vbus = %u\n", is_on); USB_BUS_LOCK(&sc->sc_bus); @@ -764,7 +758,6 @@ &at91dci_root_intr_done); } } - USB_BUS_UNLOCK(&sc->sc_bus); } @@ -890,7 +883,7 @@ DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n", xfer->address, UE_GET_ADDR(xfer->endpoint), - xfer->sumlen, usb2_get_speed(xfer->udev)); + xfer->sumlen, usb2_get_speed(xfer->xroot->udev)); temp.max_frame_size = xfer->max_frame_size; @@ -905,7 +898,7 @@ temp.setup_alt_next = xfer->flags_int.short_frames_ok; temp.offset = 0; - sc = xfer->usb2_sc; + sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); ep_no = (xfer->endpoint & UE_ADDR); /* check if we should prepend a setup message */ @@ -1032,7 +1025,7 @@ DPRINTF("xfer=%p\n", xfer); - USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED); + USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED); /* transfer is transferred */ at91dci_device_done(xfer, USB_ERR_TIMEOUT); @@ -1046,7 +1039,7 @@ /* poll one time */ if (at91dci_xfer_do_fifo(xfer)) { - struct at91dci_softc *sc = xfer->usb2_sc; + struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); uint8_t ep_no = xfer->endpoint & UE_ADDR; /* @@ -1059,7 +1052,7 @@ DPRINTFN(15, "enable interrupts on endpoint %d\n", ep_no); /* put transfer on interrupt queue */ - usb2_transfer_enqueue(&xfer->udev->bus->intr_q, xfer); + usb2_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer); /* start timeout, if any */ if (xfer->timeout != 0) { @@ -1073,7 +1066,7 @@ at91dci_root_intr_done(struct usb2_xfer *xfer, struct usb2_sw_transfer *std) { - struct at91dci_softc *sc = xfer->usb2_sc; + struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); DPRINTFN(9, "\n"); @@ -1213,7 +1206,7 @@ static void at91dci_device_done(struct usb2_xfer *xfer, usb2_error_t error) { - struct at91dci_softc *sc = xfer->usb2_sc; + struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); uint8_t ep_no; USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); @@ -1627,7 +1620,7 @@ static void at91dci_device_isoc_fs_enter(struct usb2_xfer *xfer) { - struct at91dci_softc *sc = xfer->usb2_sc; + struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); uint32_t temp; uint32_t nframes; @@ -1709,7 +1702,7 @@ static void at91dci_root_ctrl_close(struct usb2_xfer *xfer) { - struct at91dci_softc *sc = xfer->usb2_sc; + struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); if (sc->sc_root_ctrl.xfer == xfer) { sc->sc_root_ctrl.xfer = NULL; @@ -1783,7 +1776,7 @@ .wHubCharacteristics[0] = (UHD_PWR_NO_SWITCH | UHD_OC_INDIVIDUAL) & 0xFF, .wHubCharacteristics[1] = - (UHD_PWR_NO_SWITCH | UHD_OC_INDIVIDUAL) >> 16, + (UHD_PWR_NO_SWITCH | UHD_OC_INDIVIDUAL) >> 8, .bPwrOn2PwrGood = 50, .bHubContrCurrent = 0, .DeviceRemovable = {0}, /* port is removable */ @@ -1813,26 +1806,24 @@ static void at91dci_root_ctrl_start(struct usb2_xfer *xfer) { - struct at91dci_softc *sc = xfer->usb2_sc; + struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); sc->sc_root_ctrl.xfer = xfer; - usb2_config_td_queue_command( - &sc->sc_config_td, NULL, &at91dci_root_ctrl_task, 0, 0); + usb2_bus_roothub_exec(xfer->xroot->bus); } static void -at91dci_root_ctrl_task(struct at91dci_softc *sc, - struct at91dci_config_copy *cc, uint16_t refcount) +at91dci_root_ctrl_task(struct usb2_bus *bus) { - at91dci_root_ctrl_poll(sc); + at91dci_root_ctrl_poll(AT9100_DCI_BUS2SC(bus)); } static void at91dci_root_ctrl_done(struct usb2_xfer *xfer, struct usb2_sw_transfer *std) { - struct at91dci_softc *sc = xfer->usb2_sc; + struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); uint16_t value; uint16_t index; uint8_t use_polling; @@ -1853,7 +1844,7 @@ value = UGETW(std->req.wValue); index = UGETW(std->req.wIndex); - use_polling = mtx_owned(xfer->xfer_mtx) ? 1 : 0; + use_polling = mtx_owned(xfer->xroot->xfer_mtx) ? 1 : 0; /* demultiplex the control request */ @@ -2258,7 +2249,7 @@ static void at91dci_root_intr_close(struct usb2_xfer *xfer) { - struct at91dci_softc *sc = xfer->usb2_sc; + struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); if (sc->sc_root_intr.xfer == xfer) { sc->sc_root_intr.xfer = NULL; @@ -2275,7 +2266,7 @@ static void at91dci_root_intr_start(struct usb2_xfer *xfer) { - struct at91dci_softc *sc = xfer->usb2_sc; + struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); sc->sc_root_intr.xfer = xfer; } @@ -2305,11 +2296,6 @@ xfer = parm->curr_xfer; /* - * setup xfer - */ - xfer->usb2_sc = sc; - - /* * NOTE: This driver does not use any of the parameters that * are computed from the following values. Just set some * reasonable dummies: @@ -2477,5 +2463,5 @@ .get_hw_ep_profile = &at91dci_get_hw_ep_profile, .set_stall = &at91dci_set_stall, .clear_stall = &at91dci_clear_stall, - .vbus_interrupt = &at91dci_vbus_interrupt, + .roothub_exec = &at91dci_root_ctrl_task, }; ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/at91dci.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/controller/at91dci.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/controller/at91dci.h,v 1.4 2009/01/13 19:03:33 thompsa Exp $ */ /*- * Copyright (c) 2006 ATMEL * Copyright (c) 2007 Hans Petter Selasky @@ -34,6 +34,8 @@ #ifndef _AT9100_DCI_H_ #define _AT9100_DCI_H_ +#define AT91_MAX_DEVICES (USB_MIN_DEVICES + 1) + #define AT91_UDP_FRM 0x00 /* Frame number register */ #define AT91_UDP_FRM_MASK (0x7FF << 0) /* Frame Number as Defined in * the Packet Field Formats */ @@ -204,8 +206,8 @@ LIST_HEAD(, usb2_xfer) sc_interrupt_list_head; struct usb2_sw_transfer sc_root_ctrl; struct usb2_sw_transfer sc_root_intr; - struct usb2_config_td sc_config_td; + struct usb2_device *sc_devices[AT91_MAX_DEVICES]; struct resource *sc_io_res; struct resource *sc_irq_res; void *sc_intr_hdl; @@ -238,5 +240,6 @@ void at91dci_suspend(struct at91dci_softc *sc); void at91dci_resume(struct at91dci_softc *sc); void at91dci_interrupt(struct at91dci_softc *sc); +void at91dci_vbus_interrupt(struct at91dci_softc *sc, uint8_t is_on); #endif /* _AT9100_DCI_H_ */ ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/at91dci_atmelarm.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/at91dci_atmelarm.c,v 1.4 2008/12/23 17:36:25 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/at91dci_atmelarm.c,v 1.7 2009/01/13 19:03:33 thompsa Exp $"); /*- * Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved. @@ -34,7 +34,6 @@ #include #include #include -#include #include #include @@ -73,7 +72,7 @@ }; static void -at91_vbus_interrupt(struct at91_udp_softc *sc) +at91_vbus_poll(struct at91_udp_softc *sc) { uint32_t temp; uint8_t vbus_val; @@ -85,8 +84,7 @@ /* just forward it */ vbus_val = at91_pio_gpio_get(VBUS_BASE, VBUS_MASK); - (sc->sc_dci.sc_bus.methods->vbus_interrupt) - (&sc->sc_dci.sc_bus, vbus_val); + at91dci_vbus_interrupt(&sc->sc_dci, vbus_val); } static void @@ -145,9 +143,12 @@ sc->sc_dci.sc_pull_down = &at91_udp_pull_down; sc->sc_dci.sc_pull_arg = sc; + /* initialise some bus fields */ + sc->sc_dci.sc_bus.parent = dev; + sc->sc_dci.sc_bus.devices = sc->sc_dci.sc_devices; + sc->sc_dci.sc_bus.devices_max = AT91_MAX_DEVICES; + /* get all DMA memory */ - - sc->sc_dci.sc_bus.parent = dev; if (usb2_bus_mem_alloc_all(&sc->sc_dci.sc_bus, USB_GET_DMA_TAG(dev), NULL)) { return (ENOMEM); @@ -205,12 +206,6 @@ } device_set_ivars(sc->sc_dci.sc_bus.bdev, &sc->sc_dci.sc_bus); - err = usb2_config_td_setup(&sc->sc_dci.sc_config_td, sc, - &sc->sc_dci.sc_bus.bus_mtx, NULL, 0, 4); - if (err) { - device_printf(dev, "could not setup config thread!\n"); - goto error; - } #if (__FreeBSD_version >= 700031) err = bus_setup_intr(dev, sc->sc_dci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, NULL, (void *)at91dci_interrupt, sc, &sc->sc_dci.sc_intr_hdl); @@ -224,10 +219,10 @@ } #if (__FreeBSD_version >= 700031) err = bus_setup_intr(dev, sc->sc_vbus_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - NULL, (void *)at91_vbus_interrupt, sc, &sc->sc_vbus_intr_hdl); + NULL, (void *)at91_vbus_poll, sc, &sc->sc_vbus_intr_hdl); #else err = bus_setup_intr(dev, sc->sc_vbus_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - (void *)at91_vbus_interrupt, sc, &sc->sc_vbus_intr_hdl); + (void *)at91_vbus_poll, sc, &sc->sc_vbus_intr_hdl); #endif if (err) { sc->sc_vbus_intr_hdl = NULL; @@ -241,7 +236,7 @@ goto error; } else { /* poll VBUS one time */ - at91_vbus_interrupt(sc); + at91_vbus_poll(sc); } return (0); @@ -305,8 +300,6 @@ sc->sc_dci.sc_io_res); sc->sc_dci.sc_io_res = NULL; } - usb2_config_td_unsetup(&sc->sc_dci.sc_config_td); - usb2_bus_mem_free_all(&sc->sc_dci.sc_bus, NULL); /* disable clocks */ ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/ehci2.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ehci2.c,v 1.6 2009/01/04 00:12:01 alfred Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ehci2.c,v 1.8 2009/01/13 19:03:12 thompsa Exp $"); #include #include @@ -52,14 +52,11 @@ #include #define USB_DEBUG_VAR ehcidebug -#define usb2_config_td_cc ehci_config_copy -#define usb2_config_td_softc ehci_softc #include #include #include #include -#include #include #include #include @@ -99,7 +96,6 @@ extern struct usb2_pipe_methods ehci_root_ctrl_methods; extern struct usb2_pipe_methods ehci_root_intr_methods; -static usb2_config_td_command_t ehci_root_ctrl_task; static void ehci_do_poll(struct usb2_bus *bus); static void ehci_root_ctrl_poll(ehci_softc_t *sc); static void ehci_device_done(struct usb2_xfer *xfer, usb2_error_t error); @@ -975,7 +971,7 @@ return; } /* put transfer on interrupt queue */ - usb2_transfer_enqueue(&xfer->udev->bus->intr_q, xfer); + usb2_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer); /* start timeout, if any */ if (xfer->timeout != 0) { @@ -1139,7 +1135,7 @@ static usb2_error_t ehci_non_isoc_done_sub(struct usb2_xfer *xfer) { - ehci_softc_t *sc = xfer->usb2_sc; + ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); ehci_qtd_t *td; ehci_qtd_t *td_alt_next; uint32_t status; @@ -1243,7 +1239,7 @@ #if USB_DEBUG if (ehcidebug > 10) { - ehci_softc_t *sc = xfer->usb2_sc; + ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); ehci_dump_sqtds(sc, xfer->td_transfer_first); } @@ -1295,7 +1291,7 @@ ehci_check_transfer(struct usb2_xfer *xfer) { struct usb2_pipe_methods *methods = xfer->pipe->methods; - ehci_softc_t *sc = xfer->usb2_sc; + ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); uint32_t status; @@ -1525,7 +1521,7 @@ DPRINTF("xfer=%p\n", xfer); - USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED); + USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED); /* transfer is transferred */ ehci_device_done(xfer, USB_ERR_TIMEOUT); @@ -1735,11 +1731,11 @@ DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n", xfer->address, UE_GET_ADDR(xfer->endpoint), - xfer->sumlen, usb2_get_speed(xfer->udev)); + xfer->sumlen, usb2_get_speed(xfer->xroot->udev)); temp.average = xfer->max_usb2_frame_size; temp.max_frame_size = xfer->max_frame_size; - temp.sc = xfer->usb2_sc; + temp.sc = EHCI_BUS2SC(xfer->xroot->bus); /* toggle the DMA set we are using */ xfer->flags_int.curr_dma_set ^= 1; @@ -1767,7 +1763,7 @@ temp.auto_data_toggle = 1; } - if (usb2_get_speed(xfer->udev) != USB_SPEED_HIGH) { + if (usb2_get_speed(xfer->xroot->udev) != USB_SPEED_HIGH) { /* max 3 retries */ temp.qtd_status |= htoehci32(temp.sc, EHCI_QTD_SET_CERR(3)); @@ -1898,12 +1894,12 @@ EHCI_QH_SET_ENDPT(UE_GET_ADDR(xfer->endpoint)) | EHCI_QH_SET_MPL(xfer->max_packet_size)); - if (usb2_get_speed(xfer->udev) == USB_SPEED_HIGH) { + if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) { qh_endp |= (EHCI_QH_SET_EPS(EHCI_QH_SPEED_HIGH) | EHCI_QH_DTC | EHCI_QH_SET_NRL(8)); } else { - if (usb2_get_speed(xfer->udev) == USB_SPEED_FULL) { + if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_FULL) { qh_endp |= (EHCI_QH_SET_EPS(EHCI_QH_SPEED_FULL) | EHCI_QH_DTC); } else { @@ -1926,8 +1922,8 @@ (EHCI_QH_SET_MULT(xfer->max_packet_count & 3) | EHCI_QH_SET_CMASK(xfer->usb2_cmask) | EHCI_QH_SET_SMASK(xfer->usb2_smask) | - EHCI_QH_SET_HUBA(xfer->udev->hs_hub_addr) | - EHCI_QH_SET_PORT(xfer->udev->hs_port_no)); + EHCI_QH_SET_HUBA(xfer->xroot->udev->hs_hub_addr) | + EHCI_QH_SET_PORT(xfer->xroot->udev->hs_port_no)); qh->qh_endphub = htoehci32(temp.sc, qh_endphub); qh->qh_curqtd = htoehci32(temp.sc, 0); @@ -1955,7 +1951,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 14 02:03:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C97F1065670; Wed, 14 Jan 2009 02:03:01 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0AEE41065675 for ; Wed, 14 Jan 2009 02:03:01 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EB87A8FC14 for ; Wed, 14 Jan 2009 02:03:00 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0E230np050417 for ; Wed, 14 Jan 2009 02:03:00 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0E230Rc050401 for perforce@freebsd.org; Wed, 14 Jan 2009 02:03:00 GMT (envelope-from sson@FreeBSD.org) Date: Wed, 14 Jan 2009 02:03:00 GMT Message-Id: <200901140203.n0E230Rc050401@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 156129 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Jan 2009 02:03:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=156129 Change 156129 by sson@sson_amd64 on 2009/01/14 02:02:06 Append the hostname to the audit trail filename if the "host" field is set in audit_control(5). Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#42 edit .. //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#3 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#25 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#42 (text+ko) ==== @@ -26,7 +26,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. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#41 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#42 $ */ #include @@ -166,7 +166,7 @@ /* Rename the last file -- append timestamp. */ if ((ptr = strstr(lastfile, NOT_TERMINATED)) != NULL) { - strlcpy(ptr, TS, TIMESTAMP_LEN); + memcpy(ptr, TS, POSTFIX_LEN); if (rename(oldname, lastfile) != 0) auditd_log_err( "Could not rename %s to %s: %m", oldname, ==== //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#2 $ + * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#3 $ */ #include @@ -85,7 +85,10 @@ }; static TAILQ_HEAD(, dir_ent) dir_q; -static int minval = -1; +static int auditd_minval = -1; + +static char auditd_host[MAXHOSTNAMELEN]; +static int auditd_hostlen = -1; static char *auditd_errmsg[] = { "no error", /* ADE_NOERR ( 0) */ @@ -165,7 +168,13 @@ return (NULL); } - asprintf(&fn, "%s/%s", dirent->dirname, name); + /* + * If the host is set then also add the hostname to the filename. + */ + if (auditd_hostlen != -1) + asprintf(&fn, "%s/%s.%s", dirent->dirname, name, auditd_host); + else + asprintf(&fn, "%s/%s", dirent->dirname, name); return (fn); } @@ -204,16 +213,14 @@ int auditd_set_host(void) { - char hoststr[MAXHOSTNAMELEN]; struct sockaddr_in6 *sin6; struct sockaddr_in *sin; struct addrinfo *res; struct auditinfo_addr aia; int error, ret = ADE_NOERR; - if (getachost(hoststr, MAXHOSTNAMELEN) != 0) { - - ret = ADE_PARSE; + if (getachost(auditd_host, sizeof(auditd_host)) != 0) { + ret = ADE_PARSE; /* * To maintain reverse compatability with older audit_control @@ -229,7 +236,8 @@ ret = ADE_AUDITON; return (ret); } - error = getaddrinfo(hoststr, NULL, NULL, &res); + auditd_hostlen = strlen(auditd_host); + error = getaddrinfo(auditd_host, NULL, NULL, &res); if (error) return (ADE_GETADDR); switch (res->ai_family) { @@ -271,14 +279,14 @@ { au_qctrl_t qctrl; - if (getacmin(&minval) != 0) + if (getacmin(&auditd_minval) != 0) return (ADE_PARSE); if (auditon(A_GETQCTRL, &qctrl, sizeof(qctrl)) != 0) return (ADE_AUDITON); - if (qctrl.aq_minfree != minval) { - qctrl.aq_minfree = minval; + if (qctrl.aq_minfree != auditd_minval) { + qctrl.aq_minfree = auditd_minval; if (auditon(A_SETQCTRL, &qctrl, sizeof(qctrl)) != 0) return (ADE_AUDITON); } @@ -288,8 +296,8 @@ /* * Parses the "dir" entry in audit_control(5) into an ordered list. Also, will - * set the minfree value if not already set. Arguments include function - * pointers to audit_warn functions for soft and hard limits. Returns: + * set the minfree and host values if not already set. Arguments include + * function pointers to audit_warn functions for soft and hard limits. Returns: * ADE_NOERR on success, * ADE_PARSE error parsing audit_control(5), * ADE_AUDITON error getting/setting auditon(2) value, @@ -309,9 +317,12 @@ int scnt = 0; int hcnt = 0; - if (minval == -1 && (err = auditd_set_minfree()) != 0) + if (auditd_minval == -1 && (err = auditd_set_minfree()) != 0) return (err); + if (auditd_hostlen == -1) + auditd_set_host(); + /* * Init directory q. Force a re-read of the file the next time. */ @@ -329,7 +340,8 @@ while (getacdir(cur_dir, MAXNAMLEN) >= 0) { if (statfs(cur_dir, &sfs) < 0) continue; /* XXX should warn */ - soft = (sfs.f_bfree < (sfs.f_blocks / (100 / minval))) ? 1 : 0; + soft = (sfs.f_bfree < (sfs.f_blocks / (100 / auditd_minval))) ? + 1 : 0; hard = (sfs.f_bfree < AUDIT_HARD_LIMIT_FREE_BLOCKS) ? 1 : 0; if (soft) { if (warn_soft) @@ -367,7 +379,8 @@ auditd_close_dirs(void) { free_dir_q(); - minval = -1; + auditd_minval = -1; + auditd_hostlen = -1; } @@ -713,7 +726,7 @@ strlcpy(newname, recoveredname, MAXPATHLEN); if ((ptr = strstr(newname, NOT_TERMINATED)) != NULL) { - strlcpy(ptr, CRASH_RECOVERY, TIMESTAMP_LEN); + memcpy(ptr, CRASH_RECOVERY, POSTFIX_LEN); if (rename(recoveredname, newname) != 0) return (ADE_RENAME); } else @@ -750,9 +763,10 @@ audit_quick_start(void) { int err; - char *newfile; + char *newfile = NULL; time_t tt; char TS[TIMESTAMP_LEN]; + int ret = 0; /* * Mask auditing of this process. @@ -773,20 +787,26 @@ if (getTSstr(tt, TS, TIMESTAMP_LEN) != 0) return (-1); err = auditd_swap_trail(TS, &newfile, getgid(), NULL); - if (err != ADE_NOERR && err != ADE_ACTL) - return (-1); + if (err != ADE_NOERR && err != ADE_ACTL) { + ret = -1; + goto out; + } /* * Add the current symlink and recover from crash, if needed. */ - if (auditd_new_curlink(newfile) != 0) - return(-1); + if (auditd_new_curlink(newfile) != 0) { + ret = -1; + goto out; + } /* * At this point auditing has started so generate audit start-up record. */ - if (auditd_gen_record(AUE_audit_startup, NULL) != 0) - return (-1); + if (auditd_gen_record(AUE_audit_startup, NULL) != 0) { + ret = -1; + goto out; + } /* * Configure the audit controls. @@ -798,7 +818,11 @@ (void) auditd_set_minfree(); (void) auditd_set_host(); - return (0); +out: + if (newfile != NULL) + free(newfile); + + return (ret); } /* @@ -855,7 +879,7 @@ strlcpy(newname, oldname, len); if ((ptr = strstr(newname, NOT_TERMINATED)) != NULL) { - strlcpy(ptr, TS, TIMESTAMP_LEN); + memcpy(ptr, TS, POSTFIX_LEN); if (rename(oldname, newname) != 0) return (-1); } else ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#25 (text+ko) ==== @@ -27,7 +27,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_control.c#24 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#25 $ */ #include @@ -619,7 +619,7 @@ #endif return (-3); } - strcpy(auditstr, str); + strlcpy(auditstr, str, len); #ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); #endif From owner-p4-projects@FreeBSD.ORG Wed Jan 14 05:31:52 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEC6B1065673; Wed, 14 Jan 2009 05:31:52 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C00C106566B for ; Wed, 14 Jan 2009 05:31:52 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5B3778FC0A for ; Wed, 14 Jan 2009 05:31:52 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0E5Vq3p084827 for ; Wed, 14 Jan 2009 05:31:52 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0E5VqUA084825 for perforce@freebsd.org; Wed, 14 Jan 2009 05:31:52 GMT (envelope-from sson@FreeBSD.org) Date: Wed, 14 Jan 2009 05:31:52 GMT Message-Id: <200901140531.n0E5VqUA084825@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 156137 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Jan 2009 05:31:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=156137 Change 156137 by sson@sson_amd64 on 2009/01/14 05:31:06 Change au_poltosr() and au_strtopol() to use a table for parsing and building policy strings. Submitted by: mm w (openspecies at gmail com) Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#26 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#26 (text+ko) ==== @@ -27,7 +27,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_control.c#25 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#26 $ */ #include @@ -65,6 +65,32 @@ #endif /* + * Audit policy string token table for au_poltostr() and au_strtopol(). + */ +struct audit_polstr { + long ap_policy; + const char *ap_str; +}; + +static struct audit_polstr au_polstr[] = { + { AUDIT_CNT, "cnt" }, + { AUDIT_AHLT, "ahlt" }, + { AUDIT_ARGV, "argv" }, + { AUDIT_ARGE, "arge" }, + { AUDIT_SEQ, "seq" }, + { AUDIT_WINDATA, "windata" }, + { AUDIT_USER, "user" }, + { AUDIT_GROUP, "group" }, + { AUDIT_TRAIL, "trail" }, + { AUDIT_PATH, "path" }, + { AUDIT_SCNT, "scnt" }, + { AUDIT_PUBLIC, "public" }, + { AUDIT_ZONENAME, "zonename" }, + { AUDIT_PERZONE, "perzone" }, + { -1, NULL } +}; + +/* * Returns the string value corresponding to the given label from the * configuration file. * @@ -119,135 +145,24 @@ ssize_t au_poltostr(long policy, size_t maxsize, char *buf) { - int first; + int first = 1; + int i = 0; if (maxsize < 1) return (-1); - first = 1; buf[0] = '\0'; - if (policy & AUDIT_CNT) { - if (strlcat(buf, "cnt", maxsize) >= maxsize) - return (-1); - first = 0; - } - if (policy & AUDIT_AHLT) { - if (!first) { - if (strlcat(buf, ",", maxsize) >= maxsize) + do { + if (policy & au_polstr[i].ap_policy) { + if (!first && strlcat(buf, ",", maxsize) >= maxsize) return (-1); - } - if (strlcat(buf, "ahlt", maxsize) >= maxsize) - return (-1); - first = 0; - } - if (policy & AUDIT_ARGV) { - if (!first) { - if (strlcat(buf, ",", maxsize) >= maxsize) + if (strlcat(buf, au_polstr[i].ap_str, maxsize) >= + maxsize) return (-1); + first = 0; } - if (strlcat(buf, "argv", maxsize) >= maxsize) - return (-1); - first = 0; - } - if (policy & AUDIT_ARGE) { - if (!first) { - if (strlcat(buf, ",", maxsize) >= maxsize) - return (-1); - } - if (strlcat(buf, "arge", maxsize) >= maxsize) - return (-1); - first = 0; - } - if (policy & AUDIT_SEQ) { - if (!first) { - if (strlcat(buf, ",", maxsize) >= maxsize) - return (-1); - } - if (strlcat(buf, "seq", maxsize) >= maxsize) - return (-1); - first = 0; - } - if (policy & AUDIT_WINDATA) { - if (!first) { - if (strlcat(buf, ",", maxsize) >= maxsize) - return (-1); - } - if (strlcat(buf, "windata", maxsize) >= maxsize) - return (-1); - first = 0; - } - if (policy & AUDIT_USER) { - if (!first) { - if (strlcat(buf, ",", maxsize) >= maxsize) - return (-1); - } - if (strlcat(buf, "user", maxsize) >= maxsize) - return (-1); - first = 0; - } - if (policy & AUDIT_GROUP) { - if (!first) { - if (strlcat(buf, ",", maxsize) >= maxsize) - return (-1); - } - if (strlcat(buf, "group", maxsize) >= maxsize) - return (-1); - first = 0; - } - if (policy & AUDIT_TRAIL) { - if (!first) { - if (strlcat(buf, ",", maxsize) >= maxsize) - return (-1); - } - if (strlcat(buf, "trail", maxsize) >= maxsize) - return (-1); - first = 0; - } - if (policy & AUDIT_PATH) { - if (!first) { - if (strlcat(buf, ",", maxsize) >= maxsize) - return (-1); - } - if (strlcat(buf, "path", maxsize) >= maxsize) - return (-1); - first = 0; - } - if (policy & AUDIT_SCNT) { - if (!first) { - if (strlcat(buf, ",", maxsize) >= maxsize) - return (-1); - } - if (strlcat(buf, "scnt", maxsize) >= maxsize) - return (-1); - first = 0; - } - if (policy & AUDIT_PUBLIC) { - if (!first) { - if (strlcat(buf, ",", maxsize) >= maxsize) - return (-1); - } - if (strlcat(buf, "public", maxsize) >= maxsize) - return (-1); - first = 0; - } - if (policy & AUDIT_ZONENAME) { - if (!first) { - if (strlcat(buf, ",", maxsize) >= maxsize) - return (-1); - } - if (strlcat(buf, "zonename", maxsize) >= maxsize) - return (-1); - first = 0; - } - if (policy & AUDIT_PERZONE) { - if (!first) { - if (strlcat(buf, ",", maxsize) >= maxsize) - return (-1); - } - if (strlcat(buf, "perzone", maxsize) >= maxsize) - return (-1); - first = 0; - } + } while (NULL != au_polstr[++i].ap_str); + return (strlen(buf)); } @@ -260,6 +175,7 @@ { char *bufp, *string; char *buffer; + int i, matched; *policy = 0; buffer = strdup(polstr); @@ -268,35 +184,17 @@ bufp = buffer; while ((string = strsep(&bufp, ",")) != NULL) { - if (strcmp(string, "cnt") == 0) - *policy |= AUDIT_CNT; - else if (strcmp(string, "ahlt") == 0) - *policy |= AUDIT_AHLT; - else if (strcmp(string, "argv") == 0) - *policy |= AUDIT_ARGV; - else if (strcmp(string, "arge") == 0) - *policy |= AUDIT_ARGE; - else if (strcmp(string, "seq") == 0) - *policy |= AUDIT_SEQ; - else if (strcmp(string, "winau_fstat") == 0) - *policy |= AUDIT_WINDATA; - else if (strcmp(string, "user") == 0) - *policy |= AUDIT_USER; - else if (strcmp(string, "group") == 0) - *policy |= AUDIT_GROUP; - else if (strcmp(string, "trail") == 0) - *policy |= AUDIT_TRAIL; - else if (strcmp(string, "path") == 0) - *policy |= AUDIT_PATH; - else if (strcmp(string, "scnt") == 0) - *policy |= AUDIT_SCNT; - else if (strcmp(string, "public") == 0) - *policy |= AUDIT_PUBLIC; - else if (strcmp(string, "zonename") == 0) - *policy |= AUDIT_ZONENAME; - else if (strcmp(string, "perzone") == 0) - *policy |= AUDIT_PERZONE; - else { + matched = i = 0; + + do { + if (strcmp(string, au_polstr[i].ap_str) == 0) { + *policy |= au_polstr[i].ap_policy; + matched = 1; + break; + } + } while (NULL != au_polstr[++i].ap_str); + + if (!matched) { free(buffer); errno = EINVAL; return (-1); From owner-p4-projects@FreeBSD.ORG Wed Jan 14 07:06:28 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8284C1065673; Wed, 14 Jan 2009 07:06:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 426FE106564A for ; Wed, 14 Jan 2009 07:06:28 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 32EF18FC08 for ; Wed, 14 Jan 2009 07:06:28 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0E76SKF095715 for ; Wed, 14 Jan 2009 07:06:28 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0E76SwT095713 for perforce@freebsd.org; Wed, 14 Jan 2009 07:06:28 GMT (envelope-from weongyo@FreeBSD.org) Date: Wed, 14 Jan 2009 07:06:28 GMT Message-Id: <200901140706.n0E76SwT095713@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 156139 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Jan 2009 07:06:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=156139 Change 156139 by weongyo@weongyo_ws on 2009/01/14 07:05:52 fix a ehci's bug that it's occurred when the xfers are aborted under heavy loads or working. It looks this bug exists since r158869 so needs to revert a part of the previous. This helps some panics related with aborting the xfers of ehci(4). Reviewed by: imp Tested by: sam Affected files ... .. //depot/projects/vap/sys/dev/usb/ehci.c#18 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/ehci.c#18 (text+ko) ==== @@ -2753,7 +2753,7 @@ /* We will change them to point here */ snext = exfer->sqtdend->nextqtd; - next = htohc32(sc, snext->physaddr); + next = (snext != NULL) ? htohc32(sc, snext->physaddr) : EHCI_NULL(sc); /* * Now loop through any qTDs before us and keep track of the pointer From owner-p4-projects@FreeBSD.ORG Wed Jan 14 10:03:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D82461065675; Wed, 14 Jan 2009 10:03:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 91A3A1065670 for ; Wed, 14 Jan 2009 10:03:28 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7FAFB8FC0C for ; Wed, 14 Jan 2009 10:03:28 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0EA3SSw024600 for ; Wed, 14 Jan 2009 10:03:28 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0EA3S7B024598 for perforce@freebsd.org; Wed, 14 Jan 2009 10:03:28 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 14 Jan 2009 10:03:28 GMT Message-Id: <200901141003.n0EA3S7B024598@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 156145 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Jan 2009 10:03:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=156145 Change 156145 by rene@rene_self on 2009/01/14 10:02:59 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#14 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#17 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#15 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mail/chapter.sgml#11 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#16 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#13 integrate .. //depot/projects/docproj_nl/share/pgpkeys/cperciva.key#2 integrate .. //depot/projects/docproj_nl/share/pgpkeys/garga.key#2 integrate .. //depot/projects/docproj_nl/www/en/gnome/docs/Makefile#2 integrate .. //depot/projects/docproj_nl/www/en/gnome/docs/develfaq.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/gnome/docs/faq224.sgml#1 branch .. //depot/projects/docproj_nl/www/en/gnome/docs/gnome2_porting.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/gnome/docs/halfaq.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/gnome/index.xsl#3 integrate .. //depot/projects/docproj_nl/www/en/gnome/news.xml#2 integrate .. //depot/projects/docproj_nl/www/en/internal/machines.sgml#2 integrate .. //depot/projects/docproj_nl/www/share/sgml/advisories.xml#7 integrate .. //depot/projects/docproj_nl/www/share/sgml/libcommon.xsl#3 integrate .. //depot/projects/docproj_nl/www/share/sgml/navibar.ent#4 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#25 integrate .. //depot/projects/docproj_nl/www/share/sgml/press.xml#7 integrate .. //depot/projects/docproj_nl/www/share/sgml/release.ent#10 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#14 (text+ko) ==== @@ -13,7 +13,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.279 2008/11/22 13:02:43 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.281 2009/01/07 20:32:16 rene Exp $ 1999 ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -343,7 +343,10 @@ Immediately proceeds to boot the kernel, with the given options, if any, and with the kernel name given, - if it is. + if it is. Providing a kernel name on the command-line + is only applicable after an unload + command has been issued, otherwise the previously-loaded + kernel will be used. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#17 (text+ko) ==== @@ -1,7 +1,7 @@ 2006 2007 2008 + 2009 The FreeBSD Documentation Project @@ -6599,6 +6600,113 @@ + + Using <application>Tcl/Tk</application> + + The Ports Collection supports parallel installation of + multiple Tcl/Tk versions. Ports + should try to support at least the default + Tcl/Tk version and higher with the + USE_TCL and USE_TK + variables. It is possible to specify the desired version of + tcl with the WITH_TCL_VER + variable. + + + The most useful variables for ports that use + <application>Tcl/Tk</application> + + + + + USE_TCL + + The port depends on the + Tcl library (not the shell). + Minimal required version can be specified with values + such as 84+. Individual unsupported versions can be + specified with the INVALID_TCL_VER + variable. + + + + USE_TCL_BUILD + + The port needs Tcl only + during the build time. + + + + USE_TCL_WRAPPER + + Ports that requrire the + Tcl shell and do not require + a specific tclsh version should use + this new variable. The tclsh wrapper + is installed on the system. The user can specify the + desired tcl shell to use. + + + + WITH_TCL_VER + + User-defined variable that sets the desired + Tcl version. + + + + UNIQUENAME_WITH_TCL_VER + + Like WITH_TCL_VER, but + per-port. + + + + USE_TCL_THREADS + + Require a threaded build of + Tcl/Tk. + + + + USE_TK + + The port depends on the + Tk library (not the wish + shell). Implies USE_TCL with the + same value. For more information see the description of + USE_TCL variable. + + + + USE_TK_BUILD + + Analog to the USE_TCL_BUILD + variable. + + + + USE_TK_WRAPPER + + Analog to the USE_TCL_WRAPPER + variable. + + + + WITH_TK_VER + + Analog to the WITH_TCL_VER + variable and implies WITH_TCL_VER of + the same value. + + + +
+ + A complete list of available variables can be found in + /usr/ports/Mk/bsd.tcl.mk. + + Using Emacs @@ -11918,6 +12026,12 @@ + 7.1-STABLE after strndup + merge. + 701101 + + + 8.0-CURRENT. Separating wide and single byte ctype. 800000 ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#15 (text+ko) ==== @@ -1,7 +1,7 @@ + -uid Colin Percival -sub 2048g/AA35B966 2003-02-18 +pub 1024D/0C6A6A6E 2009-01-12 + Key fingerprint = EAF4 8BBA 7CC7 7A30 FEFC 0DA9 38CE CA69 0C6A 6A6E +uid Colin Percival +uid Colin Percival +uid Colin Percival +sub 2048g/DC606691 2009-01-12 ]]> ==== //depot/projects/docproj_nl/share/pgpkeys/garga.key#2 (text+ko) ==== @@ -1,18 +1,17 @@ - + -uid Renato Botelho -uid Renato Botelho -uid Renato Botelho +uid Renato Botelho +uid Renato Botelho sub 1024g/7B295760 2003-12-16 ]]> ==== //depot/projects/docproj_nl/www/en/gnome/docs/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/gnome/docs/Makefile,v 1.26 2008/03/30 18:35:28 marcus Exp $ +# $FreeBSD: www/en/gnome/docs/Makefile,v 1.27 2009/01/11 22:11:15 marcus Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -16,6 +16,7 @@ DOCS+= faq218.sgml DOCS+= faq220.sgml DOCS+= faq222.sgml +DOCS+= faq224.sgml DOCS+= gnome_porting.sgml DOCS+= gnome1_porting.sgml DOCS+= gnome2_porting.sgml ==== //depot/projects/docproj_nl/www/en/gnome/docs/develfaq.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -158,11 +158,9 @@

  • What is the current state of development GNOME on FreeBSD?

    -

    GNOME 2.23.4 is the latest development release, and it is - relatively stable. The only obvious known issue is that - some icons are missing. This is part of an initiative to - clean up the deprecated icons. As the &gnomedevelver; - releases continue, this will gradually be fixed.

    +

    Because of the long ports tree freeze, we have not yet + started work on GNOME &gnomedevelver;. Stay tuned for more + updates.

    • &footer; ==== //depot/projects/docproj_nl/www/en/gnome/docs/gnome2_porting.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -30,7 +30,7 @@ atspi accessibility/at-spi - gail libbonobo + gtk20 libbonobo @@ -42,19 +42,13 @@ eel2 x11-toolkits/eel - gnomedesktop gail + gnomedesktop evolutiondataserver databases/evolution-data-server - libgnome - - - - gail - accessibility/gail - gtk20 + libgnomeui @@ -141,7 +135,7 @@ gtkhtml3 www/gtkhtml3 - gail libgnomeui + libgnomeui @@ -211,6 +205,12 @@ + libgda4 + databases/libgda4 + glib20 libxslt + + + libglade2 devel/libglade2 libxml2 gtk20 @@ -225,7 +225,7 @@ libgnomecanvas graphics/libgnomecanvas - libglade2 libartlgpl2 gail + libglade2 libartlgpl2 @@ -273,7 +273,7 @@ libgtkhtml www/libgtkhtml - libxslt gnomevfs2 gail + libxslt gnomevfs2 ==== //depot/projects/docproj_nl/www/en/gnome/docs/halfaq.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -17,6 +17,7 @@
  • How do I mount media using hal?
  • How do I troubleshoot problems with hal?
    • +
  • Does hal support Fuse file systems?

    • Full Text

    @@ -319,6 +320,17 @@ label has a space in the name that will break hal. Labels must NOT contain spaces.

    + + +
  • +

    Does hal support Fuse file systems?

    + +

    Yes. As of hal-0.5.11_10, Fuse file systems are supported. + See the installed + /usr/local/share/doc/hal-0.5.11/README.fuse file + for more details.

    +
    • + &footer; ==== //depot/projects/docproj_nl/www/en/gnome/index.xsl#3 (text+ko) ==== @@ -4,7 +4,7 @@ ]> - + devel/gnome2-hacker-tools (development tools) -

    Upgrading to GNOME 2.22?

    +

    Upgrading to GNOME 2.24?

    -

    If you are upgrading from GNOME 2.20 to GNOME 2.22, read the - Upgrade FAQ for upgrade +

    If you are upgrading from GNOME 2.22 to GNOME 2.24, read the + Upgrade FAQ for upgrade instructions.

    State of the port

    GNOME for FreeBSD is currently supported on - 6.3, 6-STABLE, 7.0, 7-STABLE, and 8-CURRENT. + 6.4, 6-STABLE, 7.0, 7.1, 7-STABLE, and 8-CURRENT. Most of GNOME has been ported to FreeBSD, but there is still plenty left to be done!

    ==== //depot/projects/docproj_nl/www/en/gnome/news.xml#2 (text+ko) ==== @@ -19,10 +19,45 @@ - $FreeBSD: www/en/gnome/news.xml,v 1.145 2008/03/24 04:40:18 marcus Exp $ + $FreeBSD: www/en/gnome/news.xml,v 1.146 2009/01/11 22:10:55 marcus Exp $ + 2009 + + + January + + + 9 + + + Announcing GNOME 2.24.2 for FreeBSD! + +

    The FreeBSD GNOME team is proud to announce the release of + GNOME 2.24.2 for FreeBSD. The official release notes can be + found at + + http://library.gnome.org/misc/release-notes/2.24/ + + . On the FreeBSD front, this release introduces Fuse support + in HAL, adds multi-CPU support to libgtop, WebKit updates, + and fixes some long-standing seahorse and gnome-keyring + bugs.

    + +

    This release features commits by adamw, ahze, kwm, mezz, + and myself. It would not have been possible without are + contributors and testers: Alexander Loginov, Craig Butler, + Dmitry Marakasov, Eric L. Chen, Joseph S. Atkinson, Kris Moore, + Lapo Luchini, Nikos Ntarmos, Pawel Worach, Romain Tartiere, TAOKA + Fumiyoshi, Romain Tartiere, Yasuda Keisuke, Zyl + aZ, bf, Florent Thoumie, Peter Wemm, and pluknet.

    +     +     +     +     + + 2008 @@ -34,7 +69,7 @@ Announcing GNOME 2.22.0 for FreeBSD! -

    The FreeBSD GNOME team is proud to annunce the release of +

    The FreeBSD GNOME team is proud to announce the release of GNOME 2.22.0 for FreeBSD. The official GNOME 2.22 release notes can be found at ==== //depot/projects/docproj_nl/www/en/internal/machines.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -75,14 +75,14 @@ mx1 -6-STABLE +7-STABLE Inbound Mail services. admins mx2 -6-STABLE +7-STABLE Outbound Mail services. admins @@ -212,27 +212,30 @@ hub AMD64 MP -4x2.2Ghz (dual CPU, dual core), 3GB Memory, Adaptec RAID Controller, +4x2.2GHz (dual CPU, dual core), 3GB Memory, Adaptec RAID Controller, 4x36GB U160 SCSI Disk, Broadcom Gigabit Ethernet. -mx1, mx2 +mx1 Intel x86 MP -2x3.06Ghz Xeon, 1GB Memory, 80GB IDE Disk, Broadcom Gigabit Ethernet. +8x1.86GHz Xeon (dual CPU, quad core), 8GB Memory, Dell PERC 5/i + RAID controller, 2x136GB SAS disks in RAID1, Broadcom NetXtreme + Gigabit Ethernet adapter. -ns0 -  -  +mx2 +Intel x86 MP +2x2.8GHz Xeon, 1GB Memory, Compaq Smart Array 5i RAID controller, + 2x34GB SCSI Disks in RAID1, Broadcom Gigabit Ethernet. -ns1, ns2 +ns0, ns1, ns2 Intel x86 -800MHz Pentium III, 1GB Memory, 40GB ATA drive, - Intel EtherExpress Pro 10/100B NIC. +2.8GHz Xeon, 1GB Memory, Compaq Smart Array 5i RAID controller, + 2x34GB SCSI Disks in RAID1, Broadcom Gigabit Ethernet. @@ -246,7 +249,7 @@ pointyhat Intel EM64T MP -2x2.8Ghz Intel Xeon (dualcore), 4GB Memory, Dell PERC 4 RAID controller, +2x2.8GHz Intel Xeon (dualcore), 4GB Memory, Dell PERC 4 RAID controller, 1.1TB storage, Intel PRO/1000 Gigabitq NIC. ==== //depot/projects/docproj_nl/www/share/sgml/advisories.xml#7 (text+ko) ==== @@ -2,11 +2,43 @@ - $FreeBSD: www/share/sgml/advisories.xml,v 1.224 2008/12/23 01:41:30 cperciva Exp $ + $FreeBSD: www/share/sgml/advisories.xml,v 1.226 2009/01/13 22:36:03 simon Exp $ + 2009 + + + 1 + + + 13 + + + FreeBSD-SA-09:04.bind + + + + FreeBSD-SA-09:03.ntpd + + + + + 7 + + + FreeBSD-SA-09:02.openssl + + + + FreeBSD-SA-09:01.lukemftpd + + + + + + 2008 ==== //depot/projects/docproj_nl/www/share/sgml/libcommon.xsl#3 (text+ko) ==== @@ -1,7 +1,7 @@ - +

    Old announcements: + 2007, 2006, 2005, 2004, @@ -409,6 +410,7 @@

    Old press publications: + 2007, 2006, 2005, 2004, ==== //depot/projects/docproj_nl/www/share/sgml/navibar.ent#4 (text+ko) ==== @@ -1,4 +1,4 @@ - + FreeBSD/GNOME

    '> ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#25 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.218 2009/01/05 04:08:29 hrs Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.219 2009/01/12 17:02:43 marcus Exp $ @@ -36,6 +36,19 @@ 1 + 9 + + + GNOME 2.24.2 Available for FreeBSD + +

    The FreeBSD GNOME team is proud to announce the release of + GNOME 2.24.2 for FreeBSD. More details can be found on + the FreeBSD GNOME Project + page.

    +     +     + + 5 ==== //depot/projects/docproj_nl/www/share/sgml/press.xml#7 (text+ko) ==== @@ -9,11 +9,39 @@ - $FreeBSD: www/share/sgml/press.xml,v 1.71 2008/12/08 09:10:44 murray Exp $ + $FreeBSD: www/share/sgml/press.xml,v 1.73 2009/01/14 04:25:43 jkoshy Exp $ + 2009 + + + 1 + + Coyote Point Builds on FreeBSD to Accelerate + http://www.internetnews.com/infra/article.php/3795791 + Internet News + http://www.internetnews.com/ + 13 January 2009 + Sean Michael Kerner +

    FreeBSD is at the core of Coyote Point's appliance.

    +     + + + FreeBSD 7.1 Gets a Little Help from Sun + http://www.internetnews.com/dev-news/article.php/3794561 + Internet News >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 14 12:16:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C35681065716; Wed, 14 Jan 2009 12:16:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 708A3106570A for ; Wed, 14 Jan 2009 12:16:45 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5EB778FC1F for ; Wed, 14 Jan 2009 12:16:45 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0ECGjIH048485 for ; Wed, 14 Jan 2009 12:16:45 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0ECGjlH048483 for perforce@freebsd.org; Wed, 14 Jan 2009 12:16:45 GMT (envelope-from brueffer@freebsd.org) Date: Wed, 14 Jan 2009 12:16:45 GMT Message-Id: <200901141216.n0ECGjlH048483@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 156152 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Jan 2009 12:16:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=156152 Change 156152 by brueffer@brueffer_haakonia on 2009/01/14 12:15:50 Add missing word. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/au_domain.3#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/au_domain.3#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_domain.3#1 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_domain.3#2 $ .\" .Dd December 28, 2008 .Dt AU_BSM_TO_DOMAIN 3 @@ -59,6 +59,7 @@ which may occur if the socket token was generated on another operating system. .Pp +The .Fn au_domain_to_bsm function accepts a local domain, and returns the BSM domain for it. This call cannot fail, and instead returns a BSM domain indicating to a later From owner-p4-projects@FreeBSD.ORG Wed Jan 14 12:37:06 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C13110656D6; Wed, 14 Jan 2009 12:37:06 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C03010656BA for ; Wed, 14 Jan 2009 12:37:06 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EE7948FC12 for ; Wed, 14 Jan 2009 12:37:05 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0ECb59M051074 for ; Wed, 14 Jan 2009 12:37:05 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0ECb5xT051072 for perforce@freebsd.org; Wed, 14 Jan 2009 12:37:05 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 14 Jan 2009 12:37:05 GMT Message-Id: <200901141237.n0ECb5xT051072@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 156154 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Jan 2009 12:37:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=156154 Change 156154 by rene@rene_self on 2009/01/14 12:36:53 MFen handbook/boot 1.68 -> 1.69 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/boot/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/boot/chapter.sgml#5 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/boot/chapter.sgml,v 1.34 2006/08/25 16:42:35 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/boot/chapter.sgml - %SRCID% 1.68 + %SRCID% 1.69 --> @@ -403,7 +403,11 @@ Start direct de kernel op met de opgegeven opties - en naam, indien meegegeven. + en naam, indien meegegeven. Het opgeven van een + kernelnaam op de opdrachtregel is alleen van toepassing + nadat een unload-commando is + gegeven, anders wordt de kernel die hiervoor was geladen + gebruikt. From owner-p4-projects@FreeBSD.ORG Wed Jan 14 13:17:49 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EFA11065678; Wed, 14 Jan 2009 13:17:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1840F106564A for ; Wed, 14 Jan 2009 13:17:49 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 06D348FC22 for ; Wed, 14 Jan 2009 13:17:49 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0EDHlDI064714 for ; Wed, 14 Jan 2009 13:17:47 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0EDHlsQ064712 for perforce@freebsd.org; Wed, 14 Jan 2009 13:17:47 GMT (envelope-from brueffer@freebsd.org) Date: Wed, 14 Jan 2009 13:17:47 GMT Message-Id: <200901141317.n0EDHlsQ064712@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 156156 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Jan 2009 13:17:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=156156 Change 156156 by brueffer@brueffer_haakonia on 2009/01/14 13:17:19 Add missing words. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/au_errno.3#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/au_errno.3#4 (text+ko) ==== @@ -26,7 +26,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_errno.3#3 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_errno.3#4 $ .\" .Dd December 8, 2008 .Dt AU_BSM_TO_ERRNO 3 @@ -64,6 +64,7 @@ number, which may occur if the return token was generated on another operating system. .Pp +The .Fn au_errno_to_bsm function accepts a local .Xr errno 2 @@ -73,7 +74,7 @@ .Pp The .Fn au_strerror -converts a BSM error value to a string, generally by converting first to a +function converts a BSM error value to a string, generally by converting first to a local error number and using the local .Xr strerror 3 function, but will also work for errors that are not locally defined. From owner-p4-projects@FreeBSD.ORG Wed Jan 14 13:37:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F6ED1065679; Wed, 14 Jan 2009 13:37:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A4BA81065672 for ; Wed, 14 Jan 2009 13:37:07 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8FB498FC41 for ; Wed, 14 Jan 2009 13:37:07 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0EDb7F0066289 for ; Wed, 14 Jan 2009 13:37:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0EDb7dJ066287 for perforce@freebsd.org; Wed, 14 Jan 2009 13:37:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 14 Jan 2009 13:37:07 GMT Message-Id: <200901141337.n0EDb7dJ066287@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156157 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Jan 2009 13:37:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=156157 Change 156157 by rwatson@rwatson_freebsd_capabilities on 2009/01/14 13:36:51 Integrate TrustedBSD capabilities branch to pickup new OpenBSM. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/INSTALL#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/NEWS#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/VERSION#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditd/auditd.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditd/auditd.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditd/auditd_darwin.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditd/auditd_fbsd.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditreduce/auditreduce.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bsm/auditd_lib.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bsm/libbsm.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/configure#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/configure.ac#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libauditd/Makefile.am#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libauditd/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libauditd/auditd_lib.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libauditd/libauditd.3#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/Makefile.am#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/Makefile.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/au_domain.3#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/au_socket_type.3#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/au_token.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_audit.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_domain.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_errno.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_io.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_socket_type.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_token.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/libbsm.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/man/audit_user.5#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/sys/bsm/Makefile.am#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/sys/bsm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/sys/bsm/audit.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/sys/bsm/audit_domain.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/sys/bsm/audit_errno.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/sys/bsm/audit_record.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/sys/bsm/audit_socket_type.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/bsm/generate.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/E2BIG_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EACCES_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EBADF_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EBUSY_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ECHILD_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EDEADLK_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EEXIST_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EFAULT_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EFBIG_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EINTR_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EINVAL_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EIO_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EISDIR_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EMFILE_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EMLINK_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ENFILE_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ENODEV_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ENOENT_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ENOEXEC_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ENOMEM_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ENOSPC_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ENOTBLK_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ENOTDIR_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ENOTTY_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ENXIO_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EPERM_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EPIPE_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EROFS_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ESPIPE_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ESRCH_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ETXTBSY_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/EXDEV_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/arg32_record#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/data_record#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/data_token#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/file_record#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/in_addr_record#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ip_record#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/ipc_record#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/iport_record#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/opaque_record#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/path_record#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/process32_record#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/process32ex_record-IPv4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/process32ex_record-IPv6#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/process64_record#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/process64ex_record-IPv4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/process64ex_record-IPv6#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/return32_record#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/seq_record#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/socketex_record#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/socketex_token#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/subject32_record#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/subject32ex_record#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/text_record#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/test/reference/zonename_record#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/periodic/weekly/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libbsm/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/fdisk/fdisk.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/ath.4#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/common/load.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/bsm/audit.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/bsm/audit_domain.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/bsm/audit_errno.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/bsm/audit_internal.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/bsm/audit_kevents.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/bsm/audit_record.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/bsm/audit_socket_type.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/conf/files#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/bce/if_bce.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/msk/if_msk.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/msk/if_mskreg.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/security/audit/audit_bsm_domain.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/security/audit/audit_bsm_errno.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/security/audit/audit_bsm_socket_type.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/security/audit/audit_bsm_token.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/boot0cfg/boot0cfg.8#3 integrate Differences ... ==== //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/INSTALL#2 (text) ==== @@ -9,6 +9,12 @@ ./configure make +If doing development work on OpenBSM with gcc, the following invocation of +configure may be preferred in order to generate full compiler warnings and +force the compile to fail if a warning is found: + + CFLAGS="-Wall -Werror" ./configure + To install, use: make install ==== //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/NEWS#2 (text) ==== @@ -1,5 +1,24 @@ OpenBSM Version History +OpenBSM 1.1 alpha 5 + +- Stub libauditd(3) man page added. +- All BSM error number constants with BSM_ERRNO_. +- Interfaces to convert between local and BSM socket types and protocol + families have been added: au_bsm_to_domain(3), au_bsm_to_socket_type(3), + au_domain_to_bsm(3), and au_socket_type_to_bsm(3), along with definitions + of constants in audit_domain.h and audit_socket_type.h. This improves + interoperability by converting local constant spaces, which vary by OS, to + and from Solaris constants (where available) or OpenBSM constants for + protocol domains not present in Solaris (a fair number). These routines + should be used when generating and interpreting extended socket tokens. +- Fix build warnings with full gcc warnings enabled on most supported + platforms. +- Don't compile error strings into bsm_errno.c when building it in the kernel + environment. +- When started by launchd, use the label com.apple.auditd rather than + org.trustedbsd.auditd. + OpenBSM 1.1 alpha 4 - With the addition of BSM error number mapping, we also need to map the @@ -393,4 +412,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#21 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#27 $ ==== //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/VERSION#3 (text) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_1_ALPHA_4 +OPENBSM_1_1_ALPHA_5 ==== //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditd/auditd.8#3 (text) ==== @@ -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. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#16 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#17 $ .\" .Dd December 11, 2008 .Dt AUDITD 8 @@ -115,6 +115,7 @@ .Nm . .Sh SEE ALSO .Xr asl 3 , +.Xr libauditd 3 , .Xr audit 4 , .Xr audit_class 5 , .Xr audit_control 5 , ==== //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditd/auditd.c#3 (text) ==== @@ -26,7 +26,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. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#40 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#41 $ */ #include @@ -252,7 +252,7 @@ */ err = auditd_read_dirs(audit_warn_soft, audit_warn_hard); if (err) { - auditd_log_err("auditd_read_dirs() %s: %m", + auditd_log_err("auditd_read_dirs(): %s", auditd_strerror(err)); if (err == ADE_HARDLIM) audit_warn_allhard(); ==== //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditd/auditd_darwin.c#2 (text) ==== @@ -26,7 +26,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. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#2 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#3 $ */ #include @@ -83,7 +83,7 @@ #endif /* __BSM_INTERNAL_NOTIFY_KEY */ #ifndef __AUDIT_LAUNCHD_LABEL -#define __AUDIT_LAUNCHD_LABEL "org.trustedbsd.auditd" +#define __AUDIT_LAUNCHD_LABEL "com.apple.auditd" #endif /* __AUDIT_LAUNCHD_LABEL */ #define MAX_MSG_SIZE 4096 @@ -100,7 +100,7 @@ if (debug) opt = ASL_OPT_STDERR; - au_aslclient = asl_open("auditd", "org.trustedbsd.auditd", opt); + au_aslclient = asl_open("auditd", "com.apple.auditd", opt); au_aslmsg = asl_new(ASL_TYPE_MSG); #ifdef ASL_KEY_READ_UID ==== //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditd/auditd_fbsd.c#2 (text) ==== @@ -26,7 +26,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. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_fbsd.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_fbsd.c#2 $ */ #include @@ -35,9 +35,11 @@ #include #include +#include #include +#include #include -#include +#include #include #include ==== //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditreduce/auditreduce.c#3 (text) ==== @@ -26,7 +26,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/bin/auditreduce/auditreduce.c#29 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#31 $ */ /* @@ -41,6 +41,9 @@ */ #include + +#define _GNU_SOURCE /* Required for strptime() on glibc2. */ + #ifdef HAVE_FULL_QUEUE_H #include #else ==== //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bsm/auditd_lib.h#2 (text) ==== @@ -26,7 +26,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/bsm/auditd_lib.h#2 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#3 $ */ #ifndef _BSM_AUDITD_LIB_H_ @@ -57,7 +57,7 @@ * Path of auditd plist file for launchd. */ #define AUDITD_PLIST_FILE \ - "/System/Library/LaunchDaemons/org.trustedbsd.auditd.plist" + "/System/Library/LaunchDaemons/com.apple.auditd.plist" /* * Error return codes for auditd_lib functions. ==== //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bsm/libbsm.h#3 (text) ==== @@ -26,7 +26,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/bsm/libbsm.h#40 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#41 $ */ #ifndef _LIBBSM_H_ @@ -821,14 +821,22 @@ */ void au_print_xml_header(FILE *outfp); void au_print_xml_footer(FILE *outfp); -__END_DECLS /* - * Functions relating to BSM<->errno conversion. + * BSM library routines for converting between local and BSM constant spaces. + * (Note: some of these are replicated in audit_record.h for the benefit of + * the FreeBSD and Mac OS X kernels) */ -int au_bsm_to_errno(u_char bsm_error, int *errorp); -u_char au_errno_to_bsm(int error); -const char *au_strerror(u_char bsm_error); +int au_bsm_to_domain(u_short bsm_domain, int *local_domainp); +int au_bsm_to_errno(u_char bsm_error, int *errorp); +int au_bsm_to_socket_type(u_short bsm_socket_type, + int *local_socket_typep); +u_short au_domain_to_bsm(int local_domain); +u_char au_errno_to_bsm(int local_errno); +u_short au_socket_type_to_bsm(int local_socket_type); + +const char *au_strerror(u_char bsm_error); +__END_DECLS /* * The remaining APIs are associated with Apple's BSM implementation, in ==== //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/configure#3 (text) ==== @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#47 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#49 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for OpenBSM 1.1alpha4. +# Generated by GNU Autoconf 2.61 for OpenBSM 1.1alpha5. # # Report bugs to . # @@ -729,8 +729,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.1alpha4' -PACKAGE_STRING='OpenBSM 1.1alpha4' +PACKAGE_VERSION='1.1alpha5' +PACKAGE_STRING='OpenBSM 1.1alpha5' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' ac_unique_file="bin/auditreduce/auditreduce.c" @@ -1404,7 +1404,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.1alpha4 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.1alpha5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1474,7 +1474,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.1alpha4:";; + short | recursive ) echo "Configuration of OpenBSM 1.1alpha5:";; esac cat <<\_ACEOF @@ -1580,7 +1580,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.1alpha4 +OpenBSM configure 1.1alpha5 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1594,7 +1594,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.1alpha4, which was +It was created by OpenBSM $as_me 1.1alpha5, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -19076,7 +19076,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.1alpha4 + VERSION=1.1alpha5 cat >>confdefs.h <<_ACEOF @@ -23584,7 +23584,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenBSM $as_me 1.1alpha4, which was +This file was extended by OpenBSM $as_me 1.1alpha5, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23637,7 +23637,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenBSM config.status 1.1alpha4 +OpenBSM config.status 1.1alpha5 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ==== //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/configure.ac#3 (text) ==== @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([OpenBSM], [1.1alpha4], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#48 $]) +AC_INIT([OpenBSM], [1.1alpha5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#49 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) ==== //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libauditd/Makefile.am#2 (text) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.am#2 $ # if USE_NATIVE_INCLUDES @@ -13,5 +13,5 @@ libauditd_la_SOURCES = \ auditd_lib.c -#man3_MANS = \ -# libauditd.3 +man3_MANS = \ + libauditd.3 ==== //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libauditd/Makefile.in#2 (text) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.in#2 $ # VPATH = @srcdir@ @@ -51,7 +51,7 @@ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libdir)" +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) libauditd_la_LIBADD = @@ -71,6 +71,9 @@ $(LDFLAGS) -o $@ SOURCES = $(libauditd_la_SOURCES) DIST_SOURCES = $(libauditd_la_SOURCES) +man3dir = $(mandir)/man3 +NROFF = nroff +MANS = $(man3_MANS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -188,6 +191,9 @@ libauditd_la_SOURCES = \ auditd_lib.c +man3_MANS = \ + libauditd.3 + all: all-am .SUFFIXES: @@ -285,6 +291,51 @@ clean-libtool: -rm -rf .libs _libs +install-man3: $(man3_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)" + @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.3*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 3*) ;; \ + *) ext='3' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \ + done +uninstall-man3: + @$(NORMAL_UNINSTALL) + @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.3*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 3*) ;; \ + *) ext='3' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man3dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man3dir)/$$inst"; \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -362,9 +413,9 @@ done check-am: all-am check: check-am -all-am: Makefile $(LTLIBRARIES) +all-am: Makefile $(LTLIBRARIES) $(MANS) installdirs: - for dir in "$(DESTDIR)$(libdir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -412,7 +463,7 @@ info-am: -install-data-am: +install-data-am: install-man install-dvi: install-dvi-am @@ -422,7 +473,7 @@ install-info: install-info-am -install-man: +install-man: install-man3 install-pdf: install-pdf-am @@ -448,7 +499,9 @@ ps-am: -uninstall-am: uninstall-libLTLIBRARIES +uninstall-am: uninstall-libLTLIBRARIES uninstall-man + +uninstall-man: uninstall-man3 .MAKE: install-am install-strip @@ -459,16 +512,14 @@ install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + install-libLTLIBRARIES install-man install-man3 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES - + tags uninstall uninstall-am uninstall-libLTLIBRARIES \ + uninstall-man uninstall-man3 -#man3_MANS = \ -# libauditd.3 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: ==== //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libauditd/auditd_lib.c#2 (text) ==== @@ -26,7 +26,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/libauditd/auditd_lib.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#2 $ */ #include @@ -823,7 +823,7 @@ */ if (auditon(A_GETCOND, &cond, sizeof(cond)) < 0) return (-1); - if (cond == AUC_DISABLED) + if (cond == AUC_NOAUDIT) return (0); /* ==== //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/Makefile.am#3 (text) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#7 $ +# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#8 $ # if USE_NATIVE_INCLUDES @@ -14,11 +14,13 @@ bsm_audit.c \ bsm_class.c \ bsm_control.c \ + bsm_domain.c \ bsm_errno.c \ bsm_event.c \ bsm_flags.c \ bsm_io.c \ bsm_mask.c \ + bsm_socket_type.c \ bsm_token.c \ bsm_user.c @@ -31,12 +33,14 @@ man3_MANS = \ au_class.3 \ au_control.3 \ + au_domain.3 \ au_errno.3 \ au_event.3 \ au_free_token.3 \ au_io.3 \ au_mask.3 \ au_open.3 \ + au_socket_type.3 \ au_token.3 \ au_user.3 \ libbsm.3 ==== //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/Makefile.in#3 (text) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#12 $ +# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#13 $ # VPATH = @srcdir@ @@ -60,13 +60,15 @@ LTLIBRARIES = $(lib_LTLIBRARIES) libbsm_la_LIBADD = am__libbsm_la_SOURCES_DIST = bsm_audit.c bsm_class.c bsm_control.c \ - bsm_errno.c bsm_event.c bsm_flags.c bsm_io.c bsm_mask.c \ - bsm_token.c bsm_user.c bsm_notify.c bsm_wrappers.c + bsm_domain.c bsm_errno.c bsm_event.c bsm_flags.c bsm_io.c \ + bsm_mask.c bsm_socket_type.c bsm_token.c bsm_user.c \ + bsm_notify.c bsm_wrappers.c @HAVE_AUDIT_SYSCALLS_TRUE@am__objects_1 = bsm_notify.lo \ @HAVE_AUDIT_SYSCALLS_TRUE@ bsm_wrappers.lo am_libbsm_la_OBJECTS = bsm_audit.lo bsm_class.lo bsm_control.lo \ - bsm_errno.lo bsm_event.lo bsm_flags.lo bsm_io.lo bsm_mask.lo \ - bsm_token.lo bsm_user.lo $(am__objects_1) + bsm_domain.lo bsm_errno.lo bsm_event.lo bsm_flags.lo bsm_io.lo \ + bsm_mask.lo bsm_socket_type.lo bsm_token.lo bsm_user.lo \ + $(am__objects_1) libbsm_la_OBJECTS = $(am_libbsm_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(top_builddir)/config@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/config/depcomp @@ -199,18 +201,20 @@ @USE_NATIVE_INCLUDES_FALSE@INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/sys @USE_NATIVE_INCLUDES_TRUE@INCLUDES = -I$(top_builddir) -I$(top_srcdir) lib_LTLIBRARIES = libbsm.la -libbsm_la_SOURCES = bsm_audit.c bsm_class.c bsm_control.c bsm_errno.c \ - bsm_event.c bsm_flags.c bsm_io.c bsm_mask.c bsm_token.c \ - bsm_user.c $(am__append_1) +libbsm_la_SOURCES = bsm_audit.c bsm_class.c bsm_control.c bsm_domain.c \ + bsm_errno.c bsm_event.c bsm_flags.c bsm_io.c bsm_mask.c \ + bsm_socket_type.c bsm_token.c bsm_user.c $(am__append_1) man3_MANS = \ au_class.3 \ au_control.3 \ + au_domain.3 \ au_errno.3 \ au_event.3 \ au_free_token.3 \ au_io.3 \ au_mask.3 \ au_open.3 \ + au_socket_type.3 \ au_token.3 \ au_user.3 \ libbsm.3 @@ -287,12 +291,14 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_audit.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_class.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_control.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_domain.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_errno.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_event.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_flags.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_io.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_mask.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_notify.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_socket_type.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_token.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_user.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_wrappers.Plo@am__quote@ ==== //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/au_token.3#3 (text) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#16 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#17 $ .\" .Dd April 19, 2005 .Dt AU_TOKEN 3 @@ -60,6 +60,7 @@ .Nm au_to_sock_inet32 , .Nm au_to_sock_inet128 , .Nm au_to_sock_inet , +.Nm au_to_socket_ex , .Nm au_to_subject32 , .Nm au_to_subject64 , .Nm au_to_subject , @@ -156,6 +157,8 @@ .Ft "token_t *" .Fn au_to_sock_int "struct sockaddr_in *so" .Ft "token_t *" +.Fn au_to_socket_ex "u_short so_domain" "u_short so_type" "struct sockaddr *sa_local" "struct sockaddr *sa_remote" +.Ft "token_t *" .Fo au_to_subject32 .Fa "au_id_t auid" "uid_t euid" "gid_t egid" "uid_t ruid" .Fa "gid_t rgid" "pid_t pid" "au_asid_t sid" "au_tid_t *tid" ==== //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_audit.c#3 (text) ==== @@ -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_audit.c#34 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#35 $ */ #include @@ -219,13 +219,16 @@ static int au_assemble(au_record_t *rec, short event) { +#ifdef HAVE_AUDIT_SYSCALLS + struct in6_addr *aptr; + struct auditinfo_addr aia; + struct timeval tm; + size_t hdrsize; +#endif /* HAVE_AUDIT_SYSCALLS */ token_t *header, *tok, *trailer; - size_t tot_rec_size, hdrsize; + size_t tot_rec_size; u_char *dptr; - struct in6_addr *aptr; int error; - struct auditinfo_addr aia; - struct timeval tm; #ifdef HAVE_AUDIT_SYSCALLS /* ==== //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_errno.c#2 (text) ==== @@ -26,7 +26,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_errno.c#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#16 $ */ #include @@ -45,16 +45,25 @@ * operating system. These routines convert between BSM and local error * number spaces, subject to the above realities. BSM error numbers are * stored in a single 8-bit character, so don't have a byte order. + * + * Don't include string definitions when this code is compiled into a kernel. */ - -struct bsm_errors { - int be_bsm_error; - int be_os_error; +struct bsm_errno { + int be_bsm_errno; + int be_local_errno; +#if !defined(KERNEL) && !defined(_KERNEL) const char *be_strerror; +#endif }; #define ERRNO_NO_LOCAL_MAPPING -600 +#if !defined(KERNEL) && !defined(_KERNEL) +#define ES(x) x +#else +#define ES(x) +#endif + /* * Mapping table -- please maintain in numeric sorted order with respect to * the BSM constant. Today we do a linear lookup, but could switch to a @@ -70,523 +79,551 @@ * support catalogues; these are only used if the OS doesn't have an error * string using strerror(3). */ -static const struct bsm_errors bsm_errors[] = { - { BSM_ESUCCESS, 0, "Success" }, - { BSM_EPERM, EPERM, "Operation not permitted" }, - { BSM_ENOENT, ENOENT, "No such file or directory" }, - { BSM_ESRCH, ESRCH, "No such process" }, - { BSM_EINTR, EINTR, "Interrupted system call" }, - { BSM_EIO, EIO, "Input/output error" }, - { BSM_ENXIO, ENXIO, "Device not configured" }, - { BSM_E2BIG, E2BIG, "Argument list too long" }, - { BSM_ENOEXEC, ENOEXEC, "Exec format error" }, - { BSM_EBADF, EBADF, "BAd file descriptor" }, - { BSM_ECHILD, ECHILD, "No child processes" }, - { BSM_EAGAIN, EAGAIN, "Resource temporarily unavailable" }, - { BSM_ENOMEM, ENOMEM, "Cannot allocate memory" }, - { BSM_EACCES, EACCES, "Permission denied" }, - { BSM_EFAULT, EFAULT, "Bad address" }, - { BSM_ENOTBLK, ENOTBLK, "Block device required" }, - { BSM_EBUSY, EBUSY, "Device busy" }, - { BSM_EEXIST, EEXIST, "File exists" }, - { BSM_EXDEV, EXDEV, "Cross-device link" }, - { BSM_ENODEV, ENODEV, "Operation not supported by device" }, - { BSM_ENOTDIR, ENOTDIR, "Not a directory" }, - { BSM_EISDIR, EISDIR, "Is a directory" }, - { BSM_EINVAL, EINVAL, "Invalid argument" }, - { BSM_ENFILE, ENFILE, "Too many open files in system" }, - { BSM_EMFILE, EMFILE, "Too many open files" }, - { BSM_ENOTTY, ENOTTY, "Inappropriate ioctl for device" }, - { BSM_ETXTBSY, ETXTBSY, "Text file busy" }, - { BSM_EFBIG, EFBIG, "File too large" }, - { BSM_ENOSPC, ENOSPC, "No space left on device" }, - { BSM_ESPIPE, ESPIPE, "Illegal seek" }, - { BSM_EROFS, EROFS, "Read-only file system" }, - { BSM_EMLINK, EMLINK, "Too many links" }, - { BSM_EPIPE, EPIPE, "Broken pipe" }, - { BSM_EDOM, EDOM, "Numerical argument out of domain" }, - { BSM_ERANGE, ERANGE, "Result too large" }, - { BSM_ENOMSG, ENOMSG, "No message of desired type" }, - { BSM_EIDRM, EIDRM, "Identifier removed" }, - { BSM_ECHRNG, +static const struct bsm_errno bsm_errnos[] = { + { BSM_ERRNO_ESUCCESS, 0, ES("Success") }, + { BSM_ERRNO_EPERM, EPERM, ES("Operation not permitted") }, + { BSM_ERRNO_ENOENT, ENOENT, ES("No such file or directory") }, + { BSM_ERRNO_ESRCH, ESRCH, ES("No such process") }, + { BSM_ERRNO_EINTR, EINTR, ES("Interrupted system call") }, + { BSM_ERRNO_EIO, EIO, ES("Input/output error") }, + { BSM_ERRNO_ENXIO, ENXIO, ES("Device not configured") }, + { BSM_ERRNO_E2BIG, E2BIG, ES("Argument list too long") }, + { BSM_ERRNO_ENOEXEC, ENOEXEC, ES("Exec format error") }, + { BSM_ERRNO_EBADF, EBADF, ES("Bad file descriptor") }, + { BSM_ERRNO_ECHILD, ECHILD, ES("No child processes") }, + { BSM_ERRNO_EAGAIN, EAGAIN, ES("Resource temporarily unavailable") }, + { BSM_ERRNO_ENOMEM, ENOMEM, ES("Cannot allocate memory") }, + { BSM_ERRNO_EACCES, EACCES, ES("Permission denied") }, + { BSM_ERRNO_EFAULT, EFAULT, ES("Bad address") }, + { BSM_ERRNO_ENOTBLK, ENOTBLK, ES("Block device required") }, + { BSM_ERRNO_EBUSY, EBUSY, ES("Device busy") }, + { BSM_ERRNO_EEXIST, EEXIST, ES("File exists") }, + { BSM_ERRNO_EXDEV, EXDEV, ES("Cross-device link") }, + { BSM_ERRNO_ENODEV, ENODEV, ES("Operation not supported by device") }, + { BSM_ERRNO_ENOTDIR, ENOTDIR, ES("Not a directory") }, + { BSM_ERRNO_EISDIR, EISDIR, ES("Is a directory") }, + { BSM_ERRNO_EINVAL, EINVAL, ES("Invalid argument") }, + { BSM_ERRNO_ENFILE, ENFILE, ES("Too many open files in system") }, + { BSM_ERRNO_EMFILE, EMFILE, ES("Too many open files") }, + { BSM_ERRNO_ENOTTY, ENOTTY, ES("Inappropriate ioctl for device") }, + { BSM_ERRNO_ETXTBSY, ETXTBSY, ES("Text file busy") }, + { BSM_ERRNO_EFBIG, EFBIG, ES("File too large") }, + { BSM_ERRNO_ENOSPC, ENOSPC, ES("No space left on device") }, + { BSM_ERRNO_ESPIPE, ESPIPE, ES("Illegal seek") }, + { BSM_ERRNO_EROFS, EROFS, ES("Read-only file system") }, + { BSM_ERRNO_EMLINK, EMLINK, ES("Too many links") }, + { BSM_ERRNO_EPIPE, EPIPE, ES("Broken pipe") }, + { BSM_ERRNO_EDOM, EDOM, ES("Numerical argument out of domain") }, + { BSM_ERRNO_ERANGE, ERANGE, ES("Result too large") }, + { BSM_ERRNO_ENOMSG, ENOMSG, ES("No message of desired type") }, + { BSM_ERRNO_EIDRM, EIDRM, ES("Identifier removed") }, + { BSM_ERRNO_ECHRNG, #ifdef ECHRNG ECHRNG, #else ERRNO_NO_LOCAL_MAPPING, #endif - "Channel number out of range" }, - { BSM_EL2NSYNC, + ES("Channel number out of range") }, + { BSM_ERRNO_EL2NSYNC, #ifdef EL2NSYNC EL2NSYNC, #else ERRNO_NO_LOCAL_MAPPING, #endif - "Level 2 not synchronized" }, - { BSM_EL3HLT, + ES("Level 2 not synchronized") }, + { BSM_ERRNO_EL3HLT, #ifdef EL3HLT EL3HLT, #else ERRNO_NO_LOCAL_MAPPING, #endif - "Level 3 halted" }, - { BSM_EL3RST, + ES("Level 3 halted") }, + { BSM_ERRNO_EL3RST, #ifdef EL3RST EL3RST, #else ERRNO_NO_LOCAL_MAPPING, #endif - "Level 3 reset" }, - { BSM_ELNRNG, + ES("Level 3 reset") }, + { BSM_ERRNO_ELNRNG, #ifdef ELNRNG ELNRNG, #else ERRNO_NO_LOCAL_MAPPING, #endif - "Link number out of range" }, - { BSM_EUNATCH, + ES("Link number out of range") }, + { BSM_ERRNO_EUNATCH, #ifdef EUNATCH EUNATCH, #else ERRNO_NO_LOCAL_MAPPING, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 14 18:22:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0455810656EC; Wed, 14 Jan 2009 18:22:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9AC9310656D5 for ; Wed, 14 Jan 2009 18:22:57 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 883828FC1A for ; Wed, 14 Jan 2009 18:22:57 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0EIMv8J008096 for ; Wed, 14 Jan 2009 18:22:57 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0EIMvBF008094 for perforce@freebsd.org; Wed, 14 Jan 2009 18:22:57 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 14 Jan 2009 18:22:57 GMT Message-Id: <200901141822.n0EIMvBF008094@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 156166 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Jan 2009 18:23:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=156166 Change 156166 by rene@rene_self on 2009/01/14 18:22:00 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#9 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/boot/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/www/en/news/status/status.sgml#5 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -406,7 +406,7 @@ Juniper - Juniper + Juniper NetApp ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/boot/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -496,7 +496,7 @@ Juniper - Juniper + Juniper NetApp From owner-p4-projects@FreeBSD.ORG Wed Jan 14 20:00:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85D3E1065672; Wed, 14 Jan 2009 20:00:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3F08A106564A for ; Wed, 14 Jan 2009 20:00:37 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 130A28FC1B for ; Wed, 14 Jan 2009 20:00:37 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0EK0a5u021828 for ; Wed, 14 Jan 2009 20:00:36 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0EK0aRG021826 for perforce@freebsd.org; Wed, 14 Jan 2009 20:00:36 GMT (envelope-from andrew@freebsd.org) Date: Wed, 14 Jan 2009 20:00:36 GMT Message-Id: <200901142000.n0EK0aRG021826@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 156172 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Jan 2009 20:00:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=156172 Change 156172 by andrew@andrew_bender on 2009/01/14 19:59:50 Add the support for LCD and I2C memory Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/neo1973_machdep.c#10 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410.c#18 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410reg.h#5 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0var.h#8 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/neo1973_machdep.c#10 (text+ko) ==== @@ -165,6 +165,16 @@ }, { /* + * Map the LCD to VA == PA + */ + _A(S3C2410_LCDC_BASE), + _A(S3C2410_LCDC_BASE), + _S(S3C2410_LCDC_SIZE), + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, + { + /* * Map the MMC/SD to VA == PA */ _A(S3C2410_SDI_BASE), @@ -174,6 +184,16 @@ PTE_NOCACHE, }, { + /* + * Map the IIC to VA == PA + */ + _A(S3C2410_IIC_BASE), + _A(S3C2410_IIC_BASE), + _S(S3C24X0_IIC_SIZE), + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, + { 0, 0, 0, ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410.c#18 (text+ko) ==== @@ -307,10 +307,18 @@ if (bus_space_map(iot, S3C2410_CLKMAN_BASE, S3C24X0_CLKMAN_SIZE, 0, &sc->sc_sx.sc_clkman_ioh)) panic("cannot map clock"); + /* LCD controller */ + if (bus_space_map(iot, S3C2410_LCDC_BASE, + S3C2410_LCDC_SIZE, 0, &sc->sc_sx.sc_lcd_ioh)) + panic("cannot map LCD"); /* MMC/SD */ if (bus_space_map(iot, S3C2410_SDI_BASE, S3C2410_SDI_SIZE, 0, &sc->sc_sx.sc_mci_ioh)) panic("cannot map MMC/SD"); + /* I2C */ + if (bus_space_map(iot, S3C2410_IIC_BASE, + S3C24X0_IIC_SIZE, 0, &sc->sc_sx.sc_iic_ioh)) + panic("cannot map IIC"); #if 0 /* Real time clock */ ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410reg.h#5 (text+ko) ==== @@ -61,6 +61,7 @@ #define S3C2410_DMAC_SIZE 0xe4 #define S3C2410_CLKMAN_BASE 0x4c000000 /* clock & power management */ #define S3C2410_LCDC_BASE 0x4d000000 /* LCD controller */ +#define S3C2410_LCDC_SIZE 0x60 #define S3C2410_NANDFC_BASE 0x4e000000 /* NAND Flash controller */ #define S3C2410_NANDFC_SIZE 0x18 #define S3C2410_UART0_BASE 0x50000000 ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0var.h#8 (text+ko) ==== @@ -47,8 +47,10 @@ bus_space_handle_t sc_memctl_ioh; /* Memory controller */ bus_space_handle_t sc_clkman_ioh; /* Clock manager */ bus_space_handle_t sc_gpio_ioh; /* GPIO */ + bus_space_handle_t sc_lcd_ioh; /* LCD */ bus_space_handle_t sc_rtc_ioh; /* real time clock */ bus_space_handle_t sc_mci_ioh; /* MMC/SD */ + bus_space_handle_t sc_iic_ioh; /* IIC */ bus_dma_tag_t sc_dmat; From owner-p4-projects@FreeBSD.ORG Wed Jan 14 21:54:57 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A8B11065F87; Wed, 14 Jan 2009 21:54:57 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1CD211065F83 for ; Wed, 14 Jan 2009 21:54:57 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 00AD58FC0C for ; Wed, 14 Jan 2009 21:54:57 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0ELsu93043931 for ; Wed, 14 Jan 2009 21:54:56 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0ELsufZ043929 for perforce@freebsd.org; Wed, 14 Jan 2009 21:54:56 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 14 Jan 2009 21:54:56 GMT Message-Id: <200901142154.n0ELsufZ043929@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 156182 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Jan 2009 21:55:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=156182 Change 156182 by rene@rene_self on 2009/01/14 21:54:21 solid-state article: 27% Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/solid-state/article.sgml#5 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/solid-state/article.sgml#5 (text+ko) ==== @@ -146,30 +146,33 @@ - Kernel Options + Kernelopties - A few kernel options are of specific interest to those creating - an embedded FreeBSD system. + Enkele kernelopties zijn specifiek interessant voor degenen + die een embeddded &os;-systeem creëren. - First, all embedded FreeBSD systems that use flash memory as system - disk will be interested in memory disks and memory filesystems. Because - of the limited number of writes that can be done to flash memory, the - disk and the filesystems on the disk will most likely be mounted - read-only. In this environment, filesystems such as - /tmp and /var are mounted as - memory filesystems to allow the system to create logs and update - counters and temporary files. Memory filesystems are a critical - component to a successful solid state FreeBSD implementation. + Ten eerste zullen alle embedded &os;-systemen die + flash-geheugen als systeemschijf gebruiken geïntereseerd zijn + in geheugenschijven en geheugenbestandssystemen. Vanwege het + beperkt aantal keren dat het flash-geheugen kan worden beschreven, + is het het waarschijnlijkst dat de schijf en de bestandssystemen + op de schijf als alleen-lezen worden aangekoppeld. In deze + omgeving zullen bestandssystemen zoals /tmp + en /var als geheugenbestandssystemen worden + aangekoppeld zodat het systeem logs kan creëren en tellers en + tijdelijke bestanden kan bijwerken. Geheugenbestandssystemen zijn + een kritiek station naar een succesvolle implementatie van solid + state &os;. - You should make sure the following lines exist in your kernel - configuration file: + De volgende regels dienen in uw kernelinstellingenbestand te + staan: - options MFS # Memory Filesystem -options MD_ROOT # md device usable as a potential root device -pseudo-device md # memory disk + options MFS # Geheugenbestandssysteem +options MD_ROOT # md-apparaat bruikbaar als een potentieel root-apparaat +pseudo-device md # geheugenschijf - Second, if you will be using the M-Systems &diskonchip; product, you - must also include this line: + Ten tweede, als u het M-Systems &diskonchip;-product gaat + gebruiken, moet u ook deze regel opnemen: device fla0 at isa? From owner-p4-projects@FreeBSD.ORG Thu Jan 15 08:53:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A8241065673; Thu, 15 Jan 2009 08:53:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 482311065672 for ; Thu, 15 Jan 2009 08:53:08 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1D0518FC0A for ; Thu, 15 Jan 2009 08:53:08 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0F8r7vZ008753 for ; Thu, 15 Jan 2009 08:53:07 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0F8r7sw008751 for perforce@freebsd.org; Thu, 15 Jan 2009 08:53:07 GMT (envelope-from weongyo@FreeBSD.org) Date: Thu, 15 Jan 2009 08:53:07 GMT Message-Id: <200901150853.n0F8r7sw008751@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 156211 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Jan 2009 08:53:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=156211 Change 156211 by weongyo@weongyo_ws on 2009/01/15 08:52:39 add a missed `break' Found by: Michael Li Affected files ... .. //depot/projects/vap/sys/dev/usb/if_urtw.c#16 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_urtw.c#16 (text+ko) ==== @@ -1810,6 +1810,7 @@ break; case IEEE80211_M_IBSS: data |= URTW_MSR_LINK_ADHOC; + break; case IEEE80211_M_HOSTAP: data |= URTW_MSR_LINK_HOSTAP; break; From owner-p4-projects@FreeBSD.ORG Thu Jan 15 08:58:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA0871065674; Thu, 15 Jan 2009 08:58:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8E8071065673 for ; Thu, 15 Jan 2009 08:58:13 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 634538FC1C for ; Thu, 15 Jan 2009 08:58:13 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0F8wDrL009206 for ; Thu, 15 Jan 2009 08:58:13 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0F8wDIN009204 for perforce@freebsd.org; Thu, 15 Jan 2009 08:58:13 GMT (envelope-from weongyo@FreeBSD.org) Date: Thu, 15 Jan 2009 08:58:13 GMT Message-Id: <200901150858.n0F8wDIN009204@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 156212 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Jan 2009 08:58:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=156212 Change 156212 by weongyo@weongyo_ws on 2009/01/15 08:57:29 needs to stop the device before the initialization. Found by: Michael Li Affected files ... .. //depot/projects/vap/sys/dev/usb/if_urtw.c#17 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_urtw.c#17 (text+ko) ==== @@ -2076,6 +2076,8 @@ struct ifnet *ifp = sc->sc_ifp; usbd_status error; + urtw_stop(ifp, 1); + error = urtw_adapter_start(sc); if (error != 0) goto fail; From owner-p4-projects@FreeBSD.ORG Thu Jan 15 09:28:49 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC17C1065675; Thu, 15 Jan 2009 09:28:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 56A1C1065672 for ; Thu, 15 Jan 2009 09:28:47 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 423E58FC13 for ; Thu, 15 Jan 2009 09:28:47 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0F9SlPq013179 for ; Thu, 15 Jan 2009 09:28:47 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0F9SlL3013177 for perforce@freebsd.org; Thu, 15 Jan 2009 09:28:47 GMT (envelope-from weongyo@FreeBSD.org) Date: Thu, 15 Jan 2009 09:28:47 GMT Message-Id: <200901150928.n0F9SlL3013177@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 156213 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Jan 2009 09:28:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=156213 Change 156213 by weongyo@weongyo_ws on 2009/01/15 09:28:28 whitespace tweak. Affected files ... .. //depot/projects/vap/sys/dev/usb/if_urtw.c#18 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_urtw.c#18 (text+ko) ==== @@ -225,18 +225,18 @@ { 0x4a, 0x05 }, { 0x4b, 0x02 }, { 0x4c, 0x05 } }; -static uint16_t urtw_8225_rxgain[] = { +static uint16_t urtw_8225_rxgain[] = { 0x0400, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0408, 0x0409, - 0x040a, 0x040b, 0x0502, 0x0503, 0x0504, 0x0505, 0x0540, 0x0541, + 0x040a, 0x040b, 0x0502, 0x0503, 0x0504, 0x0505, 0x0540, 0x0541, 0x0542, 0x0543, 0x0544, 0x0545, 0x0580, 0x0581, 0x0582, 0x0583, - 0x0584, 0x0585, 0x0588, 0x0589, 0x058a, 0x058b, 0x0643, 0x0644, + 0x0584, 0x0585, 0x0588, 0x0589, 0x058a, 0x058b, 0x0643, 0x0644, 0x0645, 0x0680, 0x0681, 0x0682, 0x0683, 0x0684, 0x0685, 0x0688, 0x0689, 0x068a, 0x068b, 0x068c, 0x0742, 0x0743, 0x0744, 0x0745, 0x0780, 0x0781, 0x0782, 0x0783, 0x0784, 0x0785, 0x0788, 0x0789, 0x078a, 0x078b, 0x078c, 0x078d, 0x0790, 0x0791, 0x0792, 0x0793, - 0x0794, 0x0795, 0x0798, 0x0799, 0x079a, 0x079b, 0x079c, 0x079d, - 0x07a0, 0x07a1, 0x07a2, 0x07a3, 0x07a4, 0x07a5, 0x07a8, 0x07a9, - 0x07aa, 0x07ab, 0x07ac, 0x07ad, 0x07b0, 0x07b1, 0x07b2, 0x07b3, + 0x0794, 0x0795, 0x0798, 0x0799, 0x079a, 0x079b, 0x079c, 0x079d, + 0x07a0, 0x07a1, 0x07a2, 0x07a3, 0x07a4, 0x07a5, 0x07a8, 0x07a9, + 0x07aa, 0x07ab, 0x07ac, 0x07ad, 0x07b0, 0x07b1, 0x07b2, 0x07b3, 0x07b4, 0x07b5, 0x07b8, 0x07b9, 0x07ba, 0x07bb, 0x07bb }; @@ -272,12 +272,12 @@ static uint8_t urtw_8225v2_gain_bg[]={ 0x23, 0x15, 0xa5, /* -82-1dbm */ - 0x23, 0x15, 0xb5, /* -82-2dbm */ - 0x23, 0x15, 0xc5, /* -82-3dbm */ - 0x33, 0x15, 0xc5, /* -78dbm */ - 0x43, 0x15, 0xc5, /* -74dbm */ - 0x53, 0x15, 0xc5, /* -70dbm */ - 0x63, 0x15, 0xc5, /* -66dbm */ + 0x23, 0x15, 0xb5, /* -82-2dbm */ + 0x23, 0x15, 0xc5, /* -82-3dbm */ + 0x33, 0x15, 0xc5, /* -78dbm */ + 0x43, 0x15, 0xc5, /* -74dbm */ + 0x53, 0x15, 0xc5, /* -70dbm */ + 0x63, 0x15, 0xc5, /* -66dbm */ }; static struct urtw_pair urtw_8225v2_rf_part1[] = { @@ -312,17 +312,17 @@ }; static uint16_t urtw_8225v2_rxgain[] = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0008, 0x0009, - 0x000a, 0x000b, 0x0102, 0x0103, 0x0104, 0x0105, 0x0140, 0x0141, - 0x0142, 0x0143, 0x0144, 0x0145, 0x0180, 0x0181, 0x0182, 0x0183, - 0x0184, 0x0185, 0x0188, 0x0189, 0x018a, 0x018b, 0x0243, 0x0244, - 0x0245, 0x0280, 0x0281, 0x0282, 0x0283, 0x0284, 0x0285, 0x0288, - 0x0289, 0x028a, 0x028b, 0x028c, 0x0342, 0x0343, 0x0344, 0x0345, + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0008, 0x0009, + 0x000a, 0x000b, 0x0102, 0x0103, 0x0104, 0x0105, 0x0140, 0x0141, + 0x0142, 0x0143, 0x0144, 0x0145, 0x0180, 0x0181, 0x0182, 0x0183, + 0x0184, 0x0185, 0x0188, 0x0189, 0x018a, 0x018b, 0x0243, 0x0244, + 0x0245, 0x0280, 0x0281, 0x0282, 0x0283, 0x0284, 0x0285, 0x0288, + 0x0289, 0x028a, 0x028b, 0x028c, 0x0342, 0x0343, 0x0344, 0x0345, 0x0380, 0x0381, 0x0382, 0x0383, 0x0384, 0x0385, 0x0388, 0x0389, 0x038a, 0x038b, 0x038c, 0x038d, 0x0390, 0x0391, 0x0392, 0x0393, - 0x0394, 0x0395, 0x0398, 0x0399, 0x039a, 0x039b, 0x039c, 0x039d, - 0x03a0, 0x03a1, 0x03a2, 0x03a3, 0x03a4, 0x03a5, 0x03a8, 0x03a9, - 0x03aa, 0x03ab, 0x03ac, 0x03ad, 0x03b0, 0x03b1, 0x03b2, 0x03b3, + 0x0394, 0x0395, 0x0398, 0x0399, 0x039a, 0x039b, 0x039c, 0x039d, + 0x03a0, 0x03a1, 0x03a2, 0x03a3, 0x03a4, 0x03a5, 0x03a8, 0x03a9, + 0x03aa, 0x03ab, 0x03ac, 0x03ad, 0x03b0, 0x03b1, 0x03b2, 0x03b3, 0x03b4, 0x03b5, 0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bb }; @@ -410,19 +410,19 @@ static usbd_status urtw_led_init(struct urtw_softc *); static usbd_status urtw_8185_rf_pins_enable(struct urtw_softc *); static usbd_status urtw_8185_tx_antenna(struct urtw_softc *, uint8_t); -static usbd_status urtw_8187_write_phy(struct urtw_softc *, uint8_t, +static usbd_status urtw_8187_write_phy(struct urtw_softc *, uint8_t, uint32_t); -static usbd_status urtw_8187_write_phy_ofdm_c(struct urtw_softc *, +static usbd_status urtw_8187_write_phy_ofdm_c(struct urtw_softc *, uint8_t, uint32_t); -static usbd_status urtw_8187_write_phy_cck_c(struct urtw_softc *, uint8_t, +static usbd_status urtw_8187_write_phy_cck_c(struct urtw_softc *, uint8_t, uint32_t); static usbd_status urtw_8225_setgain(struct urtw_softc *, int16_t); static usbd_status urtw_8225_usb_init(struct urtw_softc *); -static usbd_status urtw_8225_write_c(struct urtw_softc *, uint8_t, +static usbd_status urtw_8225_write_c(struct urtw_softc *, uint8_t, uint16_t); -static usbd_status urtw_8225_write_s16(struct urtw_softc *, uint8_t, int, +static usbd_status urtw_8225_write_s16(struct urtw_softc *, uint8_t, int, uint16_t *); -static usbd_status urtw_8225_read(struct urtw_softc *, uint8_t, +static usbd_status urtw_8225_read(struct urtw_softc *, uint8_t, uint32_t *); static usbd_status urtw_8225_rf_init(struct urtw_softc *); static usbd_status urtw_8225_rf_set_chan(struct urtw_softc *, int); @@ -1076,7 +1076,7 @@ { uint32_t data; usbd_status error; - + error = urtw_eprom_read32(sc, URTW_EPROM_MACADDR, &data); if (error != 0) goto fail; @@ -1556,7 +1556,7 @@ device_printf(sc->sc_dev, "reset timeout\n"); goto fail; } - + error = urtw_set_mode(sc, URTW_EPROM_CMD_LOAD); if (error) goto fail; @@ -1730,7 +1730,7 @@ sc->sc_gpio_blinkstate = (sc->sc_gpio_blinkstate != URTW_LED_ON) ? URTW_LED_ON : URTW_LED_OFF; - + switch (sc->sc_gpio_ledstate) { case URTW_LED_BLINK_NORMAL: callout_reset(&sc->sc_led_ch, hz, urtw_ledtask, sc); @@ -1867,7 +1867,7 @@ basic_rate = urtw_rate2rtl(48); min_rr_rate = urtw_rate2rtl(12); max_rr_rate = urtw_rate2rtl(48); - + urtw_write8_m(sc, URTW_RESP_RATE, max_rr_rate << URTW_RESP_MAX_RATE_SHIFT | min_rr_rate << URTW_RESP_MIN_RATE_SHIFT); @@ -1987,7 +1987,7 @@ data = data | URTW_RX_FILTER_NICMAC; data = data | URTW_RX_CHECK_BSSID; } - + data = data &~ URTW_RX_FIFO_THRESHOLD_MASK; data = data | URTW_RX_FIFO_THRESHOLD_NONE | URTW_RX_AUTORESETPHY; data = data &~ URTW_MAX_RX_DMA_MASK; @@ -2264,7 +2264,7 @@ m_freem(m); data->m = NULL; } - + ieee80211_free_node(data->ni); data->ni = NULL; @@ -2355,7 +2355,7 @@ m_freem(m0); return (ENOBUFS); } - + /* in case packet header moved, reset pointer */ wh = mtod(m0, struct ieee80211_frame *); } @@ -2608,7 +2608,7 @@ uint8_t cck_pwrlvl = sc->sc_txpwr_cck[chan] & 0xff; uint8_t ofdm_pwrlvl = sc->sc_txpwr_ofdm[chan] & 0xff; usbd_status error; - + cck_pwrlvl_max = 11; ofdm_pwrlvl_max = 25; /* 12 -> 25 */ ofdm_pwrlvl_min = 10; @@ -2627,12 +2627,12 @@ cck_pwltable[idx * 8 + i]); } usbd_delay_ms(sc->sc_udev, 1); - + /* OFDM power setting */ ofdm_pwrlvl = (ofdm_pwrlvl > (ofdm_pwrlvl_max - ofdm_pwrlvl_min)) ? ofdm_pwrlvl_max : ofdm_pwrlvl + ofdm_pwrlvl_min; ofdm_pwrlvl = (ofdm_pwrlvl > 35) ? 35 : ofdm_pwrlvl; - + idx = ofdm_pwrlvl % 6; set = ofdm_pwrlvl / 6; @@ -2711,7 +2711,7 @@ usbd_delay_ms(sc->sc_udev, 200); urtw_8225_write(sc, URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC3); - + for (i = 0; i < 95; i++) { urtw_8225_write(sc, URTW_8225_ADDR_1_MAGIC, (uint8_t)(i + 1)); urtw_8225_write(sc, URTW_8225_ADDR_2_MAGIC, urtw_8225_rxgain[i]); @@ -2721,7 +2721,7 @@ URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC4); urtw_8225_write(sc, URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC5); - + for (i = 0; i < 128; i++) { urtw_8187_write_phy_ofdm(sc, 0xb, urtw_8225_agc[i]); usbd_delay_ms(sc->sc_udev, 1); @@ -2734,7 +2734,7 @@ urtw_8225_rf_part2[i].val); usbd_delay_ms(sc->sc_udev, 1); } - + error = urtw_8225_setgain(sc, 4); if (error) goto fail; @@ -2750,7 +2750,7 @@ error = urtw_8225_set_txpwrlvl(sc, 1); if (error) goto fail; - + urtw_8187_write_phy_cck(sc, 0x10, 0x9b); usbd_delay_ms(sc->sc_udev, 1); urtw_8187_write_phy_ofdm(sc, 0x26, 0x90); @@ -2788,7 +2788,7 @@ urtw_write8_m(sc, URTW_SLOT, 0x9); else urtw_write8_m(sc, URTW_SLOT, 0x14); - + if (IEEE80211_IS_CHAN_G(c)) { /* for G */ urtw_write8_m(sc, URTW_DIFS, 0x14); @@ -2816,7 +2816,7 @@ if (sens > 4) urtw_8225_write(sc, URTW_8225_ADDR_C_MAGIC, URTW_8225_ADDR_C_DATA_MAGIC1); - else + else urtw_8225_write(sc, URTW_8225_ADDR_C_MAGIC, URTW_8225_ADDR_C_DATA_MAGIC2); @@ -2824,7 +2824,7 @@ error = urtw_8225_setgain(sc, sens); if (error) goto fail; - + urtw_8187_write_phy_cck(sc, 0x41, urtw_8225_threshold[sens]); fail: @@ -2915,7 +2915,7 @@ ifp->if_ierrors++; goto skip; } - + m = data->m; data->m = mnew; data->buf = mtod(mnew, uint8_t *); @@ -3024,7 +3024,7 @@ urtw_write8_m(sc, URTW_TX_GAIN_CCK, urtw_8225v2_tx_gain_cck_ofdm[cck_pwrlvl]); usbd_delay_ms(sc->sc_udev, 1); - + /* OFDM power setting */ ofdm_pwrlvl = (ofdm_pwrlvl > (ofdm_pwrlvl_max - ofdm_pwrlvl_min)) ? ofdm_pwrlvl_max : ofdm_pwrlvl + ofdm_pwrlvl_min; @@ -3143,7 +3143,7 @@ urtw_8187_write_phy_ofdm(sc, urtw_8225v2_rf_part2[i].reg, urtw_8225v2_rf_part2[i].val); } - + error = urtw_8225v2_setgain(sc, 4); if (error) goto fail; @@ -3158,7 +3158,7 @@ error = urtw_8225v2_set_txpwrlvl(sc, 1); if (error) goto fail; - + urtw_8187_write_phy_cck(sc, 0x10, 0x9b); urtw_8187_write_phy_ofdm(sc, 0x26, 0x90); @@ -3195,7 +3195,7 @@ urtw_write8_m(sc, URTW_SLOT, 0x9); else urtw_write8_m(sc, URTW_SLOT, 0x14); - + if (IEEE80211_IS_CHAN_G(c)) { /* for G */ urtw_write8_m(sc, URTW_DIFS, 0x14); @@ -3267,7 +3267,7 @@ urtw_update_msr(sc); /* XXX maybe the below would be incorrect. */ urtw_write16_m(sc, URTW_ATIM_WND, 2); - urtw_write16_m(sc, URTW_ATIM_TR_ITV, 100); + urtw_write16_m(sc, URTW_ATIM_TR_ITV, 100); urtw_write16_m(sc, URTW_BEACON_INTERVAL, 0x64); urtw_write16_m(sc, URTW_BEACON_INTERVAL_TIME, 100); error = urtw_led_ctl(sc, URTW_LED_CTL_LINK); From owner-p4-projects@FreeBSD.ORG Thu Jan 15 17:23:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 784061065675; Thu, 15 Jan 2009 17:23:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2DED2106566B for ; Thu, 15 Jan 2009 17:23:54 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 00ECF8FC1B for ; Thu, 15 Jan 2009 17:23:54 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0FHNrWf078421 for ; Thu, 15 Jan 2009 17:23:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0FHNrAR078419 for perforce@freebsd.org; Thu, 15 Jan 2009 17:23:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 15 Jan 2009 17:23:53 GMT Message-Id: <200901151723.n0FHNrAR078419@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156218 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Jan 2009 17:23:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=156218 Change 156218 by rwatson@rwatson_freebsd_capabilities on 2009/01/15 17:23:52 fget() now requires capability.h. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/sys/file.h#3 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/sys/file.h#3 (text+ko) ==== @@ -34,6 +34,8 @@ #ifdef _KERNEL typedef struct file file_t; +#include + static __inline file_t * getf(int fd, int write) { From owner-p4-projects@FreeBSD.ORG Thu Jan 15 18:31:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 611AF1065675; Thu, 15 Jan 2009 18:31:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1F382106564A for ; Thu, 15 Jan 2009 18:31:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0C5268FC13 for ; Thu, 15 Jan 2009 18:31:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0FIV2qb087064 for ; Thu, 15 Jan 2009 18:31:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0FIV2Bu087062 for perforce@freebsd.org; Thu, 15 Jan 2009 18:31:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 15 Jan 2009 18:31:02 GMT Message-Id: <200901151831.n0FIV2Bu087062@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156220 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Jan 2009 18:31:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=156220 Change 156220 by rwatson@rwatson_freebsd_capabilities on 2009/01/15 18:30:27 Update use of fgetsock() to specify no capabilities required; this use of a socket is fairly odd. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_socket.c#5 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_socket.c#5 (text+ko) ==== @@ -699,7 +699,7 @@ * * XXXRW: No capability rights required here? */ - error = fgetsock(td, args->s, &so, &fflag); + error = fgetsock(td, args->s, 0, &so, &fflag); if (error == 0) { error = EISCONN; if (fflag & FNONBLOCK) { From owner-p4-projects@FreeBSD.ORG Thu Jan 15 19:49:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBDF51065678; Thu, 15 Jan 2009 19:49:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 74BF71065674 for ; Thu, 15 Jan 2009 19:49:25 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 60F2B8FC20 for ; Thu, 15 Jan 2009 19:49:25 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0FJnPXv094281 for ; Thu, 15 Jan 2009 19:49:25 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0FJnOvO094279 for perforce@freebsd.org; Thu, 15 Jan 2009 19:49:24 GMT (envelope-from imp@freebsd.org) Date: Thu, 15 Jan 2009 19:49:24 GMT Message-Id: <200901151949.n0FJnOvO094279@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 156225 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Jan 2009 19:49:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=156225 Change 156225 by imp@imp_paco-paco on 2009/01/15 19:48:56 IFC @156221 userland + lots of stuff to loopback in sys. Affected files ... .. //depot/projects/mips2/src/Makefile.inc1#27 integrate .. //depot/projects/mips2/src/UPDATING#26 integrate .. //depot/projects/mips2/src/bin/kenv/kenv.1#2 integrate .. //depot/projects/mips2/src/bin/ln/ln.1#4 integrate .. //depot/projects/mips2/src/contrib/ntp/ntpd/ntp_crypto.c#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/INSTALL#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/NEWS#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/VERSION#7 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd.8#6 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd.c#6 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd_darwin.c#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd_fbsd.c#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditreduce/auditreduce.c#6 integrate .. //depot/projects/mips2/src/contrib/openbsm/bsm/auditd_lib.h#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/bsm/libbsm.h#5 integrate .. //depot/projects/mips2/src/contrib/openbsm/configure#7 integrate .. //depot/projects/mips2/src/contrib/openbsm/configure.ac#7 integrate .. //depot/projects/mips2/src/contrib/openbsm/libauditd/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/libauditd/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/libauditd/auditd_lib.c#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/libauditd/libauditd.3#1 branch .. //depot/projects/mips2/src/contrib/openbsm/libbsm/Makefile.am#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/Makefile.in#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/au_domain.3#1 branch .. //depot/projects/mips2/src/contrib/openbsm/libbsm/au_socket_type.3#1 branch .. //depot/projects/mips2/src/contrib/openbsm/libbsm/au_token.3#5 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_audit.c#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_domain.c#1 branch .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_errno.c#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_io.c#7 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_socket_type.c#1 branch .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_token.c#6 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/libbsm.3#5 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/audit_user.5#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/audit.h#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/audit_domain.h#1 branch .. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/audit_errno.h#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/audit_record.h#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/audit_socket_type.h#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/bsm/generate.c#5 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/E2BIG_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EACCES_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EBADF_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EBUSY_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ECHILD_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EDEADLK_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EEXIST_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EFAULT_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EFBIG_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EINTR_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EINVAL_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EIO_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EISDIR_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EMFILE_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EMLINK_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENFILE_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENODEV_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOENT_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOEXEC_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOMEM_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOSPC_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOTBLK_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOTDIR_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOTTY_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENXIO_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EPERM_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EPIPE_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EROFS_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ESPIPE_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ESRCH_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ETXTBSY_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EXDEV_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/arg32_record#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/data_record#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/data_token#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/file_record#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/in_addr_record#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ip_record#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ipc_record#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/iport_record#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/opaque_record#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/path_record#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process32_record#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process32ex_record-IPv4#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process32ex_record-IPv6#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process64_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process64ex_record-IPv4#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process64ex_record-IPv6#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/return32_record#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/seq_record#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/socketex_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/socketex_token#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/subject32_record#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/subject32ex_record#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/text_record#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/zonename_record#3 integrate .. //depot/projects/mips2/src/etc/periodic/weekly/Makefile#4 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_iso9660.c#7 integrate .. //depot/projects/mips2/src/lib/libbsm/Makefile#6 integrate .. //depot/projects/mips2/src/lib/libc/stdio/printfcommon.h#1 branch .. //depot/projects/mips2/src/lib/libc/stdio/vfprintf.c#7 integrate .. //depot/projects/mips2/src/lib/libc/stdio/vfwprintf.c#8 integrate .. //depot/projects/mips2/src/lib/libc/string/ffs.3#4 integrate .. //depot/projects/mips2/src/lib/libusb20/libusb20.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_rem_pio2.c#8 integrate .. //depot/projects/mips2/src/lib/msun/src/e_rem_pio2f.c#6 integrate .. //depot/projects/mips2/src/lib/msun/src/k_cosf.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/k_sinf.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/k_tanf.c#3 integrate .. //depot/projects/mips2/src/sbin/fdisk/fdisk.c#6 integrate .. //depot/projects/mips2/src/sbin/ifconfig/ifconfig.c#11 integrate .. //depot/projects/mips2/src/sbin/mount/mount.c#10 integrate .. //depot/projects/mips2/src/share/examples/cvsup/refuse.README#3 integrate .. //depot/projects/mips2/src/share/man/man4/ath.4#6 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/exception.S#8 integrate .. //depot/projects/mips2/src/sys/amd64/conf/GENERIC#20 integrate .. //depot/projects/mips2/src/sys/amd64/conf/USB2#2 integrate .. //depot/projects/mips2/src/sys/boot/common/load.c#2 delete .. //depot/projects/mips2/src/sys/boot/forth/support.4th#6 integrate .. //depot/projects/mips2/src/sys/bsm/audit.h#8 integrate .. //depot/projects/mips2/src/sys/bsm/audit_domain.h#1 branch .. //depot/projects/mips2/src/sys/bsm/audit_errno.h#2 integrate .. //depot/projects/mips2/src/sys/bsm/audit_internal.h#7 integrate .. //depot/projects/mips2/src/sys/bsm/audit_kevents.h#8 integrate .. //depot/projects/mips2/src/sys/bsm/audit_record.h#8 integrate .. //depot/projects/mips2/src/sys/bsm/audit_socket_type.h#1 branch .. //depot/projects/mips2/src/sys/cam/cam_xpt.c#14 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_all.c#5 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_da.c#12 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_sg.c#6 integrate .. //depot/projects/mips2/src/sys/conf/files#36 integrate .. //depot/projects/mips2/src/sys/conf/files.powerpc#17 integrate .. //depot/projects/mips2/src/sys/conf/kern.pre.mk#12 integrate .. //depot/projects/mips2/src/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c#2 integrate .. //depot/projects/mips2/src/sys/dev/bce/if_bce.c#13 integrate .. //depot/projects/mips2/src/sys/dev/e1000/if_igb.c#3 integrate .. //depot/projects/mips2/src/sys/dev/iicbus/iicbus.c#6 integrate .. //depot/projects/mips2/src/sys/dev/msk/if_msk.c#12 integrate .. //depot/projects/mips2/src/sys/dev/msk/if_mskreg.h#7 integrate .. //depot/projects/mips2/src/sys/dev/ofw/ofw_iicbus.c#1 branch .. //depot/projects/mips2/src/sys/dev/sound/pci/hda/hdac.c#18 integrate .. //depot/projects/mips2/src/sys/dev/usb/ehci.c#12 integrate .. //depot/projects/mips2/src/sys/dev/usb/usbdevs#29 integrate .. //depot/projects/mips2/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/at91dci.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/at91dci.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/at91dci_atmelarm.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/atmegadci.c#1 branch .. //depot/projects/mips2/src/sys/dev/usb2/controller/atmegadci.h#1 branch .. //depot/projects/mips2/src/sys/dev/usb2/controller/atmegadci_atmelarm.c#1 branch .. //depot/projects/mips2/src/sys/dev/usb2/controller/ehci2.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/ehci2.h#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/ehci2_pci.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/musb2_otg.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/musb2_otg.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/ohci2.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/ohci2.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/ohci2_atmelarm.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/ohci2_pci.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/uhci2.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/uhci2.h#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/uhci2_pci.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/usb2_bus.h#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/usb2_controller.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/usb2_controller.h#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/uss820dci.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/uss820dci.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_busdma.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_compat_linux.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_core.h#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_debug.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_device.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_generic.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_handle_request.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_hub.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_mbuf.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_parse.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_request.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_sw_transfer.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_transfer.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_transfer.h#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_aue2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_aue2_reg.h#2 delete .. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_auereg.h#1 branch .. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_axe2.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_axe2_reg.h#3 delete .. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_axereg.h#1 branch .. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_cdce2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_cdce2_reg.h#2 delete .. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_cdcereg.h#1 branch .. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_cue2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_cue2_reg.h#2 delete .. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_cuereg.h#1 branch .. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_kue2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_kue2_fw.h#2 delete .. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_kue2_reg.h#2 delete .. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_kuefw.h#1 branch .. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_kuereg.h#1 branch .. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_rue2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_rue2_reg.h#2 delete .. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_ruereg.h#1 branch .. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_udav2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_udav2_reg.h#2 delete .. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_udavreg.h#1 branch .. //depot/projects/mips2/src/sys/dev/usb2/image/uscanner2.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/include/usb2_defs.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/include/usb2_devid.h#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/include/usb2_devtable.h#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/include/usb2_standard.h#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/input/uhid2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/input/ukbd2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/input/ums2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/u3g2.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/uark2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/ubsa2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/ubser2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/uchcom2.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/ucycom2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/ufoma2.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/uftdi2.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/ugensa2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/uipaq2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/ulpt2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/umct2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/umodem2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/umoscom2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/uplcom2.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/usb2_serial.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/usb2_serial.h#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/uvisor2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/serial/uvscom2.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/sound/uaudio2.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/storage/ata-usb2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/storage/umass2.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_rum2.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_rum2_fw.h#2 delete .. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_rum2_reg.h#2 delete .. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_rum2_var.h#2 delete .. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_rumfw.h#1 branch .. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_rumreg.h#1 branch .. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_rumvar.h#1 branch .. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_ural2.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_ural2_reg.h#2 delete .. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_ural2_var.h#2 delete .. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_uralreg.h#1 branch .. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_uralvar.h#1 branch .. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_zyd2.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_zyd2_fw.h#2 delete .. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_zyd2_reg.h#3 delete .. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_zydfw.h#1 branch .. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_zydreg.h#1 branch .. //depot/projects/mips2/src/sys/fs/msdosfs/msdosfs_conv.c#5 integrate .. //depot/projects/mips2/src/sys/i386/conf/GENERIC#22 integrate .. //depot/projects/mips2/src/sys/i386/conf/USB2#2 integrate .. //depot/projects/mips2/src/sys/i386/i386/msi.c#5 integrate .. //depot/projects/mips2/src/sys/kern/kern_timeout.c#14 integrate .. //depot/projects/mips2/src/sys/kern/sysv_sem.c#7 integrate .. //depot/projects/mips2/src/sys/mips/idt/idtpci.c#5 integrate .. //depot/projects/mips2/src/sys/mips/include/pmap.h#17 integrate .. //depot/projects/mips2/src/sys/mips/malta/gt_pci.c#7 integrate .. //depot/projects/mips2/src/sys/mips/mips/busdma_machdep.c#12 integrate .. //depot/projects/mips2/src/sys/mips/mips/cpu.c#25 integrate .. //depot/projects/mips2/src/sys/mips/mips/machdep.c#47 integrate .. //depot/projects/mips2/src/sys/mips/mips/nexus.c#15 integrate .. //depot/projects/mips2/src/sys/mips/mips/pmap.c#38 integrate .. //depot/projects/mips2/src/sys/modules/usb2/controller_atmegadci/Makefile#1 branch .. //depot/projects/mips2/src/sys/netinet/tcp_input.c#20 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_subr.c#20 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_timer.c#11 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_var.h#15 integrate .. //depot/projects/mips2/src/sys/netinet/vinet.h#3 integrate .. //depot/projects/mips2/src/sys/pc98/conf/GENERIC#15 integrate .. //depot/projects/mips2/src/sys/powerpc/booke/locore.S#5 integrate .. //depot/projects/mips2/src/sys/powerpc/booke/machdep.c#9 integrate .. //depot/projects/mips2/src/sys/powerpc/booke/pmap.c#6 integrate .. //depot/projects/mips2/src/sys/powerpc/booke/support.S#2 delete .. //depot/projects/mips2/src/sys/powerpc/booke/trap_subr.S#3 integrate .. //depot/projects/mips2/src/sys/powerpc/conf/NOTES#11 integrate .. //depot/projects/mips2/src/sys/powerpc/include/pcpu.h#7 integrate .. //depot/projects/mips2/src/sys/powerpc/include/pmap.h#5 integrate .. //depot/projects/mips2/src/sys/powerpc/include/pte.h#4 integrate .. //depot/projects/mips2/src/sys/powerpc/include/tlb.h#2 integrate .. //depot/projects/mips2/src/sys/powerpc/powermac/kiic.c#1 branch .. //depot/projects/mips2/src/sys/powerpc/powerpc/genassym.c#6 integrate .. //depot/projects/mips2/src/sys/security/audit/audit_bsm_domain.c#1 branch .. //depot/projects/mips2/src/sys/security/audit/audit_bsm_errno.c#2 integrate .. //depot/projects/mips2/src/sys/security/audit/audit_bsm_socket_type.c#1 branch .. //depot/projects/mips2/src/sys/security/audit/audit_bsm_token.c#8 integrate .. //depot/projects/mips2/src/sys/sys/param.h#25 integrate .. //depot/projects/mips2/src/tools/sched/schedgraph.py#7 integrate .. //depot/projects/mips2/src/tools/tools/net80211/scripts/setup.tdma-master#1 branch .. //depot/projects/mips2/src/tools/tools/net80211/scripts/setup.tdma-slave#1 branch .. //depot/projects/mips2/src/usr.bin/make/job.c#8 integrate .. //depot/projects/mips2/src/usr.bin/make/main.c#12 integrate .. //depot/projects/mips2/src/usr.bin/netstat/inet6.c#8 integrate .. //depot/projects/mips2/src/usr.sbin/boot0cfg/boot0cfg.8#4 integrate .. //depot/projects/mips2/src/usr.sbin/crunch/crunchgen/crunchgen.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/usbconfig/usbconfig.c#2 integrate Differences ... ==== //depot/projects/mips2/src/Makefile.inc1#27 (text+ko) ==== @@ -1,10 +1,11 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.614 2008/11/12 04:43:55 obrien Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.615 2009/01/15 04:19:03 imp Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir # -DNO_CLEAN do not clean at all # -DNO_SHARE do not go into share subdir +# -DKERNFAST define NO_KERNELCONFIG, NO_KERNELCLEAN and NO_KERNELCONFIG # -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel # -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel # -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel @@ -697,6 +698,11 @@ # be set to cross-build, we have to make sure TARGET is set # properly. +.if defined(KERNFAST) +NO_KERNELCLEAN= t +NO_KERNELCONFIG= t +NO_KERNELDEPEND= t +.endif .if !defined(KERNCONF) && defined(KERNEL) KERNCONF= ${KERNEL} KERNWARN= ==== //depot/projects/mips2/src/UPDATING#26 (text+ko) ==== @@ -22,6 +22,12 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090115: + TCP Appropriate Byte Counting (RFC 3465) support added to kernel. + New field in struct tcpcb breaks ABI, so bump __FreeBSD_version to + 800061. User space tools that rely on the size of struct tcpcb in + tcp_var.h (e.g. sockstat) need to be recompiled. + 20081225: ng_tty(4) module updated to match the new TTY subsystem. Due to API change, user-level applications must be updated. @@ -1201,4 +1207,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.557 2008/12/25 10:05:00 mav Exp $ +$FreeBSD: src/UPDATING,v 1.558 2009/01/15 06:44:22 lstewart Exp $ ==== //depot/projects/mips2/src/bin/kenv/kenv.1#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/kenv/kenv.1,v 1.13 2005/11/17 12:15:22 ru Exp $ +.\" $FreeBSD: src/bin/kenv/kenv.1,v 1.16 2009/01/13 18:25:56 maxim Exp $ .\" -.Dd September 13, 2005 +.Dd January 13, 2009 .Dt KENV 1 .Os .Sh NAME @@ -67,8 +67,28 @@ .Fl q option is set, warnings normally printed as a result of being unable to perform the requested operation will be suppressed. +.Pp +Variables can be added to the kernel environment using the +.Xr /boot/loader.conf +file, or also statically compiled into the kernel using the statement +.Pp +.Dl Ic env Ar filename +.Pp +in the kernel config file. +The file can contain lines of the form +.Pp +.Dl name = "value" # this is a comment +.Pp +where whitespace around name and '=', and +everything after a '#' character, are ignored. Almost any printable +character except '=' is acceptable as part of a name. Quotes +are optional and necessary only if the value contains +whitespace. +.Pp .Sh SEE ALSO .Xr kenv 2 , +.Xr config 5 , +.Xr loader.conf 5 , .Xr loader 8 .Sh HISTORY The ==== //depot/projects/mips2/src/bin/ln/ln.1#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ln.1 8.2 (Berkeley) 12/30/93 -.\" $FreeBSD: src/bin/ln/ln.1,v 1.33 2008/06/06 08:27:59 keramida Exp $ +.\" $FreeBSD: src/bin/ln/ln.1,v 1.34 2009/01/13 15:24:35 trhodes Exp $ .\" .Dd June 6, 2008 .Dt LN 1 @@ -38,7 +38,7 @@ .Sh NAME .Nm ln , .Nm link -.Nd make links +.Nd link files .Sh SYNOPSIS .Nm .Op Fl s Op Fl F @@ -57,8 +57,13 @@ .Sh DESCRIPTION The .Nm -utility creates a new directory entry (linked file) which has the -same modes as the original file. +utility creates a new directory entry (linked file) for the file name +specified by +.Ar target_file . +The +.Ar target_file +will be created with the same file modes as the +.Ar source_file . It is useful for maintaining multiple copies of a file in many places at once without using up storage for the .Dq copies ; @@ -148,7 +153,7 @@ A hard link to a file is indistinguishable from the original directory entry; any changes to a file are effectively independent of the name used to reference the file. -Hard links may not normally refer to directories and may not span file systems. +Directories may not be hardlinked, and hard links may not span file systems. .Pp A symbolic link contains the name of the file to which it is linked. ==== //depot/projects/mips2/src/contrib/ntp/ntpd/ntp_crypto.c#3 (text+ko) ==== @@ -1612,7 +1612,7 @@ */ EVP_VerifyInit(&ctx, peer->digest); EVP_VerifyUpdate(&ctx, (u_char *)&ep->tstamp, vallen + 12); - if (!EVP_VerifyFinal(&ctx, (u_char *)&ep->pkt[i], siglen, pkey)) + if (EVP_VerifyFinal(&ctx, (u_char *)&ep->pkt[i], siglen, pkey) <= 0) return (XEVNT_SIG); if (peer->crypto & CRYPTO_FLAG_VRFY) { ==== //depot/projects/mips2/src/contrib/openbsm/INSTALL#2 (text) ==== @@ -9,6 +9,12 @@ ./configure make +If doing development work on OpenBSM with gcc, the following invocation of +configure may be preferred in order to generate full compiler warnings and +force the compile to fail if a warning is found: + + CFLAGS="-Wall -Werror" ./configure + To install, use: make install ==== //depot/projects/mips2/src/contrib/openbsm/NEWS#2 (text) ==== @@ -1,5 +1,24 @@ OpenBSM Version History +OpenBSM 1.1 alpha 5 + +- Stub libauditd(3) man page added. +- All BSM error number constants with BSM_ERRNO_. +- Interfaces to convert between local and BSM socket types and protocol + families have been added: au_bsm_to_domain(3), au_bsm_to_socket_type(3), + au_domain_to_bsm(3), and au_socket_type_to_bsm(3), along with definitions + of constants in audit_domain.h and audit_socket_type.h. This improves + interoperability by converting local constant spaces, which vary by OS, to + and from Solaris constants (where available) or OpenBSM constants for + protocol domains not present in Solaris (a fair number). These routines + should be used when generating and interpreting extended socket tokens. +- Fix build warnings with full gcc warnings enabled on most supported + platforms. +- Don't compile error strings into bsm_errno.c when building it in the kernel + environment. +- When started by launchd, use the label com.apple.auditd rather than + org.trustedbsd.auditd. + OpenBSM 1.1 alpha 4 - With the addition of BSM error number mapping, we also need to map the @@ -393,4 +412,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#21 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#27 $ ==== //depot/projects/mips2/src/contrib/openbsm/VERSION#7 (text) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_1_ALPHA_4 +OPENBSM_1_1_ALPHA_5 ==== //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd.8#6 (text) ==== @@ -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. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#16 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#17 $ .\" .Dd December 11, 2008 .Dt AUDITD 8 @@ -115,6 +115,7 @@ .Nm . .Sh SEE ALSO .Xr asl 3 , +.Xr libauditd 3 , .Xr audit 4 , .Xr audit_class 5 , .Xr audit_control 5 , ==== //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd.c#6 (text) ==== @@ -26,7 +26,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. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#40 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#41 $ */ #include @@ -252,7 +252,7 @@ */ err = auditd_read_dirs(audit_warn_soft, audit_warn_hard); if (err) { - auditd_log_err("auditd_read_dirs() %s: %m", + auditd_log_err("auditd_read_dirs(): %s", auditd_strerror(err)); if (err == ADE_HARDLIM) audit_warn_allhard(); ==== //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd_darwin.c#2 (text) ==== @@ -26,7 +26,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. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#2 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#3 $ */ #include @@ -83,7 +83,7 @@ #endif /* __BSM_INTERNAL_NOTIFY_KEY */ #ifndef __AUDIT_LAUNCHD_LABEL -#define __AUDIT_LAUNCHD_LABEL "org.trustedbsd.auditd" +#define __AUDIT_LAUNCHD_LABEL "com.apple.auditd" #endif /* __AUDIT_LAUNCHD_LABEL */ #define MAX_MSG_SIZE 4096 @@ -100,7 +100,7 @@ if (debug) opt = ASL_OPT_STDERR; - au_aslclient = asl_open("auditd", "org.trustedbsd.auditd", opt); + au_aslclient = asl_open("auditd", "com.apple.auditd", opt); au_aslmsg = asl_new(ASL_TYPE_MSG); #ifdef ASL_KEY_READ_UID ==== //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd_fbsd.c#2 (text) ==== @@ -26,7 +26,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. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_fbsd.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_fbsd.c#2 $ */ #include @@ -35,9 +35,11 @@ #include #include +#include #include +#include #include -#include +#include #include #include ==== //depot/projects/mips2/src/contrib/openbsm/bin/auditreduce/auditreduce.c#6 (text) ==== @@ -26,7 +26,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/bin/auditreduce/auditreduce.c#29 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#31 $ */ /* @@ -41,6 +41,9 @@ */ #include + +#define _GNU_SOURCE /* Required for strptime() on glibc2. */ + #ifdef HAVE_FULL_QUEUE_H #include #else ==== //depot/projects/mips2/src/contrib/openbsm/bsm/auditd_lib.h#2 (text) ==== @@ -26,7 +26,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/bsm/auditd_lib.h#2 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#3 $ */ #ifndef _BSM_AUDITD_LIB_H_ @@ -57,7 +57,7 @@ * Path of auditd plist file for launchd. */ #define AUDITD_PLIST_FILE \ - "/System/Library/LaunchDaemons/org.trustedbsd.auditd.plist" + "/System/Library/LaunchDaemons/com.apple.auditd.plist" /* * Error return codes for auditd_lib functions. ==== //depot/projects/mips2/src/contrib/openbsm/bsm/libbsm.h#5 (text) ==== @@ -26,7 +26,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/bsm/libbsm.h#40 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#41 $ */ #ifndef _LIBBSM_H_ @@ -821,14 +821,22 @@ */ void au_print_xml_header(FILE *outfp); void au_print_xml_footer(FILE *outfp); -__END_DECLS /* - * Functions relating to BSM<->errno conversion. + * BSM library routines for converting between local and BSM constant spaces. + * (Note: some of these are replicated in audit_record.h for the benefit of + * the FreeBSD and Mac OS X kernels) */ -int au_bsm_to_errno(u_char bsm_error, int *errorp); -u_char au_errno_to_bsm(int error); -const char *au_strerror(u_char bsm_error); +int au_bsm_to_domain(u_short bsm_domain, int *local_domainp); +int au_bsm_to_errno(u_char bsm_error, int *errorp); +int au_bsm_to_socket_type(u_short bsm_socket_type, + int *local_socket_typep); +u_short au_domain_to_bsm(int local_domain); +u_char au_errno_to_bsm(int local_errno); +u_short au_socket_type_to_bsm(int local_socket_type); + +const char *au_strerror(u_char bsm_error); +__END_DECLS /* * The remaining APIs are associated with Apple's BSM implementation, in ==== //depot/projects/mips2/src/contrib/openbsm/configure#7 (text) ==== @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#47 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#49 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for OpenBSM 1.1alpha4. +# Generated by GNU Autoconf 2.61 for OpenBSM 1.1alpha5. # # Report bugs to . # @@ -729,8 +729,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.1alpha4' -PACKAGE_STRING='OpenBSM 1.1alpha4' +PACKAGE_VERSION='1.1alpha5' +PACKAGE_STRING='OpenBSM 1.1alpha5' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' ac_unique_file="bin/auditreduce/auditreduce.c" @@ -1404,7 +1404,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.1alpha4 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.1alpha5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1474,7 +1474,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.1alpha4:";; + short | recursive ) echo "Configuration of OpenBSM 1.1alpha5:";; esac cat <<\_ACEOF @@ -1580,7 +1580,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.1alpha4 +OpenBSM configure 1.1alpha5 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1594,7 +1594,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.1alpha4, which was +It was created by OpenBSM $as_me 1.1alpha5, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -19076,7 +19076,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.1alpha4 + VERSION=1.1alpha5 cat >>confdefs.h <<_ACEOF @@ -23584,7 +23584,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenBSM $as_me 1.1alpha4, which was +This file was extended by OpenBSM $as_me 1.1alpha5, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23637,7 +23637,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenBSM config.status 1.1alpha4 +OpenBSM config.status 1.1alpha5 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ==== //depot/projects/mips2/src/contrib/openbsm/configure.ac#7 (text) ==== @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([OpenBSM], [1.1alpha4], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#48 $]) +AC_INIT([OpenBSM], [1.1alpha5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#49 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) ==== //depot/projects/mips2/src/contrib/openbsm/libauditd/Makefile.am#2 (text) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.am#2 $ # if USE_NATIVE_INCLUDES @@ -13,5 +13,5 @@ libauditd_la_SOURCES = \ auditd_lib.c -#man3_MANS = \ -# libauditd.3 +man3_MANS = \ + libauditd.3 ==== //depot/projects/mips2/src/contrib/openbsm/libauditd/Makefile.in#2 (text) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.in#2 $ # VPATH = @srcdir@ @@ -51,7 +51,7 @@ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libdir)" +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) libauditd_la_LIBADD = @@ -71,6 +71,9 @@ $(LDFLAGS) -o $@ SOURCES = $(libauditd_la_SOURCES) DIST_SOURCES = $(libauditd_la_SOURCES) +man3dir = $(mandir)/man3 +NROFF = nroff +MANS = $(man3_MANS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -188,6 +191,9 @@ libauditd_la_SOURCES = \ auditd_lib.c +man3_MANS = \ + libauditd.3 + all: all-am .SUFFIXES: @@ -285,6 +291,51 @@ clean-libtool: -rm -rf .libs _libs +install-man3: $(man3_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)" + @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.3*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 3*) ;; \ + *) ext='3' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \ + done +uninstall-man3: + @$(NORMAL_UNINSTALL) + @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.3*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 3*) ;; \ + *) ext='3' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man3dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man3dir)/$$inst"; \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -362,9 +413,9 @@ done check-am: all-am check: check-am -all-am: Makefile $(LTLIBRARIES) +all-am: Makefile $(LTLIBRARIES) $(MANS) installdirs: - for dir in "$(DESTDIR)$(libdir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -412,7 +463,7 @@ info-am: -install-data-am: +install-data-am: install-man install-dvi: install-dvi-am @@ -422,7 +473,7 @@ install-info: install-info-am -install-man: +install-man: install-man3 install-pdf: install-pdf-am @@ -448,7 +499,9 @@ ps-am: -uninstall-am: uninstall-libLTLIBRARIES +uninstall-am: uninstall-libLTLIBRARIES uninstall-man + +uninstall-man: uninstall-man3 .MAKE: install-am install-strip @@ -459,16 +512,14 @@ install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + install-libLTLIBRARIES install-man install-man3 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES - + tags uninstall uninstall-am uninstall-libLTLIBRARIES \ + uninstall-man uninstall-man3 -#man3_MANS = \ -# libauditd.3 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: ==== //depot/projects/mips2/src/contrib/openbsm/libauditd/auditd_lib.c#2 (text) ==== @@ -26,7 +26,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/libauditd/auditd_lib.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#2 $ */ #include @@ -823,7 +823,7 @@ */ if (auditon(A_GETCOND, &cond, sizeof(cond)) < 0) return (-1); - if (cond == AUC_DISABLED) + if (cond == AUC_NOAUDIT) return (0); /* ==== //depot/projects/mips2/src/contrib/openbsm/libbsm/Makefile.am#3 (text) ==== @@ -1,5 +1,5 @@ # >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 15 19:57:34 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 396BC1065695; Thu, 15 Jan 2009 19:57:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA59C1065690 for ; Thu, 15 Jan 2009 19:57:33 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B72C28FC18 for ; Thu, 15 Jan 2009 19:57:33 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0FJvXCL094900 for ; Thu, 15 Jan 2009 19:57:33 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0FJvXbp094898 for perforce@freebsd.org; Thu, 15 Jan 2009 19:57:33 GMT (envelope-from imp@freebsd.org) Date: Thu, 15 Jan 2009 19:57:33 GMT Message-Id: <200901151957.n0FJvXbp094898@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 156226 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Jan 2009 19:57:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=156226 Change 156226 by imp@imp_lighthouse on 2009/01/15 19:56:38 diff reduction against -head Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/machdep.c#48 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/machdep.c#48 (text+ko) ==== @@ -81,7 +81,6 @@ #include #include #include -#include #include #include #include @@ -158,11 +157,11 @@ if (boothowto & RB_VERBOSE) bootverbose++; - printf("real memory = %lu (%luK bytes)\n", ptoa(realmem), ptoa(realmem) / 1024); bootverbose++; printf("real memory = %lu (%luK bytes)\n", ptoa(realmem), ptoa(realmem) / 1024); + /* * Display any holes after the first chunk of extended memory. */ @@ -284,6 +283,8 @@ PCPU_SET(curpcb, thread0.td_pcb); } +struct msgbuf *msgbufp=0; + /* * Initialize the hardware exception vectors, and the jump table used to * call locore cache and TLB management functions, based on the kind @@ -418,5 +419,13 @@ void dumpsys(struct dumperinfo *di __unused) { + printf("Kernel dumps not implemented on this architecture\n"); } + +int +cpu_idle_wakeup(int cpu) +{ + + return (0); +} From owner-p4-projects@FreeBSD.ORG Thu Jan 15 22:41:31 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B4701065675; Thu, 15 Jan 2009 22:41:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B89921065670 for ; Thu, 15 Jan 2009 22:41:30 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6C1818FC12 for ; Thu, 15 Jan 2009 22:41:30 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0FMfUD4021158 for ; Thu, 15 Jan 2009 22:41:30 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0FMfSvS021154 for perforce@freebsd.org; Thu, 15 Jan 2009 22:41:28 GMT (envelope-from jhb@freebsd.org) Date: Thu, 15 Jan 2009 22:41:28 GMT Message-Id: <200901152241.n0FMfSvS021154@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 156237 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Jan 2009 22:41:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=156237 Change 156237 by jhb@jhb_jhbbsd on 2009/01/15 22:41:24 IFC @156229 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/amd64_mem.c#9 integrate .. //depot/projects/smpng/sys/amd64/amd64/exception.S#21 integrate .. //depot/projects/smpng/sys/amd64/amd64/genassym.c#25 integrate .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#31 integrate .. //depot/projects/smpng/sys/amd64/amd64/initcpu.c#9 integrate .. //depot/projects/smpng/sys/amd64/amd64/msi.c#9 integrate .. //depot/projects/smpng/sys/amd64/conf/DEFAULTS#10 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#70 integrate .. //depot/projects/smpng/sys/amd64/conf/USB2#1 branch .. //depot/projects/smpng/sys/amd64/include/cputypes.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/elf.h#6 integrate .. //depot/projects/smpng/sys/amd64/include/md_var.h#18 integrate .. //depot/projects/smpng/sys/amd64/include/specialreg.h#19 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#34 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc.c#17 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_feroceon.S#2 delete .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_sheeva.S#1 branch .. //depot/projects/smpng/sys/arm/arm/elf_trampoline.c#19 integrate .. //depot/projects/smpng/sys/arm/arm/identcpu.c#14 integrate .. //depot/projects/smpng/sys/arm/conf/AVILA#11 integrate .. //depot/projects/smpng/sys/arm/conf/AVILA.hints#3 integrate .. //depot/projects/smpng/sys/arm/conf/CAMBRIA#1 branch .. //depot/projects/smpng/sys/arm/conf/CAMBRIA.hints#1 branch .. //depot/projects/smpng/sys/arm/conf/DEFAULTS#2 integrate .. //depot/projects/smpng/sys/arm/conf/EP80219#9 integrate .. //depot/projects/smpng/sys/arm/conf/HL200#6 integrate .. //depot/projects/smpng/sys/arm/conf/IQ31244#18 integrate .. //depot/projects/smpng/sys/arm/conf/NSLU#5 integrate .. //depot/projects/smpng/sys/arm/include/armreg.h#8 integrate .. //depot/projects/smpng/sys/arm/include/cpufunc.h#14 integrate .. //depot/projects/smpng/sys/arm/include/elf.h#7 integrate .. //depot/projects/smpng/sys/arm/include/ieee.h#3 integrate .. //depot/projects/smpng/sys/arm/include/intr.h#11 integrate .. //depot/projects/smpng/sys/arm/mv/common.c#3 integrate .. //depot/projects/smpng/sys/arm/mv/discovery/db78xxx.c#3 integrate .. //depot/projects/smpng/sys/arm/mv/discovery/discovery.c#3 integrate .. //depot/projects/smpng/sys/arm/mv/files.mv#3 integrate .. //depot/projects/smpng/sys/arm/mv/gpio.c#2 integrate .. //depot/projects/smpng/sys/arm/mv/kirkwood/db88f6xxx.c#3 integrate .. //depot/projects/smpng/sys/arm/mv/kirkwood/kirkwood.c#3 integrate .. //depot/projects/smpng/sys/arm/mv/mv_machdep.c#4 integrate .. //depot/projects/smpng/sys/arm/mv/mv_pci.c#3 integrate .. //depot/projects/smpng/sys/arm/mv/mvreg.h#3 integrate .. //depot/projects/smpng/sys/arm/mv/mvvar.h#3 integrate .. //depot/projects/smpng/sys/arm/mv/obio.c#3 integrate .. //depot/projects/smpng/sys/arm/mv/orion/db88f5xxx.c#3 integrate .. //depot/projects/smpng/sys/arm/mv/orion/orion.c#3 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/avila_ata.c#5 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/avila_led.c#2 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/avila_machdep.c#9 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/cambria_fled.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/cambria_led.c#1 branch .. //depot/projects/smpng/sys/arm/xscale/ixp425/files.avila#4 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/files.ixp425#4 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/if_npe.c#9 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/if_npereg.h#2 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425.c#8 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_iic.c#4 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_intr.h#2 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_mem.c#3 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_npe.c#6 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_npevar.h#3 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_pci.c#6 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_qmgr.c#5 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_timer.c#3 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_wdog.c#3 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425reg.h#3 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425var.h#4 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/std.avila#2 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/std.ixp435#1 branch .. //depot/projects/smpng/sys/boot/Makefile#30 integrate .. //depot/projects/smpng/sys/boot/arm/ixp425/boot2/arm_init.S#2 integrate .. //depot/projects/smpng/sys/boot/arm/ixp425/boot2/boot2.c#2 integrate .. //depot/projects/smpng/sys/boot/arm/ixp425/boot2/ixp425_board.c#2 integrate .. //depot/projects/smpng/sys/boot/arm/ixp425/boot2/lib.h#2 integrate .. //depot/projects/smpng/sys/boot/common/load.c#4 delete .. //depot/projects/smpng/sys/boot/forth/loader.4th#5 integrate .. //depot/projects/smpng/sys/boot/forth/pnp.4th#3 integrate .. //depot/projects/smpng/sys/boot/forth/support.4th#7 integrate .. //depot/projects/smpng/sys/boot/i386/boot0/Makefile#14 integrate .. //depot/projects/smpng/sys/boot/i386/boot0/boot0.S#11 integrate .. //depot/projects/smpng/sys/boot/i386/gptzfsboot/Makefile#2 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/bootinfo64.c#5 integrate .. //depot/projects/smpng/sys/boot/i386/zfsboot/Makefile#2 integrate .. //depot/projects/smpng/sys/boot/powerpc/uboot/conf.c#2 integrate .. //depot/projects/smpng/sys/boot/uboot/common/main.c#3 integrate .. //depot/projects/smpng/sys/boot/uboot/lib/devicename.c#3 integrate .. //depot/projects/smpng/sys/boot/zfs/zfsimpl.c#4 integrate .. //depot/projects/smpng/sys/bsm/audit.h#12 integrate .. //depot/projects/smpng/sys/bsm/audit_domain.h#1 branch .. //depot/projects/smpng/sys/bsm/audit_errno.h#1 branch .. //depot/projects/smpng/sys/bsm/audit_internal.h#11 integrate .. //depot/projects/smpng/sys/bsm/audit_kevents.h#13 integrate .. //depot/projects/smpng/sys/bsm/audit_record.h#13 integrate .. //depot/projects/smpng/sys/bsm/audit_socket_type.h#1 branch .. //depot/projects/smpng/sys/cam/cam_periph.c#27 integrate .. //depot/projects/smpng/sys/cam/cam_periph.h#7 integrate .. //depot/projects/smpng/sys/cam/cam_sim.c#7 integrate .. //depot/projects/smpng/sys/cam/cam_sim.h#4 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#51 integrate .. //depot/projects/smpng/sys/cam/cam_xpt_sim.h#4 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.c#27 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#35 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ch.c#18 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#83 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#20 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#16 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#32 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ses.c#20 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sg.c#5 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#55 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#71 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#94 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#40 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_windrv.c#8 integrate .. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#28 integrate .. //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#25 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#46 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#46 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_usbd.c#4 integrate .. //depot/projects/smpng/sys/compat/ndis/usbd_var.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#29 integrate .. //depot/projects/smpng/sys/conf/Makefile.arm#34 integrate .. //depot/projects/smpng/sys/conf/NOTES#158 integrate .. //depot/projects/smpng/sys/conf/files#225 integrate .. //depot/projects/smpng/sys/conf/files.amd64#59 integrate .. //depot/projects/smpng/sys/conf/files.i386#116 integrate .. //depot/projects/smpng/sys/conf/files.ia64#61 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#45 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#71 integrate .. //depot/projects/smpng/sys/conf/files.sun4v#8 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#62 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#62 integrate .. //depot/projects/smpng/sys/conf/options#158 integrate .. //depot/projects/smpng/sys/conf/options.arm#19 integrate .. //depot/projects/smpng/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#9 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#32 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_if.c#13 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_subr.c#8 integrate .. //depot/projects/smpng/sys/contrib/rdma/rdma_addr.c#2 integrate .. //depot/projects/smpng/sys/crypto/rc4/rc4.c#4 integrate .. //depot/projects/smpng/sys/crypto/via/padlock.c#13 integrate .. //depot/projects/smpng/sys/crypto/via/padlock_hash.c#2 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_asus.c#14 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_smbat.c#5 integrate .. //depot/projects/smpng/sys/dev/adb/adb_kbd.c#3 integrate .. //depot/projects/smpng/sys/dev/agp/agp.c#4 integrate .. //depot/projects/smpng/sys/dev/agp/agp_amd64.c#2 integrate .. //depot/projects/smpng/sys/dev/agp/agp_i810.c#6 integrate .. //depot/projects/smpng/sys/dev/agp/agppriv.h#2 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#70 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#60 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#44 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cam.c#37 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-ahci.c#2 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-sis.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_eeprom_v14.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_internal.h#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5111.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5312/ar5312.h#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_rate/amrr/amrr.c#15 integrate .. //depot/projects/smpng/sys/dev/ath/ath_rate/onoe/onoe.c#15 integrate .. //depot/projects/smpng/sys/dev/ath/ath_rate/sample/sample.c#14 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#62 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_pci.c#20 integrate .. //depot/projects/smpng/sys/dev/ath/if_athioctl.h#17 integrate .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#39 integrate .. //depot/projects/smpng/sys/dev/atkbdc/psm.c#14 integrate .. //depot/projects/smpng/sys/dev/bce/if_bce.c#23 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#35 integrate .. //depot/projects/smpng/sys/dev/cfe/cfe_console.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_ael1002.c#9 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#18 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#14 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#4 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#3 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons_crom.c#9 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons_os.c#15 integrate .. //depot/projects/smpng/sys/dev/drm/drmP.h#20 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.c#11 integrate .. //depot/projects/smpng/sys/dev/drm/drm_scatter.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_irq.c#9 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.c#5 integrate .. //depot/projects/smpng/sys/dev/exca/exca.c#24 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#86 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_core.c#2 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_logging.c#12 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#29 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#50 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pccard.c#9 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_usb.c#5 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndisvar.h#21 integrate .. //depot/projects/smpng/sys/dev/iicbus/ad7418.c#4 integrate .. //depot/projects/smpng/sys/dev/iicbus/ds1672.c#3 integrate .. //depot/projects/smpng/sys/dev/iicbus/icee.c#4 integrate .. //depot/projects/smpng/sys/dev/iicbus/if_ic.c#18 integrate .. //depot/projects/smpng/sys/dev/iicbus/iic.c#16 integrate .. //depot/projects/smpng/sys/dev/iicbus/iicbus.c#12 integrate .. //depot/projects/smpng/sys/dev/iicbus/iicsmb.c#9 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#59 integrate .. //depot/projects/smpng/sys/dev/md/md.c#86 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi.c#25 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/mge/if_mge.c#2 integrate .. //depot/projects/smpng/sys/dev/mge/if_mgevar.h#2 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.c#26 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.h#25 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#28 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_raid.c#14 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_user.c#2 integrate .. //depot/projects/smpng/sys/dev/msk/if_msk.c#13 integrate .. //depot/projects/smpng/sys/dev/msk/if_mskreg.h#7 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfe.c#15 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_bus_subr.c#2 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_bus_subr.h#2 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_if.m#1 branch .. //depot/projects/smpng/sys/dev/ofw/ofw_iicbus.c#1 branch .. //depot/projects/smpng/sys/dev/ofw/ofw_standard.c#1 branch .. //depot/projects/smpng/sys/dev/ofw/ofwvar.h#1 branch .. //depot/projects/smpng/sys/dev/ofw/openfirm.c#13 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirm.h#10 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirmio.c#13 integrate .. //depot/projects/smpng/sys/dev/ofw/openpromio.c#9 integrate .. //depot/projects/smpng/sys/dev/pccard/pccardvar.h#28 integrate .. //depot/projects/smpng/sys/dev/pcn/if_pcn.c#2 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#45 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#68 integrate .. //depot/projects/smpng/sys/dev/snp/snp.c#33 integrate .. //depot/projects/smpng/sys/dev/sound/pci/au88x0.c#14 delete .. //depot/projects/smpng/sys/dev/sound/pci/au88x0.h#3 delete .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#22 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#45 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#31 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#41 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.h#34 integrate .. //depot/projects/smpng/sys/dev/syscons/scterm-dumb.c#5 delete .. //depot/projects/smpng/sys/dev/syscons/scterm-sc.c#10 delete .. //depot/projects/smpng/sys/dev/syscons/scterm-teken.c#1 branch .. //depot/projects/smpng/sys/dev/syscons/scterm.c#3 integrate .. //depot/projects/smpng/sys/dev/syscons/sctermvar.h#4 delete .. //depot/projects/smpng/sys/dev/syscons/syscons.c#68 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.h#21 integrate .. //depot/projects/smpng/sys/dev/syscons/teken/Makefile#1 branch .. //depot/projects/smpng/sys/dev/syscons/teken/gensequences#1 branch .. //depot/projects/smpng/sys/dev/syscons/teken/sequences#1 branch .. //depot/projects/smpng/sys/dev/syscons/teken/teken.c#1 branch .. //depot/projects/smpng/sys/dev/syscons/teken/teken.h#1 branch .. //depot/projects/smpng/sys/dev/syscons/teken/teken_demo.c#1 branch .. //depot/projects/smpng/sys/dev/syscons/teken/teken_stress.c#1 branch .. //depot/projects/smpng/sys/dev/syscons/teken/teken_subr.h#1 branch .. //depot/projects/smpng/sys/dev/syscons/teken/teken_subr_compat.h#1 branch .. //depot/projects/smpng/sys/dev/syscons/teken/teken_wcwidth.h#1 branch .. //depot/projects/smpng/sys/dev/uart/uart_cpu_mv.c#2 integrate .. //depot/projects/smpng/sys/dev/uart/uart_tty.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/ehci.c#36 integrate .. //depot/projects/smpng/sys/dev/usb/ehci_ddb.c#1 branch .. //depot/projects/smpng/sys/dev/usb/ehci_ixp4xx.c#1 branch .. //depot/projects/smpng/sys/dev/usb/ehci_mbus.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#29 integrate .. //depot/projects/smpng/sys/dev/usb/ehcireg.h#11 integrate .. //depot/projects/smpng/sys/dev/usb/ehcivar.h#17 integrate .. //depot/projects/smpng/sys/dev/usb/if_zyd.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/ucom.c#34 integrate .. //depot/projects/smpng/sys/dev/usb/ucomvar.h#14 integrate .. //depot/projects/smpng/sys/dev/usb/uftdi.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/uhci_pci.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#69 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#121 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.h#23 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#40 integrate .. //depot/projects/smpng/sys/dev/usb2/bluetooth/ng_ubt2.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/bluetooth/ubtbcmfw2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/at91dci.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/at91dci.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/at91dci_atmelarm.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/atmegadci.c#1 branch .. //depot/projects/smpng/sys/dev/usb2/controller/atmegadci.h#1 branch .. //depot/projects/smpng/sys/dev/usb2/controller/atmegadci_atmelarm.c#1 branch .. //depot/projects/smpng/sys/dev/usb2/controller/ehci2.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/ehci2.h#3 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/ehci2_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/musb2_otg.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/musb2_otg.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/musb2_otg_atmelarm.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/ohci2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/ohci2.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/ohci2_atmelarm.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/ohci2_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/uhci2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/uhci2.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/uhci2_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/usb2_bus.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/usb2_controller.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/usb2_controller.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/uss820dci.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/uss820dci.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/uss820dci_atmelarm.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_busdma.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_busdma.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_compat_linux.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_compat_linux.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_config_td.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_config_td.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_core.h#3 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_debug.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_dev.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_dev.h#3 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_device.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_device.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_dynamic.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_dynamic.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_error.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_generic.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_handle_request.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_hid.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_hub.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_hub.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_lookup.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_mbuf.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_msctest.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_msctest.h#3 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_parse.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_parse.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_process.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_process.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_request.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_request.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_sw_transfer.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_sw_transfer.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_transfer.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_transfer.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_util.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_aue2.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_aue2_reg.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_auereg.h#1 branch .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_axe2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_axe2_reg.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_axereg.h#1 branch .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_cdce2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_cdce2_reg.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_cdcereg.h#1 branch .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_cue2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_cue2_reg.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_cuereg.h#1 branch .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_kue2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_kue2_fw.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_kue2_reg.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_kuefw.h#1 branch .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_kuereg.h#1 branch .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_rue2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_rue2_reg.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_ruereg.h#1 branch .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_udav2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_udav2_reg.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_udavreg.h#1 branch .. //depot/projects/smpng/sys/dev/usb2/ethernet/usb2_ethernet.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/ethernet/usb2_ethernet.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/image/uscanner2.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/include/usb2_defs.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/include/usb2_devid.h#3 integrate .. //depot/projects/smpng/sys/dev/usb2/include/usb2_devtable.h#3 integrate .. //depot/projects/smpng/sys/dev/usb2/include/usb2_ioctl.h#3 integrate .. //depot/projects/smpng/sys/dev/usb2/include/usb2_standard.h#3 integrate .. //depot/projects/smpng/sys/dev/usb2/input/uhid2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/input/ukbd2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/input/ums2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/misc/udbp2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/misc/ufm2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/quirk/usb2_quirk.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/serial/u3g2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/serial/uark2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/serial/ubsa2.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/serial/ubser2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/serial/uchcom2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/serial/ucycom2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/serial/ufoma2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/serial/uftdi2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/serial/ugensa2.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/serial/uipaq2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/serial/ulpt2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/serial/umct2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/serial/umodem2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/serial/umoscom2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/serial/uplcom2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/serial/usb2_serial.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/serial/usb2_serial.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/serial/uvisor2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/serial/uvscom2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/sound/uaudio2.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/sound/uaudio2.h#2 integrate .. //depot/projects/smpng/sys/dev/usb2/storage/ata-usb2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/storage/umass2.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/storage/urio2.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/storage/ustorage2_fs.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/template/usb2_template.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/wlan/if_rum2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/wlan/if_rum2_fw.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/wlan/if_rum2_reg.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/wlan/if_rum2_var.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/wlan/if_rumfw.h#1 branch .. //depot/projects/smpng/sys/dev/usb2/wlan/if_rumreg.h#1 branch .. //depot/projects/smpng/sys/dev/usb2/wlan/if_rumvar.h#1 branch .. //depot/projects/smpng/sys/dev/usb2/wlan/if_ural2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/wlan/if_ural2_reg.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/wlan/if_ural2_var.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/wlan/if_uralreg.h#1 branch .. //depot/projects/smpng/sys/dev/usb2/wlan/if_uralvar.h#1 branch .. //depot/projects/smpng/sys/dev/usb2/wlan/if_zyd2.c#2 integrate .. //depot/projects/smpng/sys/dev/usb2/wlan/if_zyd2_fw.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/wlan/if_zyd2_reg.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/wlan/if_zydfw.h#1 branch .. //depot/projects/smpng/sys/dev/usb2/wlan/if_zydreg.h#1 branch .. //depot/projects/smpng/sys/dev/vr/if_vr.c#4 integrate .. //depot/projects/smpng/sys/dev/xen/blkfront/blkfront.c#4 integrate .. //depot/projects/smpng/sys/dev/xen/console/console.c#4 integrate .. //depot/projects/smpng/sys/dev/xen/console/xencons_ring.c#2 integrate .. //depot/projects/smpng/sys/dev/xen/evtchn/evtchn_dev.c#2 integrate .. //depot/projects/smpng/sys/dev/xen/netfront/netfront.c#4 integrate .. //depot/projects/smpng/sys/fs/deadfs/dead_vnops.c#17 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#74 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#38 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_conv.c#19 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_denode.c#32 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#47 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vnops.c#32 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_vnops.c#20 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_map.c#15 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vncache.c#30 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#53 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#42 integrate .. //depot/projects/smpng/sys/geom/geom_vfs.c#8 integrate .. //depot/projects/smpng/sys/geom/part/g_part.c#13 integrate .. //depot/projects/smpng/sys/geom/part/g_part_bsd.c#9 integrate .. //depot/projects/smpng/sys/geom/part/g_part_pc98.c#6 integrate .. //depot/projects/smpng/sys/geom/part/g_part_vtoc8.c#5 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_plex.c#15 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_bitops.h#3 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_vnops.c#13 integrate .. //depot/projects/smpng/sys/gnu/fs/reiserfs/reiserfs_vnops.c#4 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#9 integrate .. //depot/projects/smpng/sys/i386/conf/DEFAULTS#12 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#102 integrate .. //depot/projects/smpng/sys/i386/conf/USB2#1 branch .. //depot/projects/smpng/sys/i386/conf/XEN#6 integrate .. //depot/projects/smpng/sys/i386/cpufreq/est.c#14 integrate .. //depot/projects/smpng/sys/i386/i386/exception.s#30 integrate .. //depot/projects/smpng/sys/i386/i386/genassym.c#39 integrate .. //depot/projects/smpng/sys/i386/i386/i686_mem.c#13 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#63 integrate .. //depot/projects/smpng/sys/i386/i386/initcpu.c#33 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#135 integrate .. //depot/projects/smpng/sys/i386/i386/msi.c#9 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#89 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysi86.c#12 integrate .. //depot/projects/smpng/sys/i386/include/elf.h#9 integrate .. //depot/projects/smpng/sys/i386/include/specialreg.h#23 integrate .. //depot/projects/smpng/sys/i386/include/xen/evtchn.h#4 delete .. //depot/projects/smpng/sys/i386/include/xen/hypervisor.h#2 delete .. //depot/projects/smpng/sys/i386/include/xen/xen_intr.h#4 delete .. //depot/projects/smpng/sys/i386/include/xen/xenfunc.h#3 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#62 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#64 integrate .. //depot/projects/smpng/sys/i386/xen/clock.c#4 integrate .. //depot/projects/smpng/sys/i386/xen/mp_machdep.c#6 integrate .. //depot/projects/smpng/sys/i386/xen/mptable.c#2 integrate .. //depot/projects/smpng/sys/i386/xen/pmap.c#4 integrate .. //depot/projects/smpng/sys/i386/xen/xen_machdep.c#7 integrate .. //depot/projects/smpng/sys/ia64/include/elf.h#13 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#62 integrate .. //depot/projects/smpng/sys/kern/kern_cpu.c#13 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#120 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#61 integrate .. //depot/projects/smpng/sys/kern/kern_mbuf.c#30 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#101 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#106 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#56 integrate .. //depot/projects/smpng/sys/kern/kern_timeout.c#44 integrate .. //depot/projects/smpng/sys/kern/kern_xxx.c#24 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#90 integrate .. //depot/projects/smpng/sys/kern/subr_kobj.c#8 integrate .. //depot/projects/smpng/sys/kern/subr_param.c#26 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#55 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#90 integrate .. //depot/projects/smpng/sys/kern/sysv_sem.c#49 integrate .. //depot/projects/smpng/sys/kern/tty.c#81 integrate .. //depot/projects/smpng/sys/kern/tty_pts.c#14 integrate .. //depot/projects/smpng/sys/kern/uipc_cow.c#22 integrate .. //depot/projects/smpng/sys/kern/uipc_debug.c#5 integrate .. //depot/projects/smpng/sys/kern/uipc_domain.c#22 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#85 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#45 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#57 integrate .. //depot/projects/smpng/sys/kern/vfs_export.c#32 integrate .. //depot/projects/smpng/sys/kern/vfs_extattr.c#5 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#54 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#87 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#159 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#139 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#38 integrate .. //depot/projects/smpng/sys/mips/conf/DEFAULTS#2 integrate .. //depot/projects/smpng/sys/mips/idt/idtpci.c#3 integrate .. //depot/projects/smpng/sys/mips/include/elf.h#2 integrate .. //depot/projects/smpng/sys/mips/include/pmap.h#2 integrate .. //depot/projects/smpng/sys/mips/malta/gt_pci.c#4 integrate .. //depot/projects/smpng/sys/mips/mips/busdma_machdep.c#2 integrate .. //depot/projects/smpng/sys/mips/mips/cpu.c#2 integrate .. //depot/projects/smpng/sys/mips/mips/elf64_machdep.c#1 branch .. //depot/projects/smpng/sys/mips/mips/elf_machdep.c#4 integrate .. //depot/projects/smpng/sys/mips/mips/machdep.c#5 integrate .. //depot/projects/smpng/sys/mips/mips/nexus.c#2 integrate .. //depot/projects/smpng/sys/mips/mips/pmap.c#5 integrate .. //depot/projects/smpng/sys/modules/Makefile#152 integrate .. //depot/projects/smpng/sys/modules/ath/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/ath_rate_amrr/Makefile#9 delete .. //depot/projects/smpng/sys/modules/ath_rate_onoe/Makefile#8 delete .. //depot/projects/smpng/sys/modules/ath_rate_sample/Makefile#8 delete .. //depot/projects/smpng/sys/modules/cxgb/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/iwnfw/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/ndis/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/netgraph/Makefile#28 integrate .. //depot/projects/smpng/sys/modules/netgraph/ether_echo/Makefile#1 branch .. //depot/projects/smpng/sys/modules/sound/driver/au88x0/Makefile#2 delete .. //depot/projects/smpng/sys/modules/usb2/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/usb2/controller_atmegadci/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb2/serial_3g/Makefile#1 branch .. //depot/projects/smpng/sys/net/ieee8023ad_lacp.c#12 integrate .. //depot/projects/smpng/sys/net/if.c#109 integrate .. //depot/projects/smpng/sys/net/if_arcsubr.c#25 integrate .. //depot/projects/smpng/sys/net/if_atmsubr.c#27 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#94 integrate .. //depot/projects/smpng/sys/net/if_fddisubr.c#34 integrate .. //depot/projects/smpng/sys/net/if_fwsubr.c#21 integrate .. //depot/projects/smpng/sys/net/if_iso88025subr.c#32 integrate .. //depot/projects/smpng/sys/net/if_lagg.c#15 integrate .. //depot/projects/smpng/sys/net/if_llatbl.c#1 branch .. //depot/projects/smpng/sys/net/if_llatbl.h#1 branch .. //depot/projects/smpng/sys/net/if_loop.c#50 integrate .. //depot/projects/smpng/sys/net/if_media.h#25 integrate .. //depot/projects/smpng/sys/net/if_tun.c#58 integrate .. //depot/projects/smpng/sys/net/if_var.h#57 integrate .. //depot/projects/smpng/sys/net/pfil.c#12 integrate .. //depot/projects/smpng/sys/net/pfil.h#11 integrate .. //depot/projects/smpng/sys/net/radix.c#16 integrate .. //depot/projects/smpng/sys/net/radix_mpath.c#3 integrate .. //depot/projects/smpng/sys/net/route.c#43 integrate .. //depot/projects/smpng/sys/net/route.h#30 integrate .. //depot/projects/smpng/sys/net/rtsock.c#66 integrate .. //depot/projects/smpng/sys/net80211/_ieee80211.h#12 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#32 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.h#16 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_acl.c#7 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_adhoc.c#4 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto.h#12 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto_ccmp.c#9 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto_tkip.c#10 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto_wep.c#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ddb.c#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_dfs.h#2 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.c#17 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_hostap.c#7 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_input.c#43 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_input.h#2 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#39 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.h#18 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#38 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.h#24 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#36 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_power.c#4 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#28 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.h#19 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_regdomain.c#4 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_scan.c#4 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_scan.h#3 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_scan_sta.c#6 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_sta.c#5 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_tdma.c#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211_tdma.h#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#32 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_wds.c#5 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_main.c#8 integrate .. //depot/projects/smpng/sys/netgraph/netflow/netflow.c#19 integrate .. //depot/projects/smpng/sys/netgraph/netgraph.h#36 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#63 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.c#38 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether_echo.c#1 branch .. //depot/projects/smpng/sys/netgraph/ng_ether_echo.h#1 branch .. //depot/projects/smpng/sys/netgraph/ng_mppc.c#18 integrate .. //depot/projects/smpng/sys/netgraph/ng_tty.c#23 integrate .. //depot/projects/smpng/sys/netgraph/ng_vjc.c#9 integrate .. //depot/projects/smpng/sys/netinet/icmp6.h#13 integrate .. //depot/projects/smpng/sys/netinet/icmp_var.h#10 integrate .. //depot/projects/smpng/sys/netinet/if_atm.c#12 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#64 integrate .. //depot/projects/smpng/sys/netinet/if_ether.h#11 integrate .. //depot/projects/smpng/sys/netinet/in.c#46 integrate .. //depot/projects/smpng/sys/netinet/in.h#44 integrate .. //depot/projects/smpng/sys/netinet/in_mcast.c#7 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#89 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#58 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#30 integrate .. //depot/projects/smpng/sys/netinet/in_rmx.c#22 integrate .. //depot/projects/smpng/sys/netinet/in_var.h#23 integrate .. //depot/projects/smpng/sys/netinet/ip_carp.c#31 integrate .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#34 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#44 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#100 integrate .. //depot/projects/smpng/sys/netinet/ip_fw_pfil.c#23 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#93 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#100 integrate .. //depot/projects/smpng/sys/netinet/ipprotosw.h#6 delete .. //depot/projects/smpng/sys/netinet/libalias/alias_ftp.c#7 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_irc.c#8 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_nbt.c#3 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#74 integrate .. //depot/projects/smpng/sys/netinet/tcp_hostcache.c#16 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#122 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#105 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#69 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#44 integrate .. //depot/projects/smpng/sys/netinet/tcp_timewait.c#8 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#72 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#64 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#87 integrate .. //depot/projects/smpng/sys/netinet/udp_var.h#11 integrate .. //depot/projects/smpng/sys/netinet/vinet.h#4 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#49 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#48 integrate .. //depot/projects/smpng/sys/netinet6/in6_gif.c#20 integrate .. //depot/projects/smpng/sys/netinet6/in6_ifattach.c#27 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#57 integrate .. //depot/projects/smpng/sys/netinet6/in6_rmx.c#18 integrate .. //depot/projects/smpng/sys/netinet6/in6_src.c#38 integrate .. //depot/projects/smpng/sys/netinet6/in6_var.h#20 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#56 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#58 integrate .. //depot/projects/smpng/sys/netinet6/ip6_var.h#26 integrate .. //depot/projects/smpng/sys/netinet6/ip6protosw.h#9 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#48 integrate .. //depot/projects/smpng/sys/netinet6/nd6.h#15 integrate .. //depot/projects/smpng/sys/netinet6/nd6_nbr.c#32 integrate .. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#26 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#55 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.h#4 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#53 integrate .. //depot/projects/smpng/sys/netinet6/vinet6.h#4 integrate .. //depot/projects/smpng/sys/netipsec/ipip_var.h#3 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.c#30 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.h#17 integrate .. //depot/projects/smpng/sys/netipsec/key.c#27 integrate .. //depot/projects/smpng/sys/netipsec/vipsec.h#4 integrate .. //depot/projects/smpng/sys/netipsec/xform_ipip.c#18 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#63 integrate .. //depot/projects/smpng/sys/pc98/cbus/scterm-sck.c#4 integrate .. //depot/projects/smpng/sys/pc98/cbus/sctermvar.h#1 branch .. //depot/projects/smpng/sys/pc98/conf/DEFAULTS#11 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#79 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#75 integrate .. //depot/projects/smpng/sys/pci/if_rlreg.h#48 integrate .. //depot/projects/smpng/sys/powerpc/aim/locore.S#5 integrate .. //depot/projects/smpng/sys/powerpc/aim/machdep.c#8 integrate .. //depot/projects/smpng/sys/powerpc/aim/ofw_machdep.c#4 integrate .. //depot/projects/smpng/sys/powerpc/booke/interrupt.c#2 integrate .. //depot/projects/smpng/sys/powerpc/booke/locore.S#4 integrate .. //depot/projects/smpng/sys/powerpc/booke/machdep.c#6 integrate .. //depot/projects/smpng/sys/powerpc/booke/pmap.c#5 integrate .. //depot/projects/smpng/sys/powerpc/booke/support.S#2 delete .. //depot/projects/smpng/sys/powerpc/booke/trap_subr.S#3 integrate .. //depot/projects/smpng/sys/powerpc/conf/NOTES#12 integrate .. //depot/projects/smpng/sys/powerpc/include/elf.h#8 integrate .. //depot/projects/smpng/sys/powerpc/include/ofw_machdep.h#4 integrate .. //depot/projects/smpng/sys/powerpc/include/param.h#15 integrate .. //depot/projects/smpng/sys/powerpc/include/pcpu.h#12 integrate .. //depot/projects/smpng/sys/powerpc/include/pmap.h#21 integrate .. //depot/projects/smpng/sys/powerpc/include/pte.h#8 integrate .. //depot/projects/smpng/sys/powerpc/include/spr.h#10 integrate .. //depot/projects/smpng/sys/powerpc/include/tlb.h#2 integrate .. //depot/projects/smpng/sys/powerpc/mpc85xx/lbc.c#2 integrate .. //depot/projects/smpng/sys/powerpc/mpc85xx/lbc.h#2 integrate .. //depot/projects/smpng/sys/powerpc/mpc85xx/mpc85xx.c#2 integrate .. //depot/projects/smpng/sys/powerpc/mpc85xx/mpc85xx.h#1 branch .. //depot/projects/smpng/sys/powerpc/mpc85xx/nexus.c#2 integrate .. //depot/projects/smpng/sys/powerpc/mpc85xx/ocpbus.c#4 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_pcib_pci.c#7 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_pcibus.c#2 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_syscons.c#12 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_syscons.h#5 integrate .. //depot/projects/smpng/sys/powerpc/powermac/cuda.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powermac/cudavar.h#3 integrate .. //depot/projects/smpng/sys/powerpc/powermac/grackle.c#13 integrate .. //depot/projects/smpng/sys/powerpc/powermac/gracklevar.h#3 integrate .. //depot/projects/smpng/sys/powerpc/powermac/kiic.c#1 branch .. //depot/projects/smpng/sys/powerpc/powermac/macgpio.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powermac/macio.c#18 integrate .. //depot/projects/smpng/sys/powerpc/powermac/uninorth.c#17 integrate .. //depot/projects/smpng/sys/powerpc/powermac/uninorthvar.h#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/genassym.c#31 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap_dispatch.c#13 integrate .. //depot/projects/smpng/sys/security/audit/audit.h#10 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm.c#14 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm_domain.c#1 branch .. //depot/projects/smpng/sys/security/audit/audit_bsm_errno.c#1 branch .. //depot/projects/smpng/sys/security/audit/audit_bsm_socket_type.c#1 branch .. //depot/projects/smpng/sys/security/audit/audit_bsm_token.c#13 integrate .. //depot/projects/smpng/sys/security/audit/audit_pipe.c#13 integrate .. //depot/projects/smpng/sys/security/mac/mac_framework.c#3 integrate .. //depot/projects/smpng/sys/security/mac/mac_inet6.c#3 integrate .. //depot/projects/smpng/sys/security/mac/mac_internal.h#17 integrate .. //depot/projects/smpng/sys/security/mac/mac_policy.h#11 integrate .. //depot/projects/smpng/sys/security/mac/mac_process.c#18 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#55 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#32 integrate .. //depot/projects/smpng/sys/security/mac_ifoff/mac_ifoff.c#14 integrate .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#44 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#49 integrate .. //depot/projects/smpng/sys/security/mac_none/mac_none.c#19 integrate .. //depot/projects/smpng/sys/security/mac_partition/mac_partition.c#19 integrate .. //depot/projects/smpng/sys/security/mac_portacl/mac_portacl.c#16 integrate .. //depot/projects/smpng/sys/security/mac_seeotheruids/mac_seeotheruids.c#17 integrate .. //depot/projects/smpng/sys/security/mac_stub/mac_stub.c#29 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#45 integrate .. //depot/projects/smpng/sys/sparc64/conf/DEFAULTS#9 integrate .. //depot/projects/smpng/sys/sparc64/ebus/ebus.c#25 integrate .. //depot/projects/smpng/sys/sparc64/include/elf.h#13 integrate .. //depot/projects/smpng/sys/sparc64/include/ofw_bus.h#8 delete .. //depot/projects/smpng/sys/sparc64/include/ofw_machdep.h#7 integrate .. //depot/projects/smpng/sys/sparc64/include/tlb.h#19 integrate .. //depot/projects/smpng/sys/sparc64/isa/ofw_isa.c#10 integrate .. //depot/projects/smpng/sys/sparc64/pci/apb.c#15 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.h#14 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcib.c#10 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcib_subr.c#10 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcibus.c#14 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#48 integrate .. //depot/projects/smpng/sys/sparc64/pci/schizo.c#4 integrate .. //depot/projects/smpng/sys/sparc64/sbus/sbus.c#32 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#93 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#36 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/ofw_bus.c#11 delete .. //depot/projects/smpng/sys/sparc64/sparc64/ofw_machdep.c#14 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#77 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/support.S#14 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#82 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#53 integrate .. //depot/projects/smpng/sys/sun4v/conf/DEFAULTS#7 integrate .. //depot/projects/smpng/sys/sun4v/include/elf.h#3 integrate .. //depot/projects/smpng/sys/sun4v/include/ofw_bus.h#2 delete .. //depot/projects/smpng/sys/sun4v/include/ofw_machdep.h#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/machdep.c#9 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/mp_machdep.c#7 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/support.S#6 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/trap.c#10 integrate .. //depot/projects/smpng/sys/sys/buf_ring.h#2 integrate .. //depot/projects/smpng/sys/sys/copyright.h#13 integrate .. //depot/projects/smpng/sys/sys/elf64.h#7 integrate .. //depot/projects/smpng/sys/sys/elf_common.h#13 integrate .. //depot/projects/smpng/sys/sys/elf_generic.h#5 integrate .. //depot/projects/smpng/sys/sys/file.h#30 integrate .. //depot/projects/smpng/sys/sys/imgact_elf.h#11 integrate .. //depot/projects/smpng/sys/sys/kobj.h#6 integrate .. //depot/projects/smpng/sys/sys/link_elf.h#6 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#79 integrate .. //depot/projects/smpng/sys/sys/mount.h#70 integrate .. //depot/projects/smpng/sys/sys/param.h#132 integrate .. //depot/projects/smpng/sys/sys/pmc.h#14 integrate .. //depot/projects/smpng/sys/sys/protosw.h#24 integrate .. //depot/projects/smpng/sys/sys/soundcard.h#14 integrate .. //depot/projects/smpng/sys/sys/tree.h#10 integrate .. //depot/projects/smpng/sys/sys/ttyhook.h#2 integrate .. //depot/projects/smpng/sys/sys/vnode.h#92 integrate .. //depot/projects/smpng/sys/sys/vtoc.h#2 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#107 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#46 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vfsops.c#26 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#72 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#92 integrate .. //depot/projects/smpng/sys/vm/vm_map.h#39 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#103 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#102 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#44 integrate .. //depot/projects/smpng/sys/xen/evtchn.h#1 branch .. //depot/projects/smpng/sys/xen/evtchn/evtchn.c#4 integrate .. //depot/projects/smpng/sys/xen/evtchn/evtchn_dev.c#2 integrate .. //depot/projects/smpng/sys/xen/features.c#2 integrate .. //depot/projects/smpng/sys/xen/gnttab.c#4 integrate .. //depot/projects/smpng/sys/xen/gnttab.h#4 integrate .. //depot/projects/smpng/sys/xen/hypervisor.h#1 branch .. //depot/projects/smpng/sys/xen/xen_intr.h#1 branch .. //depot/projects/smpng/sys/xen/xenbus/xenbus_client.c#3 integrate .. //depot/projects/smpng/sys/xen/xenbus/xenbus_comms.c#3 integrate .. //depot/projects/smpng/sys/xen/xenbus/xenbus_comms.h#3 integrate .. //depot/projects/smpng/sys/xen/xenbus/xenbus_dev.c#3 integrate .. //depot/projects/smpng/sys/xen/xenbus/xenbus_probe.c#3 integrate .. //depot/projects/smpng/sys/xen/xenbus/xenbus_probe_backend.c#3 integrate .. //depot/projects/smpng/sys/xen/xenbus/xenbus_xs.c#4 integrate .. //depot/projects/smpng/sys/xen/xenbus/xenbusvar.h#2 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/amd64_mem.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.30 2008/11/26 19:25:13 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.31 2009/01/12 19:17:35 jkim Exp $"); #include #include @@ -678,9 +678,17 @@ return; if ((cpu_id & 0xf00) != 0x600 && (cpu_id & 0xf00) != 0xf00) return; - if (cpu_vendor_id != CPU_VENDOR_INTEL && - cpu_vendor_id != CPU_VENDOR_AMD) + switch (cpu_vendor_id) { + case CPU_VENDOR_INTEL: + case CPU_VENDOR_AMD: + break; + case CPU_VENDOR_CENTAUR: + if (cpu_exthigh >= 0x80000008) + break; + /* FALLTHROUGH */ + default: return; + } mem_range_softc.mr_op = &amd64_mrops; } SYSINIT(amd64memdev, SI_SUB_DRIVERS, SI_ORDER_FIRST, amd64_mem_drvinit, NULL); ==== //depot/projects/smpng/sys/amd64/amd64/exception.S#21 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.133 2008/08/18 08:47:27 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.136 2009/01/14 14:20:08 kib Exp $ */ #include "opt_atpic.h" @@ -459,9 +459,9 @@ */ movq %rsp,%rsi /* source stack pointer */ movq $TF_SIZE,%rcx - movq PCPU(RSP0),%rbx - subq %rcx,%rbx - movq %rbx,%rdi /* destination stack pointer */ + movq PCPU(RSP0),%rdx + subq %rcx,%rdx + movq %rdx,%rdi /* destination stack pointer */ shrq $3,%rcx /* trap frame size in long words */ cld @@ -470,7 +470,7 @@ movl %ss,%eax pushq %rax /* tf_ss */ - pushq %rbx /* tf_rsp (on kernel stack) */ + pushq %rdx /* tf_rsp (on kernel stack) */ pushfq /* tf_rflags */ movl %cs,%eax pushq %rax /* tf_cs */ @@ -480,16 +480,21 @@ /* * At this point the processor has exited NMI mode and is running * with interrupts turned off on the normal kernel stack. - * We turn interrupts back on, and take the usual 'doreti' exit - * path. * * If a pending NMI gets recognized at or after this point, it - * will cause a kernel callchain to be traced. Since this path - * is only taken for NMI interrupts from user space, our `swapgs' - * state is correct for taking the doreti path. + * will cause a kernel callchain to be traced. + * + * We turn interrupts back on, and call the user callchain capture hook. */ + movq pmc_hook,%rax + orq %rax,%rax + jz nocallchain + movq PCPU(CURTHREAD),%rdi /* thread */ + movq $PMC_FN_USER_CALLCHAIN,%rsi /* command */ + movq %rsp,%rdx /* frame */ sti - jmp doreti + call *%rax + cli nocallchain: #endif testl %ebx,%ebx ==== //depot/projects/smpng/sys/amd64/amd64/genassym.c#25 (text+ko) ==== @@ -33,9 +33,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.170 2008/09/08 09:59:05 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.171 2008/12/12 16:09:34 jkoshy Exp $"); #include "opt_compat.h" +#include "opt_hwpmc_hooks.h" #include "opt_kstack_pages.h" #include @@ -44,6 +45,9 @@ #include #include #include +#ifdef HWPMC_HOOKS +#include +#endif #include #include #include @@ -216,3 +220,7 @@ ASSYM(SEL_RPL_MASK, SEL_RPL_MASK); ASSYM(MSR_GSBASE, MSR_GSBASE); + +#ifdef HWPMC_HOOKS +ASSYM(PMC_FN_USER_CALLCHAIN, PMC_FN_USER_CALLCHAIN); +#endif ==== //depot/projects/smpng/sys/amd64/amd64/identcpu.c#31 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.167 2008/11/30 00:10:55 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.170 2009/01/12 19:17:35 jkim Exp $"); #include "opt_cpu.h" @@ -72,6 +72,7 @@ static u_int find_cpu_vendor_id(void); static void print_AMD_info(void); static void print_AMD_assoc(int i); +static void print_via_padlock_info(void); int cpu_class; char machine[] = "amd64"; @@ -102,6 +103,7 @@ } cpu_vendors[] = { { INTEL_VENDOR_ID, CPU_VENDOR_INTEL }, /* GenuineIntel */ { AMD_VENDOR_ID, CPU_VENDOR_AMD }, /* AuthenticAMD */ + { CENTAUR_VENDOR_ID, CPU_VENDOR_CENTAUR }, /* CentaurHauls */ }; int cpu_cores; @@ -131,24 +133,33 @@ } } - if (cpu_vendor_id == CPU_VENDOR_INTEL) { + switch (cpu_vendor_id) { + case CPU_VENDOR_INTEL: /* Please make up your mind folks! */ strcat(cpu_model, "EM64T"); - } else if (cpu_vendor_id == CPU_VENDOR_AMD) { + break; + case CPU_VENDOR_AMD: /* * Values taken from AMD Processor Recognition * http://www.amd.com/K6/k6docs/pdf/20734g.pdf * (also describes ``Features'' encodings. */ strcpy(cpu_model, "AMD "); - switch (cpu_id & 0xF00) { - case 0xf00: + if ((cpu_id & 0xf00) == 0xf00) strcat(cpu_model, "AMD64 Processor"); - break; - default: + else + strcat(cpu_model, "Unknown"); + break; + case CPU_VENDOR_CENTAUR: + strcpy(cpu_model, "VIA "); + if ((cpu_id & 0xff0) == 0x6f0) + strcat(cpu_model, "Nano Processor"); + else strcat(cpu_model, "Unknown"); - break; - } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 15 22:42:32 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02A44106567B; Thu, 15 Jan 2009 22:42:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AA2911065675 for ; Thu, 15 Jan 2009 22:42:31 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 981268FC33 for ; Thu, 15 Jan 2009 22:42:31 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0FMgV8I021271 for ; Thu, 15 Jan 2009 22:42:31 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0FMgVNg021269 for perforce@freebsd.org; Thu, 15 Jan 2009 22:42:31 GMT (envelope-from jhb@freebsd.org) Date: Thu, 15 Jan 2009 22:42:31 GMT Message-Id: <200901152242.n0FMgVNg021269@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 156238 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Jan 2009 22:42:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=156238 Change 156238 by jhb@jhb_jhbbsd on 2009/01/15 22:42:16 IFC @156236 Affected files ... .. //depot/projects/smpng/sys/dev/bce/if_bce.c#24 integrate Differences ... ==== //depot/projects/smpng/sys/dev/bce/if_bce.c#24 (text) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.49 2009/01/13 23:46:45 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.50 2009/01/15 22:28:05 delphij Exp $"); /* * The following controllers are supported by this driver: @@ -107,7 +107,9 @@ { BRCM_VENDORID, BRCM_DEVICEID_BCM5706, HP_VENDORID, 0x3106, "HP NC370i Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5706, HP_VENDORID, 0x3070, - "HP NC380T PCI Express Dual Port Multifunction Gigabit Server Adapter" }, + "HP NC380T PCIe DP Multifunc Gig Server Adapter" }, + { BRCM_VENDORID, BRCM_DEVICEID_BCM5706, HP_VENDORID, 0x1709, + "HP NC371i Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5706, PCI_ANY_ID, PCI_ANY_ID, "Broadcom NetXtreme II BCM5706 1000Base-T" }, @@ -119,37 +121,37 @@ /* BCM5708C controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5708, HP_VENDORID, 0x7037, - "HP NC373T PCI Express Multifunction Gigabit Server Adapter" }, + "HP NC373T PCIe Multifunction Gig Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5708, HP_VENDORID, 0x7038, - "HP NC373i Integrated Multifunction Gigabit Server Adapter" }, + "HP NC373i Multifunction Gigabit Server Adapter" }, + { BRCM_VENDORID, BRCM_DEVICEID_BCM5708, HP_VENDORID, 0x7045, + "HP NC374m PCIe Multifunction Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5708, PCI_ANY_ID, PCI_ANY_ID, "Broadcom NetXtreme II BCM5708 1000Base-T" }, /* BCM5708S controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, HP_VENDORID, 0x1706, - "HP NC373m Multifunction Gigabit Server Adapter" }, - { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, HP_VENDORID, 0x7038, - "HP NC373i PCI Express Multifunction Gigabit Server Adapter" }, + "HP NC373m Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, HP_VENDORID, 0x703b, - "HP NC373i Integrated Multifunction Gigabit Server Adapter" }, + "HP NC373i Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, HP_VENDORID, 0x703d, - "HP NC373F PCI Express Multifunction Gigabit Server Adapter" }, + "HP NC373F PCIe Multifunc Giga Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, PCI_ANY_ID, PCI_ANY_ID, "Broadcom NetXtreme II BCM5708 1000Base-SX" }, /* BCM5709C controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5709, HP_VENDORID, 0x7055, - "HP NC382i Integrated Quad Port PCI Express Gigabit Server Adapter" }, + "HP NC382i DP Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5709, HP_VENDORID, 0x7059, - "HP NC382T PCI Express Dual Port Multifunction Gigabit Server Adapter" }, + "HP NC382T PCIe DP Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5709, PCI_ANY_ID, PCI_ANY_ID, "Broadcom NetXtreme II BCM5709 1000Base-T" }, /* BCM5709S controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5709S, HP_VENDORID, 0x171d, - "HP NC382m Dual Port 1GbE Multifunction BL-c Adapter" }, + "HP NC382m DP 1GbE Multifunction BL-c Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5709S, HP_VENDORID, 0x7056, - "HP NC382i Integrated Quad Port PCI Express Gigabit Server Adapter" }, + "HP NC382i DP Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5709S, PCI_ANY_ID, PCI_ANY_ID, "Broadcom NetXtreme II BCM5709 1000Base-SX" }, From owner-p4-projects@FreeBSD.ORG Fri Jan 16 11:35:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2CB01065697; Fri, 16 Jan 2009 11:35:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 642191065691 for ; Fri, 16 Jan 2009 11:35:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 36D148FC2C for ; Fri, 16 Jan 2009 11:35:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0GBZRQd027096 for ; Fri, 16 Jan 2009 11:35:27 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0GBZQuh027087 for perforce@freebsd.org; Fri, 16 Jan 2009 11:35:26 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 16 Jan 2009 11:35:26 GMT Message-Id: <200901161135.n0GBZQuh027087@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 156248 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Jan 2009 11:35:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=156248 Change 156248 by hselasky@hselasky_laptop001 on 2009/01/16 11:35:22 IFC @ 156247 Affected files ... .. //depot/projects/usb/src/sys/amd64/amd64/exception.S#8 integrate .. //depot/projects/usb/src/sys/amd64/conf/USB2#3 integrate .. //depot/projects/usb/src/sys/boot/common/load.c#2 delete .. //depot/projects/usb/src/sys/bsm/audit.h#9 integrate .. //depot/projects/usb/src/sys/bsm/audit_domain.h#1 branch .. //depot/projects/usb/src/sys/bsm/audit_errno.h#2 integrate .. //depot/projects/usb/src/sys/bsm/audit_internal.h#10 integrate .. //depot/projects/usb/src/sys/bsm/audit_kevents.h#10 integrate .. //depot/projects/usb/src/sys/bsm/audit_record.h#10 integrate .. //depot/projects/usb/src/sys/bsm/audit_socket_type.h#1 branch .. //depot/projects/usb/src/sys/cam/cam_xpt.c#12 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_all.c#6 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_da.c#12 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_sg.c#6 integrate .. //depot/projects/usb/src/sys/conf/files#47 integrate .. //depot/projects/usb/src/sys/conf/files.powerpc#15 integrate .. //depot/projects/usb/src/sys/conf/kern.pre.mk#14 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bce.c#15 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iic.c#7 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iicbus.c#7 integrate .. //depot/projects/usb/src/sys/dev/msk/if_msk.c#9 integrate .. //depot/projects/usb/src/sys/dev/msk/if_mskreg.h#7 integrate .. //depot/projects/usb/src/sys/dev/ofw/ofw_iicbus.c#1 branch .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb/ehci.c#85 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#37 integrate .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#25 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#28 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#24 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#25 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#22 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.h#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#24 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.h#10 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#33 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#49 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#42 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#33 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_mbuf.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_parse.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#30 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#40 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.h#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2_reg.h#7 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_auereg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2_reg.h#8 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axereg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2_reg.h#7 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdcereg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2_reg.h#7 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cuereg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2_fw.h#6 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2_reg.h#7 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kuefw.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kuereg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2_reg.h#7 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_ruereg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2_reg.h#7 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udavreg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/image/uscanner2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_defs.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#23 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#23 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_standard.h#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/input/uhid2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/input/ukbd2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/input/ums2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/u3g2.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uark2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ubser2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ulpt2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/umct2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#22 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.h#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uvisor2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#25 integrate .. //depot/projects/usb/src/sys/dev/usb2/storage/ata-usb2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#22 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#22 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2_fw.h#5 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2_reg.h#5 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2_var.h#8 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rumfw.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rumreg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rumvar.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#23 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2_reg.h#6 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2_var.h#8 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_uralreg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_uralvar.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#26 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2_fw.h#6 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2_reg.h#10 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zydfw.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zydreg.h#1 branch .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_conv.c#4 integrate .. //depot/projects/usb/src/sys/i386/conf/USB2#3 integrate .. //depot/projects/usb/src/sys/kern/sysv_sem.c#8 integrate .. //depot/projects/usb/src/sys/mips/idt/idtpci.c#3 integrate .. //depot/projects/usb/src/sys/mips/include/pmap.h#3 integrate .. //depot/projects/usb/src/sys/mips/malta/gt_pci.c#4 integrate .. //depot/projects/usb/src/sys/mips/mips/busdma_machdep.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/cpu.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/machdep.c#6 integrate .. //depot/projects/usb/src/sys/mips/mips/nexus.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/pmap.c#5 integrate .. //depot/projects/usb/src/sys/net/rtsock.c#16 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias_ftp.c#6 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias_irc.c#5 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias_nbt.c#3 integrate .. //depot/projects/usb/src/sys/netinet/tcp_input.c#18 integrate .. //depot/projects/usb/src/sys/netinet/tcp_subr.c#16 integrate .. //depot/projects/usb/src/sys/netinet/tcp_timer.c#12 integrate .. //depot/projects/usb/src/sys/netinet/tcp_var.h#14 integrate .. //depot/projects/usb/src/sys/netinet/vinet.h#4 integrate .. //depot/projects/usb/src/sys/pc98/conf/GENERIC#15 integrate .. //depot/projects/usb/src/sys/powerpc/conf/NOTES#10 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/kiic.c#1 branch .. //depot/projects/usb/src/sys/security/audit/audit_bsm_domain.c#1 branch .. //depot/projects/usb/src/sys/security/audit/audit_bsm_errno.c#2 integrate .. //depot/projects/usb/src/sys/security/audit/audit_bsm_socket_type.c#1 branch .. //depot/projects/usb/src/sys/security/audit/audit_bsm_token.c#11 integrate .. //depot/projects/usb/src/sys/sys/param.h#18 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/amd64/exception.S#8 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.135 2008/12/14 09:06:28 jkoshy Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.136 2009/01/14 14:20:08 kib Exp $ */ #include "opt_atpic.h" @@ -494,6 +494,7 @@ movq %rsp,%rdx /* frame */ sti call *%rax + cli nocallchain: #endif testl %ebx,%ebx ==== //depot/projects/usb/src/sys/amd64/conf/USB2#3 (text+ko) ==== @@ -2,7 +2,7 @@ # USB2 -- Generic kernel configuration file for FreeBSD/amd64 with USBng # stack. # -# $FreeBSD: src/sys/amd64/conf/USB2,v 1.2 2008/12/30 20:13:20 rpaulo Exp $ +# $FreeBSD: src/sys/amd64/conf/USB2,v 1.3 2009/01/13 19:05:10 thompsa Exp $ include GENERIC ==== //depot/projects/usb/src/sys/bsm/audit.h#9 (text) ==== @@ -26,8 +26,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#1 - * $FreeBSD: src/sys/bsm/audit.h,v 1.13 2008/12/31 11:12:24 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#4 + * $FreeBSD: src/sys/bsm/audit.h,v 1.14 2009/01/14 10:44:16 rwatson Exp $ */ #ifndef _BSM_AUDIT_H @@ -280,8 +280,8 @@ * Structure for the audit file statistics. */ struct audit_fstat { - u_quad_t af_filesz; - u_quad_t af_currsz; + u_int64_t af_filesz; + u_int64_t af_currsz; }; typedef struct audit_fstat au_fstat_t; ==== //depot/projects/usb/src/sys/bsm/audit_errno.h#2 (text) ==== @@ -26,8 +26,8 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_errno.h#4 - * $FreeBSD: src/sys/bsm/audit_errno.h,v 1.1 2008/12/31 11:12:24 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_errno.h#5 + * $FreeBSD: src/sys/bsm/audit_errno.h,v 1.2 2009/01/14 10:44:16 rwatson Exp $ */ #ifndef _BSM_AUDIT_ERRNO_H_ @@ -42,128 +42,128 @@ * * When adding constants here, also add them to bsm_errno.c. */ -#define BSM_ESUCCESS 0 -#define BSM_EPERM 1 -#define BSM_ENOENT 2 -#define BSM_ESRCH 3 -#define BSM_EINTR 4 -#define BSM_EIO 5 -#define BSM_ENXIO 6 -#define BSM_E2BIG 7 -#define BSM_ENOEXEC 8 -#define BSM_EBADF 9 -#define BSM_ECHILD 10 -#define BSM_EAGAIN 11 -#define BSM_ENOMEM 12 -#define BSM_EACCES 13 -#define BSM_EFAULT 14 -#define BSM_ENOTBLK 15 -#define BSM_EBUSY 16 -#define BSM_EEXIST 17 -#define BSM_EXDEV 18 -#define BSM_ENODEV 19 -#define BSM_ENOTDIR 20 -#define BSM_EISDIR 21 -#define BSM_EINVAL 22 -#define BSM_ENFILE 23 -#define BSM_EMFILE 24 -#define BSM_ENOTTY 25 -#define BSM_ETXTBSY 26 -#define BSM_EFBIG 27 -#define BSM_ENOSPC 28 -#define BSM_ESPIPE 29 -#define BSM_EROFS 30 -#define BSM_EMLINK 31 -#define BSM_EPIPE 32 -#define BSM_EDOM 33 -#define BSM_ERANGE 34 -#define BSM_ENOMSG 35 -#define BSM_EIDRM 36 -#define BSM_ECHRNG 37 /* Solaris/Linux-specific. */ -#define BSM_EL2NSYNC 38 /* Solaris/Linux-specific. */ -#define BSM_EL3HLT 39 /* Solaris/Linux-specific. */ -#define BSM_EL3RST 40 /* Solaris/Linux-specific. */ -#define BSM_ELNRNG 41 /* Solaris/Linux-specific. */ -#define BSM_EUNATCH 42 /* Solaris/Linux-specific. */ -#define BSM_ENOCSI 43 /* Solaris/Linux-specific. */ -#define BSM_EL2HLT 44 /* Solaris/Linux-specific. */ -#define BSM_EDEADLK 45 -#define BSM_ENOLCK 46 -#define BSM_ECANCELED 47 -#define BSM_ENOTSUP 48 -#define BSM_EDQUOT 49 -#define BSM_EBADE 50 /* Solaris/Linux-specific. */ -#define BSM_EBADR 51 /* Solaris/Linux-specific. */ -#define BSM_EXFULL 52 /* Solaris/Linux-specific. */ -#define BSM_ENOANO 53 /* Solaris/Linux-specific. */ -#define BSM_EBADRQC 54 /* Solaris/Linux-specific. */ -#define BSM_EBADSLT 55 /* Solaris/Linux-specific. */ -#define BSM_EDEADLOCK 56 /* Solaris-specific. */ -#define BSM_EBFONT 57 /* Solaris/Linux-specific. */ -#define BSM_EOWNERDEAD 58 /* Solaris/Linux-specific. */ -#define BSM_ENOTRECOVERABLE 59 /* Solaris/Linux-specific. */ -#define BSM_ENOSTR 60 /* Solaris/Darwin/Linux-specific. */ -#define BSM_ENODATA 61 /* Solaris/Darwin/Linux-specific. */ -#define BSM_ETIME 62 /* Solaris/Darwin/Linux-specific. */ -#define BSM_ENOSR 63 /* Solaris/Darwin/Linux-specific. */ -#define BSM_ENONET 64 /* Solaris/Linux-specific. */ -#define BSM_ENOPKG 65 /* Solaris/Linux-specific. */ -#define BSM_EREMOTE 66 -#define BSM_ENOLINK 67 -#define BSM_EADV 68 /* Solaris/Linux-specific. */ -#define BSM_ESRMNT 69 /* Solaris/Linux-specific. */ -#define BSM_ECOMM 70 /* Solaris/Linux-specific. */ -#define BSM_EPROTO 71 -#define BSM_ELOCKUNMAPPED 72 /* Solaris-specific. */ -#define BSM_ENOTACTIVE 73 /* Solaris-specific. */ -#define BSM_EMULTIHOP 74 -#define BSM_EBADMSG 77 -#define BSM_ENAMETOOLONG 78 -#define BSM_EOVERFLOW 79 -#define BSM_ENOTUNIQ 80 /* Solaris/Linux-specific. */ -#define BSM_EBADFD 81 /* Solaris/Linux-specific. */ -#define BSM_EREMCHG 82 /* Solaris/Linux-specific. */ -#define BSM_ELIBACC 83 /* Solaris/Linux-specific. */ -#define BSM_ELIBBAD 84 /* Solaris/Linux-specific. */ -#define BSM_ELIBSCN 85 /* Solaris/Linux-specific. */ -#define BSM_ELIBMAX 86 /* Solaris/Linux-specific. */ -#define BSM_ELIBEXEC 87 /* Solaris/Linux-specific. */ -#define BSM_EILSEQ 88 -#define BSM_ENOSYS 89 -#define BSM_ELOOP 90 -#define BSM_ERESTART 91 -#define BSM_ESTRPIPE 92 /* Solaris/Linux-specific. */ -#define BSM_ENOTEMPTY 93 -#define BSM_EUSERS 94 -#define BSM_ENOTSOCK 95 -#define BSM_EDESTADDRREQ 96 -#define BSM_EMSGSIZE 97 -#define BSM_EPROTOTYPE 98 -#define BSM_ENOPROTOOPT 99 -#define BSM_EPROTONOSUPPORT 120 -#define BSM_ESOCKTNOSUPPORT 121 -#define BSM_EOPNOTSUPP 122 -#define BSM_EPFNOSUPPORT 123 -#define BSM_EAFNOSUPPORT 124 -#define BSM_EADDRINUSE 125 -#define BSM_EADDRNOTAVAIL 126 -#define BSM_ENETDOWN 127 -#define BSM_ENETUNREACH 128 -#define BSM_ENETRESET 129 -#define BSM_ECONNABORTED 130 -#define BSM_ECONNRESET 131 -#define BSM_ENOBUFS 132 -#define BSM_EISCONN 133 -#define BSM_ENOTCONN 134 -#define BSM_ESHUTDOWN 143 -#define BSM_ETOOMANYREFS 144 -#define BSM_ETIMEDOUT 145 -#define BSM_ECONNREFUSED 146 -#define BSM_EHOSTDOWN 147 -#define BSM_EHOSTUNREACH 148 -#define BSM_EALREADY 149 -#define BSM_EINPROGRESS 150 -#define BSM_ESTALE 151 +#define BSM_ERRNO_ESUCCESS 0 +#define BSM_ERRNO_EPERM 1 +#define BSM_ERRNO_ENOENT 2 +#define BSM_ERRNO_ESRCH 3 +#define BSM_ERRNO_EINTR 4 +#define BSM_ERRNO_EIO 5 +#define BSM_ERRNO_ENXIO 6 +#define BSM_ERRNO_E2BIG 7 +#define BSM_ERRNO_ENOEXEC 8 +#define BSM_ERRNO_EBADF 9 +#define BSM_ERRNO_ECHILD 10 +#define BSM_ERRNO_EAGAIN 11 +#define BSM_ERRNO_ENOMEM 12 +#define BSM_ERRNO_EACCES 13 +#define BSM_ERRNO_EFAULT 14 +#define BSM_ERRNO_ENOTBLK 15 +#define BSM_ERRNO_EBUSY 16 +#define BSM_ERRNO_EEXIST 17 +#define BSM_ERRNO_EXDEV 18 +#define BSM_ERRNO_ENODEV 19 +#define BSM_ERRNO_ENOTDIR 20 +#define BSM_ERRNO_EISDIR 21 +#define BSM_ERRNO_EINVAL 22 +#define BSM_ERRNO_ENFILE 23 +#define BSM_ERRNO_EMFILE 24 +#define BSM_ERRNO_ENOTTY 25 +#define BSM_ERRNO_ETXTBSY 26 +#define BSM_ERRNO_EFBIG 27 +#define BSM_ERRNO_ENOSPC 28 +#define BSM_ERRNO_ESPIPE 29 +#define BSM_ERRNO_EROFS 30 +#define BSM_ERRNO_EMLINK 31 +#define BSM_ERRNO_EPIPE 32 +#define BSM_ERRNO_EDOM 33 +#define BSM_ERRNO_ERANGE 34 +#define BSM_ERRNO_ENOMSG 35 +#define BSM_ERRNO_EIDRM 36 +#define BSM_ERRNO_ECHRNG 37 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EL2NSYNC 38 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EL3HLT 39 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EL3RST 40 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ELNRNG 41 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EUNATCH 42 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ENOCSI 43 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EL2HLT 44 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EDEADLK 45 +#define BSM_ERRNO_ENOLCK 46 +#define BSM_ERRNO_ECANCELED 47 +#define BSM_ERRNO_ENOTSUP 48 +#define BSM_ERRNO_EDQUOT 49 +#define BSM_ERRNO_EBADE 50 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EBADR 51 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EXFULL 52 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ENOANO 53 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EBADRQC 54 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EBADSLT 55 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EDEADLOCK 56 /* Solaris-specific. */ +#define BSM_ERRNO_EBFONT 57 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EOWNERDEAD 58 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ENOTRECOVERABLE 59 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ENOSTR 60 /* Solaris/Darwin/Linux-specific. */ +#define BSM_ERRNO_ENODATA 61 /* Solaris/Darwin/Linux-specific. */ +#define BSM_ERRNO_ETIME 62 /* Solaris/Darwin/Linux-specific. */ +#define BSM_ERRNO_ENOSR 63 /* Solaris/Darwin/Linux-specific. */ +#define BSM_ERRNO_ENONET 64 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ENOPKG 65 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EREMOTE 66 +#define BSM_ERRNO_ENOLINK 67 +#define BSM_ERRNO_EADV 68 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ESRMNT 69 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ECOMM 70 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EPROTO 71 +#define BSM_ERRNO_ELOCKUNMAPPED 72 /* Solaris-specific. */ +#define BSM_ERRNO_ENOTACTIVE 73 /* Solaris-specific. */ +#define BSM_ERRNO_EMULTIHOP 74 +#define BSM_ERRNO_EBADMSG 77 +#define BSM_ERRNO_ENAMETOOLONG 78 +#define BSM_ERRNO_EOVERFLOW 79 +#define BSM_ERRNO_ENOTUNIQ 80 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EBADFD 81 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EREMCHG 82 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ELIBACC 83 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ELIBBAD 84 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ELIBSCN 85 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ELIBMAX 86 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ELIBEXEC 87 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EILSEQ 88 +#define BSM_ERRNO_ENOSYS 89 +#define BSM_ERRNO_ELOOP 90 +#define BSM_ERRNO_ERESTART 91 +#define BSM_ERRNO_ESTRPIPE 92 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ENOTEMPTY 93 +#define BSM_ERRNO_EUSERS 94 +#define BSM_ERRNO_ENOTSOCK 95 +#define BSM_ERRNO_EDESTADDRREQ 96 +#define BSM_ERRNO_EMSGSIZE 97 +#define BSM_ERRNO_EPROTOTYPE 98 +#define BSM_ERRNO_ENOPROTOOPT 99 +#define BSM_ERRNO_EPROTONOSUPPORT 120 +#define BSM_ERRNO_ESOCKTNOSUPPORT 121 +#define BSM_ERRNO_EOPNOTSUPP 122 +#define BSM_ERRNO_EPFNOSUPPORT 123 +#define BSM_ERRNO_EAFNOSUPPORT 124 +#define BSM_ERRNO_EADDRINUSE 125 +#define BSM_ERRNO_EADDRNOTAVAIL 126 +#define BSM_ERRNO_ENETDOWN 127 +#define BSM_ERRNO_ENETUNREACH 128 +#define BSM_ERRNO_ENETRESET 129 +#define BSM_ERRNO_ECONNABORTED 130 +#define BSM_ERRNO_ECONNRESET 131 +#define BSM_ERRNO_ENOBUFS 132 +#define BSM_ERRNO_EISCONN 133 +#define BSM_ERRNO_ENOTCONN 134 +#define BSM_ERRNO_ESHUTDOWN 143 +#define BSM_ERRNO_ETOOMANYREFS 144 +#define BSM_ERRNO_ETIMEDOUT 145 +#define BSM_ERRNO_ECONNREFUSED 146 +#define BSM_ERRNO_EHOSTDOWN 147 +#define BSM_ERRNO_EHOSTUNREACH 148 +#define BSM_ERRNO_EALREADY 149 +#define BSM_ERRNO_EINPROGRESS 150 +#define BSM_ERRNO_ESTALE 151 /* * OpenBSM constants for error numbers not defined in Solaris. In the event @@ -172,44 +172,44 @@ * * ELAST doesn't get a constant in the BSM space. */ -#define BSM_EPROCLIM 190 /* FreeBSD/Darwin-specific. */ -#define BSM_EBADRPC 191 /* FreeBSD/Darwin-specific. */ -#define BSM_ERPCMISMATCH 192 /* FreeBSD/Darwin-specific. */ -#define BSM_EPROGUNAVAIL 193 /* FreeBSD/Darwin-specific. */ -#define BSM_EPROGMISMATCH 194 /* FreeBSD/Darwin-specific. */ -#define BSM_EPROCUNAVAIL 195 /* FreeBSD/Darwin-specific. */ -#define BSM_EFTYPE 196 /* FreeBSD/Darwin-specific. */ -#define BSM_EAUTH 197 /* FreeBSD/Darwin-specific. */ -#define BSM_ENEEDAUTH 198 /* FreeBSD/Darwin-specific. */ -#define BSM_ENOATTR 199 /* FreeBSD/Darwin-specific. */ -#define BSM_EDOOFUS 200 /* FreeBSD-specific. */ -#define BSM_EJUSTRETURN 201 /* FreeBSD-specific. */ -#define BSM_ENOIOCTL 202 /* FreeBSD-specific. */ -#define BSM_EDIRIOCTL 203 /* FreeBSD-specific. */ -#define BSM_EPWROFF 204 /* Darwin-specific. */ -#define BSM_EDEVERR 205 /* Darwin-specific. */ -#define BSM_EBADEXEC 206 /* Darwin-specific. */ -#define BSM_EBADARCH 207 /* Darwin-specific. */ -#define BSM_ESHLIBVERS 208 /* Darwin-specific. */ -#define BSM_EBADMACHO 209 /* Darwin-specific. */ -#define BSM_EPOLICY 210 /* Darwin-specific. */ -#define BSM_EDOTDOT 211 /* Linux-specific. */ -#define BSM_EUCLEAN 212 /* Linux-specific. */ -#define BSM_ENOTNAM 213 /* Linux(Xenix?)-specific. */ -#define BSM_ENAVAIL 214 /* Linux(Xenix?)-specific. */ -#define BSM_EISNAM 215 /* Linux(Xenix?)-specific. */ -#define BSM_EREMOTEIO 216 /* Linux-specific. */ -#define BSM_ENOMEDIUM 217 /* Linux-specific. */ -#define BSM_EMEDIUMTYPE 218 /* Linux-specific. */ -#define BSM_ENOKEY 219 /* Linux-specific. */ -#define BSM_EKEYEXPIRED 220 /* Linux-specific. */ -#define BSM_EKEYREVOKED 221 /* Linux-specific. */ -#define BSM_EKEYREJECTED 222 /* Linux-specific. */ +#define BSM_ERRNO_EPROCLIM 190 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_EBADRPC 191 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_ERPCMISMATCH 192 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_EPROGUNAVAIL 193 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_EPROGMISMATCH 194 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_EPROCUNAVAIL 195 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_EFTYPE 196 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_EAUTH 197 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_ENEEDAUTH 198 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_ENOATTR 199 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_EDOOFUS 200 /* FreeBSD-specific. */ +#define BSM_ERRNO_EJUSTRETURN 201 /* FreeBSD-specific. */ +#define BSM_ERRNO_ENOIOCTL 202 /* FreeBSD-specific. */ +#define BSM_ERRNO_EDIRIOCTL 203 /* FreeBSD-specific. */ +#define BSM_ERRNO_EPWROFF 204 /* Darwin-specific. */ +#define BSM_ERRNO_EDEVERR 205 /* Darwin-specific. */ +#define BSM_ERRNO_EBADEXEC 206 /* Darwin-specific. */ +#define BSM_ERRNO_EBADARCH 207 /* Darwin-specific. */ +#define BSM_ERRNO_ESHLIBVERS 208 /* Darwin-specific. */ +#define BSM_ERRNO_EBADMACHO 209 /* Darwin-specific. */ +#define BSM_ERRNO_EPOLICY 210 /* Darwin-specific. */ +#define BSM_ERRNO_EDOTDOT 211 /* Linux-specific. */ +#define BSM_ERRNO_EUCLEAN 212 /* Linux-specific. */ +#define BSM_ERRNO_ENOTNAM 213 /* Linux(Xenix?)-specific. */ +#define BSM_ERRNO_ENAVAIL 214 /* Linux(Xenix?)-specific. */ +#define BSM_ERRNO_EISNAM 215 /* Linux(Xenix?)-specific. */ +#define BSM_ERRNO_EREMOTEIO 216 /* Linux-specific. */ +#define BSM_ERRNO_ENOMEDIUM 217 /* Linux-specific. */ +#define BSM_ERRNO_EMEDIUMTYPE 218 /* Linux-specific. */ +#define BSM_ERRNO_ENOKEY 219 /* Linux-specific. */ +#define BSM_ERRNO_EKEYEXPIRED 220 /* Linux-specific. */ +#define BSM_ERRNO_EKEYREVOKED 221 /* Linux-specific. */ +#define BSM_ERRNO_EKEYREJECTED 222 /* Linux-specific. */ /* * In the event that OpenBSM doesn't have a file representation of a local * error number, use this. */ -#define BSM_UNKNOWNERR 250 /* OpenBSM-specific. */ +#define BSM_ERRNO_UNKNOWN 250 /* OpenBSM-specific. */ #endif /* !_BSM_AUDIT_ERRNO_H_ */ ==== //depot/projects/usb/src/sys/bsm/audit_internal.h#10 (text) ==== @@ -30,8 +30,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_internal.h#2 - * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.12 2008/12/31 11:12:24 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_internal.h#5 + * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.13 2009/01/14 10:44:16 rwatson Exp $ */ #ifndef _AUDIT_INTERNAL_H ==== //depot/projects/usb/src/sys/bsm/audit_kevents.h#10 (text) ==== @@ -26,8 +26,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#3 - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.17 2008/12/31 11:12:24 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#4 + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.18 2009/01/14 10:44:16 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ ==== //depot/projects/usb/src/sys/bsm/audit_record.h#10 (text) ==== @@ -26,8 +26,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#3 - * $FreeBSD: src/sys/bsm/audit_record.h,v 1.14 2008/12/31 11:12:24 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#9 + * $FreeBSD: src/sys/bsm/audit_record.h,v 1.15 2009/01/14 10:44:16 rwatson Exp $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -282,10 +282,15 @@ token_t *au_to_zonename(const char *zonename); /* - * BSM library routines for manipulating errno values. + * BSM library routines for converting between local and BSM constant spaces. */ +int au_bsm_to_domain(u_short bsm_domain, int *local_domainp); int au_bsm_to_errno(u_char bsm_error, int *errorp); -u_char au_errno_to_bsm(int error); +int au_bsm_to_socket_type(u_short bsm_socket_type, + int *local_socket_typep); +u_short au_domain_to_bsm(int local_domain); +u_char au_errno_to_bsm(int local_errno); +u_short au_socket_type_to_bsm(int local_socket_type); __END_DECLS ==== //depot/projects/usb/src/sys/cam/cam_xpt.c#12 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.205 2009/01/08 17:26:51 trasz Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.206 2009/01/14 21:29:20 trasz Exp $"); #include #include @@ -6137,7 +6137,7 @@ } xpt_release_ccb(done_ccb); softc->action = PROBE_TUR_FOR_NEGOTIATION; - xpt_schedule(periph, done_ccb->ccb_h.pinfo.priority); + xpt_schedule(periph, priority); return; } ==== //depot/projects/usb/src/sys/cam/scsi/scsi_all.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.53 2008/08/16 21:26:58 ken Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.54 2009/01/14 21:25:17 trasz Exp $"); #include @@ -3432,6 +3432,7 @@ break; case T_NODEVICE: dtype = "Uninstalled"; + break; default: dtype = "unknown"; break; ==== //depot/projects/usb/src/sys/cam/scsi/scsi_da.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.232 2008/12/23 09:11:05 remko Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.233 2009/01/14 21:27:30 trasz Exp $"); #include @@ -1021,7 +1021,6 @@ case AC_FOUND_DEVICE: { struct ccb_getdev *cgd; - struct cam_sim *sim; cam_status status; cgd = (struct ccb_getdev *)arg; @@ -1038,7 +1037,6 @@ * this device and start the probe * process. */ - sim = xpt_path_sim(cgd->ccb_h.path); status = cam_periph_alloc(daregister, daoninvalidate, dacleanup, dastart, "da", CAM_PERIPH_BIO, ==== //depot/projects/usb/src/sys/cam/scsi/scsi_sg.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.12 2009/01/10 17:22:49 trasz Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.13 2009/01/14 21:31:22 trasz Exp $"); #include #include @@ -941,6 +941,7 @@ case CAM_DEV_NOT_THERE: *hoststat = DID_BAD_TARGET; *drvstat = 0; + break; case CAM_SEL_TIMEOUT: *hoststat = DID_NO_CONNECT; *drvstat = 0; ==== //depot/projects/usb/src/sys/conf/files#47 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1363 2009/01/08 17:12:47 sam Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1365 2009/01/14 10:44:16 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -2539,8 +2539,10 @@ security/audit/audit.c optional audit security/audit/audit_arg.c optional audit security/audit/audit_bsm.c optional audit +security/audit/audit_bsm_domain.c optional audit security/audit/audit_bsm_errno.c optional audit security/audit/audit_bsm_klib.c optional audit +security/audit/audit_bsm_socket_type.c optional audit security/audit/audit_bsm_token.c optional audit security/audit/audit_pipe.c optional audit security/audit/audit_syscalls.c standard ==== //depot/projects/usb/src/sys/conf/files.powerpc#15 (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.powerpc,v 1.89 2009/01/13 15:41:58 raj Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.91 2009/01/15 02:52:31 nwhitehorn Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -34,6 +34,7 @@ dev/ofw/ofw_bus_subr.c optional aim dev/ofw/ofw_console.c optional aim dev/ofw/ofw_disk.c optional ofwd aim +dev/ofw/ofw_iicbus.c optional iicbus aim dev/ofw/ofw_standard.c optional aim dev/powermac_nvram/powermac_nvram.c optional powermac_nvram powermac dev/quicc/quicc_bfe_ocp.c optional quicc mpc85xx @@ -112,6 +113,7 @@ powerpc/powermac/dbdma.c optional powermac pci powerpc/powermac/grackle.c optional powermac pci powerpc/powermac/hrowpic.c optional powermac pci +powerpc/powermac/kiic.c optional powermac kiic powerpc/powermac/macio.c optional powermac pci powerpc/powermac/openpic_macio.c optional powermac pci powerpc/powermac/pswitch.c optional powermac pswitch ==== //depot/projects/usb/src/sys/conf/kern.pre.mk#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.103 2009/01/12 16:54:41 gnn Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.105 2009/01/15 06:54:59 rodrigc Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. ==== //depot/projects/usb/src/sys/dev/bce/if_bce.c#15 (text) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.48 2009/01/13 07:12:32 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.50 2009/01/15 22:28:05 delphij Exp $"); /* * The following controllers are supported by this driver: @@ -107,7 +107,9 @@ { BRCM_VENDORID, BRCM_DEVICEID_BCM5706, HP_VENDORID, 0x3106, "HP NC370i Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5706, HP_VENDORID, 0x3070, - "HP NC380T PCI Express Dual Port Multifunction Gigabit Server Adapter" }, + "HP NC380T PCIe DP Multifunc Gig Server Adapter" }, + { BRCM_VENDORID, BRCM_DEVICEID_BCM5706, HP_VENDORID, 0x1709, + "HP NC371i Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5706, PCI_ANY_ID, PCI_ANY_ID, "Broadcom NetXtreme II BCM5706 1000Base-T" }, @@ -119,37 +121,37 @@ /* BCM5708C controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5708, HP_VENDORID, 0x7037, - "HP NC373T PCI Express Multifunction Gigabit Server Adapter" }, + "HP NC373T PCIe Multifunction Gig Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5708, HP_VENDORID, 0x7038, - "HP NC373i Integrated Multifunction Gigabit Server Adapter" }, + "HP NC373i Multifunction Gigabit Server Adapter" }, + { BRCM_VENDORID, BRCM_DEVICEID_BCM5708, HP_VENDORID, 0x7045, + "HP NC374m PCIe Multifunction Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5708, PCI_ANY_ID, PCI_ANY_ID, "Broadcom NetXtreme II BCM5708 1000Base-T" }, /* BCM5708S controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, HP_VENDORID, 0x1706, - "HP NC373m Multifunction Gigabit Server Adapter" }, - { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, HP_VENDORID, 0x7038, - "HP NC373i PCI Express Multifunction Gigabit Server Adapter" }, + "HP NC373m Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, HP_VENDORID, 0x703b, - "HP NC373i Integrated Multifunction Gigabit Server Adapter" }, + "HP NC373i Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, HP_VENDORID, 0x703d, - "HP NC373F PCI Express Multifunction Gigabit Server Adapter" }, + "HP NC373F PCIe Multifunc Giga Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, PCI_ANY_ID, PCI_ANY_ID, "Broadcom NetXtreme II BCM5708 1000Base-SX" }, /* BCM5709C controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5709, HP_VENDORID, 0x7055, - "HP NC382i Integrated Quad Port PCI Express Gigabit Server Adapter" }, + "HP NC382i DP Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5709, HP_VENDORID, 0x7059, - "HP NC382T PCI Express Dual Port Multifunction Gigabit Server Adapter" }, + "HP NC382T PCIe DP Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5709, PCI_ANY_ID, PCI_ANY_ID, "Broadcom NetXtreme II BCM5709 1000Base-T" }, /* BCM5709S controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5709S, HP_VENDORID, 0x171d, - "HP NC382m Dual Port 1GbE Multifunction BL-c Adapter" }, + "HP NC382m DP 1GbE Multifunction BL-c Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5709S, HP_VENDORID, 0x7056, - "HP NC382i Integrated Quad Port PCI Express Gigabit Server Adapter" }, + "HP NC382i DP Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5709S, PCI_ANY_ID, PCI_ANY_ID, "Broadcom NetXtreme II BCM5709 1000Base-SX" }, @@ -2908,7 +2910,6 @@ { struct bce_softc *sc; int i, error, rc = 0; - bus_addr_t busaddr; bus_size_t max_size, max_seg_size; int max_segments; @@ -2977,7 +2978,7 @@ sc->status_block, BCE_STATUS_BLK_SZ, bce_dma_map_addr, - &busaddr, + &sc->status_block_paddr, BUS_DMA_NOWAIT); if (error) { @@ -2987,7 +2988,6 @@ goto bce_dma_alloc_exit; } - sc->status_block_paddr = busaddr; DBPRINT(sc, BCE_INFO, "%s(): status_block_paddr = 0x%jX\n", __FUNCTION__, (uintmax_t) sc->status_block_paddr); @@ -3031,7 +3031,7 @@ sc->stats_block, BCE_STATS_BLK_SZ, bce_dma_map_addr, - &busaddr, + &sc->stats_block_paddr, BUS_DMA_NOWAIT); if(error) { @@ -3041,7 +3041,6 @@ goto bce_dma_alloc_exit; } - sc->stats_block_paddr = busaddr; DBPRINT(sc, BCE_INFO, "%s(): stats_block_paddr = 0x%jX\n", __FUNCTION__, (uintmax_t) sc->stats_block_paddr); @@ -3099,7 +3098,7 @@ sc->ctx_block[i], BCM_PAGE_SIZE, bce_dma_map_addr, - &busaddr, + &sc->ctx_paddr[i], BUS_DMA_NOWAIT); if (error) { @@ -3109,7 +3108,6 @@ goto bce_dma_alloc_exit; } - sc->ctx_paddr[i] = busaddr; DBPRINT(sc, BCE_INFO, "%s(): ctx_paddr[%d] = 0x%jX\n", __FUNCTION__, i, (uintmax_t) sc->ctx_paddr[i]); } @@ -3155,7 +3153,7 @@ sc->tx_bd_chain[i], BCE_TX_CHAIN_PAGE_SZ, bce_dma_map_addr, - &busaddr, + &sc->tx_bd_chain_paddr[i], BUS_DMA_NOWAIT); if (error) { @@ -3165,7 +3163,6 @@ goto bce_dma_alloc_exit; } - sc->tx_bd_chain_paddr[i] = busaddr; DBPRINT(sc, BCE_INFO, "%s(): tx_bd_chain_paddr[%d] = 0x%jX\n", __FUNCTION__, i, (uintmax_t) sc->tx_bd_chain_paddr[i]); } @@ -3253,7 +3250,7 @@ sc->rx_bd_chain[i], BCE_RX_CHAIN_PAGE_SZ, bce_dma_map_addr, - &busaddr, + &sc->rx_bd_chain_paddr[i], BUS_DMA_NOWAIT); if (error) { @@ -3263,7 +3260,6 @@ goto bce_dma_alloc_exit; } - sc->rx_bd_chain_paddr[i] = busaddr; DBPRINT(sc, BCE_INFO, "%s(): rx_bd_chain_paddr[%d] = 0x%jX\n", __FUNCTION__, i, (uintmax_t) sc->rx_bd_chain_paddr[i]); } @@ -3350,7 +3346,7 @@ sc->pg_bd_chain[i], BCE_PG_CHAIN_PAGE_SZ, bce_dma_map_addr, - &busaddr, + &sc->pg_bd_chain_paddr[i], BUS_DMA_NOWAIT); if (error) { @@ -3360,7 +3356,6 @@ goto bce_dma_alloc_exit; } - sc->pg_bd_chain_paddr[i] = busaddr; DBPRINT(sc, BCE_INFO, "%s(): pg_bd_chain_paddr[%d] = 0x%jX\n", __FUNCTION__, i, (uintmax_t) sc->pg_bd_chain_paddr[i]); } ==== //depot/projects/usb/src/sys/dev/iicbus/iic.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/iicbus/iic.c,v 1.41 2009/01/06 17:23:37 nwhitehorn Exp $ + * $FreeBSD: src/sys/dev/iicbus/iic.c,v 1.42 2009/01/15 23:14:59 nwhitehorn Exp $ * */ #include @@ -110,14 +110,18 @@ { if (device_find_child(parent, "iic", -1) == NULL) - BUS_ADD_CHILD(parent, 0, "iic", 0); + BUS_ADD_CHILD(parent, 0, "iic", -1); } static int iic_probe(device_t dev) { + if (iicbus_get_addr(dev) > 0) + return (ENXIO); + device_set_desc(dev, "I2C generic I/O"); - return (BUS_PROBE_NOWILDCARD); + + return (0); } static int ==== //depot/projects/usb/src/sys/dev/iicbus/iicbus.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iicbus/iicbus.c,v 1.26 2009/01/06 17:23:37 nwhitehorn Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 16 11:36:31 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4784C106576A; Fri, 16 Jan 2009 11:36:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A3EE1065764 for ; Fri, 16 Jan 2009 11:36:30 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5FBD18FC19 for ; Fri, 16 Jan 2009 11:36:30 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0GBaUa2027176 for ; Fri, 16 Jan 2009 11:36:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0GBaURi027174 for perforce@freebsd.org; Fri, 16 Jan 2009 11:36:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 16 Jan 2009 11:36:30 GMT Message-Id: <200901161136.n0GBaURi027174@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156249 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Jan 2009 11:36:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=156249 Change 156249 by rwatson@rwatson_freebsd_capabilities on 2009/01/16 11:35:38 Fix typo. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#12 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#12 (text+ko) ==== @@ -38,7 +38,7 @@ ## - sys_exit(2), abort2(2) and close(2) are very important. ## - Sorted alphabetically, please keep it that way. ## -## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#11 $ +## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#12 $ ## ## @@ -174,7 +174,7 @@ fchown ## -## For now, allow fcntly(2), subject to capability rights, but this probably +## For now, allow fcntl(2), subject to capability rights, but this probably ## needs additional scoping. ## fcntl From owner-p4-projects@FreeBSD.ORG Fri Jan 16 20:38:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAEFE1065674; Fri, 16 Jan 2009 20:38:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7393E106566B for ; Fri, 16 Jan 2009 20:38:39 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6072F8FC17 for ; Fri, 16 Jan 2009 20:38:39 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0GKcd7Q025460 for ; Fri, 16 Jan 2009 20:38:39 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0GKccsj025458 for perforce@freebsd.org; Fri, 16 Jan 2009 20:38:38 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 16 Jan 2009 20:38:38 GMT Message-Id: <200901162038.n0GKccsj025458@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 156266 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Jan 2009 20:38:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=156266 Change 156266 by pgj@beehive on 2009/01/16 20:38:17 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#37 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#26 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/book.sgml#12 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#16 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#17 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/l10n/chapter.sgml#9 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#21 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#22 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml#17 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.sgml#13 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#16 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/trademarks.ent#8 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/cperciva.key#2 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/garga.key#2 integrate .. //depot/projects/docproj_hu/www/en/gnome/docs/Makefile#2 integrate .. //depot/projects/docproj_hu/www/en/gnome/docs/develfaq.sgml#3 integrate .. //depot/projects/docproj_hu/www/en/gnome/docs/faq224.sgml#1 branch .. //depot/projects/docproj_hu/www/en/gnome/docs/gnome2_porting.sgml#3 integrate .. //depot/projects/docproj_hu/www/en/gnome/docs/halfaq.sgml#3 integrate .. //depot/projects/docproj_hu/www/en/gnome/index.xsl#4 integrate .. //depot/projects/docproj_hu/www/en/gnome/news.xml#2 integrate .. //depot/projects/docproj_hu/www/en/internal/machines.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/news/status/status.sgml#5 integrate .. //depot/projects/docproj_hu/www/hu/developers/cvs.sgml#12 integrate .. //depot/projects/docproj_hu/www/hu/index.xsl#16 integrate .. //depot/projects/docproj_hu/www/hu/send-pr.sgml#11 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/header.l10n.ent#10 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#19 integrate .. //depot/projects/docproj_hu/www/share/sgml/advisories.xml#8 integrate .. //depot/projects/docproj_hu/www/share/sgml/libcommon.xsl#4 integrate .. //depot/projects/docproj_hu/www/share/sgml/navibar.ent#6 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#34 integrate .. //depot/projects/docproj_hu/www/share/sgml/press.xml#10 integrate .. //depot/projects/docproj_hu/www/share/sgml/release.ent#10 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#37 (text+ko) ==== @@ -20,7 +20,7 @@ A &os; Dokumentációs Projekt - $FreeBSD: doc/hu_HU.ISO8859-2/books/faq/book.sgml,v 1.8 2008/12/24 12:00:57 pgj Exp $ + $FreeBSD: doc/hu_HU.ISO8859-2/books/faq/book.sgml,v 1.9 2009/01/10 19:28:48 pgj Exp $ 1995 ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#26 (text+ko) ==== @@ -1,7 +1,7 @@ + -uid Colin Percival -sub 2048g/AA35B966 2003-02-18 +pub 1024D/0C6A6A6E 2009-01-12 + Key fingerprint = EAF4 8BBA 7CC7 7A30 FEFC 0DA9 38CE CA69 0C6A 6A6E +uid Colin Percival +uid Colin Percival +uid Colin Percival +sub 2048g/DC606691 2009-01-12 ]]> ==== //depot/projects/docproj_hu/doc/share/pgpkeys/garga.key#2 (text+ko) ==== @@ -1,18 +1,17 @@ - + -uid Renato Botelho -uid Renato Botelho -uid Renato Botelho +uid Renato Botelho +uid Renato Botelho sub 1024g/7B295760 2003-12-16 ]]> ==== //depot/projects/docproj_hu/www/en/gnome/docs/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/gnome/docs/Makefile,v 1.26 2008/03/30 18:35:28 marcus Exp $ +# $FreeBSD: www/en/gnome/docs/Makefile,v 1.27 2009/01/11 22:11:15 marcus Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -16,6 +16,7 @@ DOCS+= faq218.sgml DOCS+= faq220.sgml DOCS+= faq222.sgml +DOCS+= faq224.sgml DOCS+= gnome_porting.sgml DOCS+= gnome1_porting.sgml DOCS+= gnome2_porting.sgml ==== //depot/projects/docproj_hu/www/en/gnome/docs/develfaq.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -158,11 +158,9 @@

  • What is the current state of development GNOME on FreeBSD?

    -

    GNOME 2.23.4 is the latest development release, and it is - relatively stable. The only obvious known issue is that - some icons are missing. This is part of an initiative to - clean up the deprecated icons. As the &gnomedevelver; - releases continue, this will gradually be fixed.

    +

    Because of the long ports tree freeze, we have not yet + started work on GNOME &gnomedevelver;. Stay tuned for more + updates.

    • &footer; ==== //depot/projects/docproj_hu/www/en/gnome/docs/gnome2_porting.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -30,7 +30,7 @@ atspi accessibility/at-spi - gail libbonobo + gtk20 libbonobo @@ -42,19 +42,13 @@ eel2 x11-toolkits/eel - gnomedesktop gail + gnomedesktop evolutiondataserver databases/evolution-data-server - libgnome - - - - gail - accessibility/gail - gtk20 + libgnomeui @@ -141,7 +135,7 @@ gtkhtml3 www/gtkhtml3 - gail libgnomeui + libgnomeui @@ -211,6 +205,12 @@ + libgda4 + databases/libgda4 + glib20 libxslt + + + libglade2 devel/libglade2 libxml2 gtk20 @@ -225,7 +225,7 @@ libgnomecanvas graphics/libgnomecanvas - libglade2 libartlgpl2 gail + libglade2 libartlgpl2 @@ -273,7 +273,7 @@ libgtkhtml www/libgtkhtml - libxslt gnomevfs2 gail + libxslt gnomevfs2 ==== //depot/projects/docproj_hu/www/en/gnome/docs/halfaq.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -17,6 +17,7 @@
  • How do I mount media using hal?
  • How do I troubleshoot problems with hal?
    • +
  • Does hal support Fuse file systems?

    • Full Text

    @@ -319,6 +320,17 @@ label has a space in the name that will break hal. Labels must NOT contain spaces.

    + + +
  • +

    Does hal support Fuse file systems?

    + +

    Yes. As of hal-0.5.11_10, Fuse file systems are supported. + See the installed + /usr/local/share/doc/hal-0.5.11/README.fuse file + for more details.

    +
    • + &footer; ==== //depot/projects/docproj_hu/www/en/gnome/index.xsl#4 (text+ko) ==== @@ -4,7 +4,7 @@ ]> - + devel/gnome2-hacker-tools (development tools) -

    Upgrading to GNOME 2.22?

    +

    Upgrading to GNOME 2.24?

    -

    If you are upgrading from GNOME 2.20 to GNOME 2.22, read the - Upgrade FAQ for upgrade +

    If you are upgrading from GNOME 2.22 to GNOME 2.24, read the + Upgrade FAQ for upgrade instructions.

    State of the port

    GNOME for FreeBSD is currently supported on - 6.3, 6-STABLE, 7.0, 7-STABLE, and 8-CURRENT. + 6.4, 6-STABLE, 7.0, 7.1, 7-STABLE, and 8-CURRENT. Most of GNOME has been ported to FreeBSD, but there is still plenty left to be done!

    ==== //depot/projects/docproj_hu/www/en/gnome/news.xml#2 (text+ko) ==== @@ -19,10 +19,45 @@ - $FreeBSD: www/en/gnome/news.xml,v 1.145 2008/03/24 04:40:18 marcus Exp $ + $FreeBSD: www/en/gnome/news.xml,v 1.146 2009/01/11 22:10:55 marcus Exp $ + 2009 + + + January + + + 9 + + + Announcing GNOME 2.24.2 for FreeBSD! + +

    The FreeBSD GNOME team is proud to announce the release of + GNOME 2.24.2 for FreeBSD. The official release notes can be + found at + + http://library.gnome.org/misc/release-notes/2.24/ + + . On the FreeBSD front, this release introduces Fuse support + in HAL, adds multi-CPU support to libgtop, WebKit updates, + and fixes some long-standing seahorse and gnome-keyring + bugs.

    + +

    This release features commits by adamw, ahze, kwm, mezz, + and myself. It would not have been possible without are + contributors and testers: Alexander Loginov, Craig Butler, + Dmitry Marakasov, Eric L. Chen, Joseph S. Atkinson, Kris Moore, + Lapo Luchini, Nikos Ntarmos, Pawel Worach, Romain Tartiere, TAOKA + Fumiyoshi, Romain Tartiere, Yasuda Keisuke, Zyl + aZ, bf, Florent Thoumie, Peter Wemm, and pluknet.

    +     +     +     +     + + 2008 @@ -34,7 +69,7 @@ Announcing GNOME 2.22.0 for FreeBSD! -

    The FreeBSD GNOME team is proud to annunce the release of +

    The FreeBSD GNOME team is proud to announce the release of GNOME 2.22.0 for FreeBSD. The official GNOME 2.22 release notes can be found at ==== //depot/projects/docproj_hu/www/en/internal/machines.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -75,14 +75,14 @@ mx1 -6-STABLE +7-STABLE Inbound Mail services. admins mx2 -6-STABLE +7-STABLE Outbound Mail services. admins @@ -212,27 +212,30 @@ hub AMD64 MP -4x2.2Ghz (dual CPU, dual core), 3GB Memory, Adaptec RAID Controller, +4x2.2GHz (dual CPU, dual core), 3GB Memory, Adaptec RAID Controller, 4x36GB U160 SCSI Disk, Broadcom Gigabit Ethernet. -mx1, mx2 +mx1 Intel x86 MP -2x3.06Ghz Xeon, 1GB Memory, 80GB IDE Disk, Broadcom Gigabit Ethernet. +8x1.86GHz Xeon (dual CPU, quad core), 8GB Memory, Dell PERC 5/i + RAID controller, 2x136GB SAS disks in RAID1, Broadcom NetXtreme + Gigabit Ethernet adapter. -ns0 -  -  +mx2 +Intel x86 MP +2x2.8GHz Xeon, 1GB Memory, Compaq Smart Array 5i RAID controller, + 2x34GB SCSI Disks in RAID1, Broadcom Gigabit Ethernet. -ns1, ns2 +ns0, ns1, ns2 Intel x86 -800MHz Pentium III, 1GB Memory, 40GB ATA drive, - Intel EtherExpress Pro 10/100B NIC. +2.8GHz Xeon, 1GB Memory, Compaq Smart Array 5i RAID controller, + 2x34GB SCSI Disks in RAID1, Broadcom Gigabit Ethernet. @@ -246,7 +249,7 @@ pointyhat Intel EM64T MP -2x2.8Ghz Intel Xeon (dualcore), 4GB Memory, Dell PERC 4 RAID controller, +2x2.8GHz Intel Xeon (dualcore), 4GB Memory, Dell PERC 4 RAID controller, 1.1TB storage, Intel PRO/1000 Gigabitq NIC. ==== //depot/projects/docproj_hu/www/en/news/status/status.sgml#5 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -12,7 +12,8 @@

    Use the xml generator or download and edit the - xml-template.

    + xml-template. Submissions should be submitted by e-mail to + monthly@FreeBSD.org.

    ==== //depot/projects/docproj_hu/www/hu/developers/cvs.sgml#12 (text+ko) ==== @@ -1,7 +1,7 @@ - + ]> ==== //depot/projects/docproj_hu/www/hu/index.xsl#16 (text+ko) ==== @@ -4,7 +4,7 @@ ]> - + + + +

    Old announcements: + 2007, 2006, 2005, 2004, @@ -409,6 +410,7 @@

    Old press publications: + 2007, 2006, 2005, 2004, ==== //depot/projects/docproj_hu/www/share/sgml/navibar.ent#6 (text+ko) ==== @@ -1,4 +1,4 @@ - + FreeBSD/GNOME

    '> ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#34 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.218 2009/01/05 04:08:29 hrs Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.219 2009/01/12 17:02:43 marcus Exp $ @@ -36,6 +36,19 @@ 1 + 9 + + + GNOME 2.24.2 Available for FreeBSD + +

    The FreeBSD GNOME team is proud to announce the release of + GNOME 2.24.2 for FreeBSD. More details can be found on + the FreeBSD GNOME Project + page.

    +     +     + + 5 ==== //depot/projects/docproj_hu/www/share/sgml/press.xml#10 (text+ko) ==== @@ -9,11 +9,39 @@ - $FreeBSD: www/share/sgml/press.xml,v 1.71 2008/12/08 09:10:44 murray Exp $ + $FreeBSD: www/share/sgml/press.xml,v 1.73 2009/01/14 04:25:43 jkoshy Exp $ + 2009 + + + 1 + + Coyote Point Builds on FreeBSD to Accelerate + http://www.internetnews.com/infra/article.php/3795791 + Internet News + http://www.internetnews.com/ + 13 January 2009 + Sean Michael Kerner +

    FreeBSD is at the core of Coyote Point's appliance.

    +     + + + FreeBSD 7.1 Gets a Little Help from Sun + http://www.internetnews.com/dev-news/article.php/3794561 + Internet News + http://www.internetnews.com/ + 06 January 2009 + Sean Michael Kerner +

    An article covering technology sharing between Sun and the FreeBSD + project and other new features in FreeBSD 7.1.

    +     +     +     + + 2008 ==== //depot/projects/docproj_hu/www/share/sgml/release.ent#10 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -539,7 +539,13 @@ Amennyiben léteznek, a megadott opciókkal azonnal megkezdi a megadott rendszermag - betöltését. + betöltését. A + rendszermag paraméter + csak abban az esetben adható meg, ha elõtte + kiadtunk egy unload parancsot, + máskülönben a korábban + betöltött rendszermaggal indul a + rendszer. ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#18 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/introduction/chapter.sgml - %SRCID% 1.132 + %SRCID% 1.133 --> @@ -570,7 +570,7 @@ Juniper - Juniper + Juniper NetApp From owner-p4-projects@FreeBSD.ORG Fri Jan 16 21:18:20 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E91E1065676; Fri, 16 Jan 2009 21:18:20 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0D49D106566B for ; Fri, 16 Jan 2009 21:18:20 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D5E568FC1D for ; Fri, 16 Jan 2009 21:18:19 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0GLIJub039031 for ; Fri, 16 Jan 2009 21:18:19 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0GLIJA6039029 for perforce@freebsd.org; Fri, 16 Jan 2009 21:18:19 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 16 Jan 2009 21:18:19 GMT Message-Id: <200901162118.n0GLIJA6039029@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 156269 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Jan 2009 21:18:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=156269 Change 156269 by pgj@beehive on 2009/01/16 21:17:24 MFen (www): 1.24 -> 1.26 hu/share/sgml/navibar.l10n.ent Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#20 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#20 (text+ko) ==== @@ -4,7 +4,7 @@ @@ -127,7 +127,7 @@
  • FreeBSD/GNOME '> From owner-p4-projects@FreeBSD.ORG Sat Jan 17 05:30:41 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 654CC1065672; Sat, 17 Jan 2009 05:30:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1B165106566B for ; Sat, 17 Jan 2009 05:30:41 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 078FB8FC1B for ; Sat, 17 Jan 2009 05:30:41 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0H5Ue9u005128 for ; Sat, 17 Jan 2009 05:30:40 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0H5UeeK005122 for perforce@freebsd.org; Sat, 17 Jan 2009 05:30:40 GMT (envelope-from weongyo@FreeBSD.org) Date: Sat, 17 Jan 2009 05:30:40 GMT Message-Id: <200901170530.n0H5UeeK005122@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 156275 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Jan 2009 05:30:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=156275 Change 156275 by weongyo@weongyo_ws on 2009/01/17 05:30:36 change the style of printing the debug messages like other wireless drivers. Affected files ... .. //depot/projects/vap/sys/dev/usb/if_uath.c#3 edit .. //depot/projects/vap/sys/dev/usb/if_uathvar.h#2 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_uath.c#3 (text+ko) ==== @@ -113,16 +113,37 @@ #include #ifdef UATH_DEBUG -#define DPRINTF(x) do { if (uath_debug) printf x; } while (0) -#define DPRINTFN(n, x) do { if (uath_debug >= (n)) printf x; } while (0) int uath_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, uath, CTLFLAG_RW, 0, "USB Atheros"); SYSCTL_INT(_hw_usb_uath, OID_AUTO, debug, CTLFLAG_RW, &uath_debug, 0, "uath debug level"); TUNABLE_INT("hw.usb.uath.debug", &uath_debug); +enum { + UATH_DEBUG_XMIT = 0x00000001, /* basic xmit operation */ + UATH_DEBUG_RECV = 0x00000002, /* basic recv operation */ + UATH_DEBUG_TX_PROC = 0x00000004, /* tx ISR proc */ + UATH_DEBUG_RX_PROC = 0x00000008, /* rx ISR proc */ + UATH_DEBUG_RECV_ALL = 0x00000010, /* trace all frames (beacons) */ + UATH_DEBUG_INIT = 0x00000020, /* initialization of dev */ + UATH_DEBUG_DEVCAP = 0x00000040, /* dev caps */ + UATH_DEBUG_RESET = 0x00000080, /* reset processing */ + UATH_DEBUG_STATE = 0x00000100, /* 802.11 state transitions */ + UATH_DEBUG_MULTICAST = 0x00000200, /* multicast */ + UATH_DEBUG_WME = 0x00000400, /* WME */ + UATH_DEBUG_CHANNEL = 0x00000800, /* channel */ + UATH_DEBUG_RATES = 0x00001000, /* rates */ + UATH_DEBUG_CRYPTO = 0x00002000, /* crypto */ + UATH_DEBUG_LED = 0x00004000, /* LED */ + UATH_DEBUG_ANY = 0xffffffff +}; +#define DPRINTF(sc, m, fmt, ...) do { \ + if (sc->sc_debug & (m)) \ + printf(fmt, __VA_ARGS__); \ +} while (0) #else -#define DPRINTF(x) -#define DPRINTFN(n, x) +#define DPRINTF(sc, m, fmt, ...) do { \ + (void) sc; \ +} while (0) #endif /* unaligned little endian access */ @@ -259,6 +280,9 @@ sc->sc_dev = dev; sc->sc_udev = uaa->device; +#ifdef UATH_DEBUG + sc->sc_debug = uath_debug; +#endif error = usbd_set_config_no(sc->sc_udev, UATH_CONFIG_NO, 0); if (error != 0) { @@ -793,7 +817,8 @@ } else mfilt[0] = mfilt[1] = ~0; - DPRINTFN(5, ("%s: MC filter %08x:%08x\n", __func__, mfilt[0], mfilt[1])); + DPRINTF(sc, UATH_DEBUG_MULTICAST, + "%s: MC filter %08x:%08x\n", __func__, mfilt[0], mfilt[1]); mcast.filter0 = htobe32(mfilt[0]); mcast.filter1 = htobe32(mfilt[1]); @@ -1013,9 +1038,9 @@ struct ieee80211com *ic = vap->iv_ic; struct uath_softc *sc = ic->ic_ifp->if_softc; - DPRINTF(("%s: %s -> %s\n", __func__, - ieee80211_state_name[vap->iv_state], - ieee80211_state_name[nstate])); + DPRINTF(sc, UATH_DEBUG_STATE, + "%s: %s -> %s\n", __func__, ieee80211_state_name[vap->iv_state], + ieee80211_state_name[nstate]); usb_rem_task(sc->sc_udev, &sc->sc_ctxtask); usb_rem_task(sc->sc_udev, &sc->sc_task); @@ -1347,8 +1372,9 @@ /* reply to a read command */ default: dlen = hdr->len - sizeof(*hdr); - DPRINTFN(3, ("%s: code %d data len %u\n", - __func__, hdr->code & 0xff, dlen)); + DPRINTF(sc, UATH_DEBUG_RX_PROC | UATH_DEBUG_RECV_ALL, + "%s: code %d data len %u\n", + __func__, hdr->code & 0xff, dlen); /* * The first response from the target after the * HOST_AVAILABLE has an invalid msgid so we must @@ -1431,11 +1457,13 @@ case WDCMSG_SEND_COMPLETE: /* this notification is sent when UATH_TX_NOTIFY is set */ - DPRINTF(("received Tx notification\n")); + DPRINTF(sc, UATH_DEBUG_RX_PROC | UATH_DEBUG_RECV_ALL, + "%s: received Tx notification\n", __func__); break; case WDCMSG_TARGET_GET_STATS: - DPRINTFN(2, ("received device statistics\n")); + DPRINTF(sc, UATH_DEBUG_RX_PROC | UATH_DEBUG_RECV_ALL, + "%s: received device statistics\n", __func__); callout_reset(&sc->stat_ch, hz, uath_stat, sc); break; } @@ -1504,7 +1532,8 @@ if (status == USBD_NOT_STARTED || status == USBD_CANCELLED) return; - DPRINTF(("%s: status %u\n", __func__, status)); + DPRINTF(sc, UATH_DEBUG_RECV | UATH_DEBUG_RECV_ALL, + "%s: status %u\n", __func__, status); if (status == USBD_STALLED) usbd_clear_endpoint_stall_async(sc->sc_data_rxpipe); ifp->if_ierrors++; @@ -1513,7 +1542,8 @@ usbd_get_xfer_status(xfer, NULL, NULL, &len, NULL); if (len < UATH_MIN_RXBUFSZ) { - DPRINTF(("%s: wrong xfer size (len=%d)\n", __func__, len)); + DPRINTF(sc, UATH_DEBUG_RECV | UATH_DEBUG_RECV_ALL, + "%s: wrong xfer size (len=%d)\n", __func__, len); ifp->if_ierrors++; goto skip; } @@ -1572,7 +1602,8 @@ mnew = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); if (mnew == NULL) { - DPRINTF(("%s: can't get new mbuf, drop frame\n", __func__)); + DPRINTF(sc, UATH_DEBUG_RECV | UATH_DEBUG_RECV_ALL, + "%s: can't get new mbuf, drop frame\n", __func__); ifp->if_ierrors++; needreset = 1; goto skip; @@ -1597,17 +1628,19 @@ sizeof(struct uath_chunk) + be16toh(chunk->length) - sizeof(struct uath_rx_desc)); - DPRINTF(("%s: frame len %u code %u status %u rate %u antenna %u " + DPRINTF(sc, UATH_DEBUG_RECV | UATH_DEBUG_RECV_ALL, + "%s: frame len %u code %u status %u rate %u antenna %u " "rssi %d channel %u phyerror %u connix %u decrypterror %u " "keycachemiss %u\n", __func__, be32toh(desc->framelen) , be32toh(desc->code), be32toh(desc->status), be32toh(desc->rate) , be32toh(desc->antenna), be32toh(desc->rssi), be32toh(desc->channel) , be32toh(desc->phyerror), be32toh(desc->connix) - , be32toh(desc->decrypterror), be32toh(desc->keycachemiss))); + , be32toh(desc->decrypterror), be32toh(desc->keycachemiss)); if (be32toh(desc->len) > MCLBYTES) { - DPRINTF(("%s: bad descriptor (len=%d)\n", __func__, - be32toh(desc->len))); + DPRINTF(sc, UATH_DEBUG_RECV | UATH_DEBUG_RECV_ALL, + "%s: bad descriptor (len=%d)\n", __func__, + be32toh(desc->len)); ifp->if_iqdrops++; UATH_STAT_INC(sc, st_toobigrxpkt); needreset = 1; @@ -2001,7 +2034,8 @@ error = uath_get_capability(sc, x, &v); \ if (error != 0) \ return (error); \ - DPRINTF(("%s: %s=0x%08x\n", __func__, #x, v)); \ + DPRINTF(sc, UATH_DEBUG_DEVCAP, \ + "%s: %s=0x%08x\n", __func__, #x, v); \ } while (0) struct uath_devcap *cap = &sc->sc_devcap; int error; @@ -2079,7 +2113,7 @@ { int ac, error; - DPRINTF(("reset Tx queues\n")); + DPRINTF(sc, UATH_DEBUG_RESET, "%s: reset Tx queues\n", __func__); for (ac = 0; ac < 4; ac++) { const uint32_t qid = htobe32(ac); @@ -2104,7 +2138,7 @@ struct uath_cmd_txq_setup qinfo; int ac, error; - DPRINTF(("setup Tx queues\n")); + DPRINTF(sc, UATH_DEBUG_WME, "%s: setup Tx queues\n", __func__); for (ac = 0; ac < 4; ac++) { qinfo.qid = htobe32(ac); qinfo.len = htobe32(sizeof(qinfo.attr)); @@ -2152,9 +2186,9 @@ reset.channelchange = htobe32(1); reset.keeprccontent = htobe32(0); - DPRINTF(("set channel %d, flags 0x%x freq %u\n", + DPRINTF(sc, UATH_DEBUG_CHANNEL, "set channel %d, flags 0x%x freq %u\n", ieee80211_chan2ieee(ic, c), - be32toh(reset.flags), be32toh(reset.freq))); + be32toh(reset.flags), be32toh(reset.freq)); return uath_cmd_write(sc, WDCMSG_RESET, &reset, sizeof reset, 0); } @@ -2183,7 +2217,8 @@ for (i = 0; i < wk->wk_keylen; i++) crypto.key[i] = wk->wk_key[i] ^ 0xaa; - DPRINTF(("setting crypto key index=%d len=%d\n", index, wk->wk_keylen)); + DPRINTF(sc, UATH_DEBUG_CRYPTO, + "setting crypto key index=%d len=%d\n", index, wk->wk_keylen); return uath_cmd_write(sc, WDCMSG_SET_KEY_CACHE_ENTRY, &crypto, sizeof crypto, 0); #else @@ -2226,7 +2261,8 @@ rates.rateset.length = rs->rs_nrates; bcopy(rs->rs_rates, &rates.rateset.set[0], rs->rs_nrates); - DPRINTF(("setting supported rates nrates=%d\n", rs->rs_nrates)); + DPRINTF(sc, UATH_DEBUG_RATES, + "setting supported rates nrates=%d\n", rs->rs_nrates); return uath_cmd_write(sc, WDCMSG_SET_BASIC_RATE, &rates, sizeof rates, 0); } @@ -2239,7 +2275,8 @@ rxfilter.bits = htobe32(bits); rxfilter.op = htobe32(op); - DPRINTF(("setting Rx filter=0x%x flags=0x%x\n", bits, op)); + DPRINTF(sc, UATH_DEBUG_RECV | UATH_DEBUG_RECV_ALL, + "setting Rx filter=0x%x flags=0x%x\n", bits, op); return uath_cmd_write(sc, WDCMSG_RX_FILTER, &rxfilter, sizeof rxfilter, 0); } @@ -2248,7 +2285,8 @@ uath_set_ledstate(struct uath_softc *sc, int connected) { - DPRINTFN(2, ("set led state %sconnected\n", connected ? "" : "!")); + DPRINTF(sc, UATH_DEBUG_LED, + "set led state %sconnected\n", connected ? "" : "!"); connected = htobe32(connected); return uath_cmd_write(sc, WDCMSG_SET_LED_STATE, &connected, sizeof connected, 0); @@ -2262,9 +2300,9 @@ led.lednum = htobe32(lednum); led.ledmode = htobe32(ledmode); - DPRINTFN(2, ("set %s led %s (steady)\n", + DPRINTF(sc, UATH_DEBUG_LED, "set %s led %s (steady)\n", (lednum == UATH_LED_LINK) ? "link" : "activity", - ledmode ? "on" : "off")); + ledmode ? "on" : "off"); return uath_cmd_write(sc, WDCMSG_SET_LED_STEADY, &led, sizeof led, 0); } @@ -2279,9 +2317,9 @@ led.blinkrate = htobe32(blinkrate); led.slowmode = htobe32(slowmode); - DPRINTFN(2, ("set %s led %s (blink)\n", + DPRINTF(sc, UATH_DEBUG_LED, "set %s led %s (blink)\n", (lednum == UATH_LED_LINK) ? "link" : "activity", - ledmode ? "on" : "off")); + ledmode ? "on" : "off"); return uath_cmd_write(sc, WDCMSG_SET_LED_BLINK, &led, sizeof led, 0); } @@ -2398,8 +2436,8 @@ UATH_LOCK(sc); goto fail; } - DPRINTF(("%s returns handle: 0x%x\n", - uath_codename(WDCMSG_TARGET_START), be32toh(val))); + DPRINTF(sc, UATH_DEBUG_INIT, "%s returns handle: 0x%x\n", + uath_codename(WDCMSG_TARGET_START), be32toh(val)); UATH_LOCK(sc); error = uath_wme_init(sc); ==== //depot/projects/vap/sys/dev/usb/if_uathvar.h#2 (text+ko) ==== @@ -150,6 +150,7 @@ usbd_device_handle sc_udev; usbd_interface_handle sc_iface; struct mtx sc_mtx; + uint32_t sc_debug; struct uath_stat sc_stat; int (*sc_newstate)(struct ieee80211com *, From owner-p4-projects@FreeBSD.ORG Sat Jan 17 06:27:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A6BF106567E; Sat, 17 Jan 2009 06:27:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 18EE9106567C for ; Sat, 17 Jan 2009 06:27:39 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E03B18FC08 for ; Sat, 17 Jan 2009 06:27:38 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0H6Rc2L011826 for ; Sat, 17 Jan 2009 06:27:38 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0H6Rc8k011824 for perforce@freebsd.org; Sat, 17 Jan 2009 06:27:38 GMT (envelope-from weongyo@FreeBSD.org) Date: Sat, 17 Jan 2009 06:27:38 GMT Message-Id: <200901170627.n0H6Rc8k011824@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 156276 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Jan 2009 06:27:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=156276 Change 156276 by weongyo@weongyo_ws on 2009/01/17 06:26:52 cleanup missed elements of the debug messages. Affected files ... .. //depot/projects/vap/sys/dev/usb/if_uath.c#4 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_uath.c#4 (text+ko) ==== @@ -134,6 +134,9 @@ UATH_DEBUG_RATES = 0x00001000, /* rates */ UATH_DEBUG_CRYPTO = 0x00002000, /* crypto */ UATH_DEBUG_LED = 0x00004000, /* LED */ + UATH_DEBUG_CMDS = 0x00008000, /* commands */ + UATH_DEBUG_CMDS_DUMP = 0x00010000, /* command buffer dump */ + UATH_DEBUG_XMIT_DUMP = 0x00020000, /* xmit dump */ UATH_DEBUG_ANY = 0xffffffff }; #define DPRINTF(sc, m, fmt, ...) do { \ @@ -1185,10 +1188,10 @@ bcopy(idata, (uint8_t *)(hdr + 1), ilen); #ifdef UATH_DEBUG - if (uath_debug >= 5) { + if (sc->sc_debug & UATH_DEBUG_CMDS) { printf("%s: send %s [ix %u flags 0x%x] olen %d\n", __func__, uath_codename(code), sc->sc_cmd_idx, flags, olen); - if (uath_debug >= 6) + if (sc->sc_debug & UATH_DEBUG_CMDS_DUMP) uath_dump_cmd(cmd->buf, xferlen, '+'); } #endif @@ -1354,12 +1357,12 @@ hdr = (struct uath_cmd_hdr *)cmd->buf; /* NB: msgid is passed thru w/o byte swapping */ #ifdef UATH_DEBUG - if (uath_debug >= 5) { + if (sc->sc_debug & UATH_DEBUG_CMDS) { int len = be32toh(hdr->len); printf("%s: %s [ix %u] len %u status %u\n", __func__, uath_codename(be32toh(hdr->code)), hdr->msgid, len, be32toh(hdr->magic)); - if (uath_debug >= 6) + if (sc->sc_debug & UATH_DEBUG_CMDS_DUMP) uath_dump_cmd(cmd->buf, len > UATH_MAX_RXCMDSZ ? sizeof(*hdr) : len, '-'); } @@ -1738,9 +1741,9 @@ desc->flags = htobe32(0); #ifdef UATH_DEBUG - if (uath_debug >= 5) { + if (sc->sc_debug & UATH_DEBUG_CMDS) { printf("send flush ix %u\n", data_idx); - if (uath_debug >= 6) + if (sc->sc_debug & UATH_DEBUG_CMDS_DUMP) uath_dump_cmd(data->buf, xferlen, '+'); } #endif @@ -1895,13 +1898,12 @@ desc->buflen = htobe32(m0->m_pkthdr.len); #ifdef UATH_DEBUG - if (uath_debug >= 5) { - printf("send frame ix %u framelen %d msglen %d connid 0x%x " - "txqid 0x%x\n", data_idx, framelen, msglen, - be32toh(desc->connid), be32toh(desc->txqid)); - if (uath_debug >= 6) - uath_dump_cmd(data->buf, xferlen, '+'); - } + DPRINTF(sc, UATH_DEBUG_XMIT, + "send frame ix %u framelen %d msglen %d connid 0x%x txqid 0x%x\n", + data_idx, framelen, msglen, be32toh(desc->connid), + be32toh(desc->txqid)); + if (sc->sc_debug & UATH_DEBUG_XMIT_DUMP) + uath_dump_cmd(data->buf, xferlen, '+'); #endif usbd_setup_xfer(data->xfer, sc->sc_data_txpipe, data, data->buf, xferlen, USBD_FORCE_SHORT_XFER | USBD_NO_COPY, UATH_DATA_TIMEOUT, From owner-p4-projects@FreeBSD.ORG Sat Jan 17 06:29:41 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 552C11065673; Sat, 17 Jan 2009 06:29:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 13861106566B for ; Sat, 17 Jan 2009 06:29:41 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DB2FB8FC19 for ; Sat, 17 Jan 2009 06:29:40 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0H6TeGV011951 for ; Sat, 17 Jan 2009 06:29:40 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0H6TeGT011949 for perforce@freebsd.org; Sat, 17 Jan 2009 06:29:40 GMT (envelope-from weongyo@FreeBSD.org) Date: Sat, 17 Jan 2009 06:29:40 GMT Message-Id: <200901170629.n0H6TeGT011949@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 156277 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Jan 2009 06:29:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=156277 Change 156277 by weongyo@weongyo_ws on 2009/01/17 06:29:19 reordering the debugging enums. Affected files ... .. //depot/projects/vap/sys/dev/usb/if_uath.c#5 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_uath.c#5 (text+ko) ==== @@ -120,23 +120,23 @@ TUNABLE_INT("hw.usb.uath.debug", &uath_debug); enum { UATH_DEBUG_XMIT = 0x00000001, /* basic xmit operation */ - UATH_DEBUG_RECV = 0x00000002, /* basic recv operation */ - UATH_DEBUG_TX_PROC = 0x00000004, /* tx ISR proc */ - UATH_DEBUG_RX_PROC = 0x00000008, /* rx ISR proc */ - UATH_DEBUG_RECV_ALL = 0x00000010, /* trace all frames (beacons) */ - UATH_DEBUG_INIT = 0x00000020, /* initialization of dev */ - UATH_DEBUG_DEVCAP = 0x00000040, /* dev caps */ - UATH_DEBUG_RESET = 0x00000080, /* reset processing */ - UATH_DEBUG_STATE = 0x00000100, /* 802.11 state transitions */ - UATH_DEBUG_MULTICAST = 0x00000200, /* multicast */ - UATH_DEBUG_WME = 0x00000400, /* WME */ - UATH_DEBUG_CHANNEL = 0x00000800, /* channel */ - UATH_DEBUG_RATES = 0x00001000, /* rates */ - UATH_DEBUG_CRYPTO = 0x00002000, /* crypto */ - UATH_DEBUG_LED = 0x00004000, /* LED */ - UATH_DEBUG_CMDS = 0x00008000, /* commands */ - UATH_DEBUG_CMDS_DUMP = 0x00010000, /* command buffer dump */ - UATH_DEBUG_XMIT_DUMP = 0x00020000, /* xmit dump */ + UATH_DEBUG_XMIT_DUMP = 0x00000002, /* xmit dump */ + UATH_DEBUG_RECV = 0x00000004, /* basic recv operation */ + UATH_DEBUG_TX_PROC = 0x00000008, /* tx ISR proc */ + UATH_DEBUG_RX_PROC = 0x00000010, /* rx ISR proc */ + UATH_DEBUG_RECV_ALL = 0x00000020, /* trace all frames (beacons) */ + UATH_DEBUG_INIT = 0x00000040, /* initialization of dev */ + UATH_DEBUG_DEVCAP = 0x00000080, /* dev caps */ + UATH_DEBUG_CMDS = 0x00000100, /* commands */ + UATH_DEBUG_CMDS_DUMP = 0x00000200, /* command buffer dump */ + UATH_DEBUG_RESET = 0x00000400, /* reset processing */ + UATH_DEBUG_STATE = 0x00000800, /* 802.11 state transitions */ + UATH_DEBUG_MULTICAST = 0x00001000, /* multicast */ + UATH_DEBUG_WME = 0x00002000, /* WME */ + UATH_DEBUG_CHANNEL = 0x00004000, /* channel */ + UATH_DEBUG_RATES = 0x00008000, /* rates */ + UATH_DEBUG_CRYPTO = 0x00010000, /* crypto */ + UATH_DEBUG_LED = 0x00020000, /* LED */ UATH_DEBUG_ANY = 0xffffffff }; #define DPRINTF(sc, m, fmt, ...) do { \ From owner-p4-projects@FreeBSD.ORG Sat Jan 17 09:30:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A1DC81065674; Sat, 17 Jan 2009 09:30:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 62B6F106564A for ; Sat, 17 Jan 2009 09:30:45 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 514C58FC08 for ; Sat, 17 Jan 2009 09:30:45 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0H9UjI7037849 for ; Sat, 17 Jan 2009 09:30:45 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0H9UjpV037847 for perforce@freebsd.org; Sat, 17 Jan 2009 09:30:45 GMT (envelope-from weongyo@FreeBSD.org) Date: Sat, 17 Jan 2009 09:30:45 GMT Message-Id: <200901170930.n0H9UjpV037847@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 156283 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Jan 2009 09:30:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=156283 Change 156283 by weongyo@weongyo_ws on 2009/01/17 09:29:48 read the regulatory capabilities to use in further work. Affected files ... .. //depot/projects/vap/sys/dev/usb/if_uath.c#6 edit .. //depot/projects/vap/sys/dev/usb/if_uathvar.h#3 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_uath.c#6 (text+ko) ==== @@ -2052,6 +2052,7 @@ GETCAP(CAP_ANALOG_2GHz_REVISION, cap->analog2GhzRevision); GETCAP(CAP_REG_DOMAIN, cap->regDomain); + GETCAP(CAP_REG_CAP_BITS, cap->regCapBits); #if 0 /* NB: not supported in rev 1.5 */ GETCAP(CAP_COUNTRY_CODE, cap->countryCode); ==== //depot/projects/vap/sys/dev/usb/if_uathvar.h#3 (text+ko) ==== @@ -94,6 +94,7 @@ uint32_t analog5GhzRevision; uint32_t analog2GhzRevision; uint32_t regDomain; + uint32_t regCapBits; uint32_t countryCode; uint32_t keyCacheSize; uint32_t numTxQueues; From owner-p4-projects@FreeBSD.ORG Sat Jan 17 15:24:52 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FB271065674; Sat, 17 Jan 2009 15:24:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BEB0F1065673 for ; Sat, 17 Jan 2009 15:24:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A7B248FC1F for ; Sat, 17 Jan 2009 15:24:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0HFOp3U082796 for ; Sat, 17 Jan 2009 15:24:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0HFOpBm082794 for perforce@freebsd.org; Sat, 17 Jan 2009 15:24:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 17 Jan 2009 15:24:51 GMT Message-Id: <200901171524.n0HFOpBm082794@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156289 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Jan 2009 15:24:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=156289 Change 156289 by rwatson@rwatson_freebsd_capabilities on 2009/01/17 15:24:31 First hack at process descriptor support -- compiles, but not yet tested. pdfork(2) returns a file descriptor rather than a process ID, which can be used to manage the process. If the descriptor is closed before the process exits, it will be terminated. Locking around exit/wait/close is particularly tricky and probably not yet right. pdwait(2) is not yet implemented. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/conf/files#12 edit .. //depot/projects/trustedbsd/capabilities/src/sys/conf/options#7 edit .. //depot/projects/trustedbsd/capabilities/src/sys/i386/conf/CAPABILITIES#2 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#13 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#21 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_descrip.c#13 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exit.c#6 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_fork.c#5 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_sig.c#5 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#1 add .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#22 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.master#14 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#22 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#19 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/file.h#11 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/proc.h#7 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/procdesc.h#1 add .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#22 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#22 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#22 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/unistd.h#2 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/user.h#9 edit .. //depot/projects/trustedbsd/capabilities/src/usr.bin/procstat/procstat_files.c#7 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/conf/files#12 (text+ko) ==== @@ -2012,6 +2012,7 @@ kern/sys_capability.c standard kern/sys_generic.c standard kern/sys_pipe.c standard +kern/sys_procdesc.c standard kern/sys_process.c standard kern/sys_socket.c standard kern/syscalls.c optional witness | invariants | kdtrace_hooks ==== //depot/projects/trustedbsd/capabilities/src/sys/conf/options#7 (text+ko) ==== @@ -141,6 +141,7 @@ PPC_PROBE_CHIPSET opt_ppc.h PPS_SYNC opt_ntp.h PREEMPTION opt_sched.h +PROCDESC opt_procdesc.h QUOTA SCHED_4BSD opt_sched.h SCHED_STATS opt_sched.h ==== //depot/projects/trustedbsd/capabilities/src/sys/i386/conf/CAPABILITIES#2 (text+ko) ==== @@ -1,2 +1,3 @@ include GENERIC options CAPABILITIES +options PROCDESC ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#13 (text+ko) ==== @@ -38,7 +38,7 @@ ## - sys_exit(2), abort2(2) and close(2) are very important. ## - Sorted alphabetically, please keep it that way. ## -## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#12 $ +## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#13 $ ## ## @@ -482,6 +482,14 @@ openbsd_poll ## +## Process descriptor-related system calls are allowed. +## +pdfork +pdgetpid +pdkill +pdwait4 + +## ## Allow pipe(2). ## pipe ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#21 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.246 2008/11/09 10:48:06 ed Exp $ - * created from FreeBSD: head/sys/kern/syscalls.master 184789 2008-11-09 10:45:13Z ed + * $FreeBSD$ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.249 2008/11/09 10:45:13 ed Exp */ #include "opt_compat.h" @@ -28,510 +28,518 @@ /* The casts are bogus but will do for now. */ struct sysent sysent[] = { - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 0 = syscall */ - { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0 }, /* 1 = exit */ - { 0, (sy_call_t *)fork, AUE_FORK, NULL, 0, 0 }, /* 2 = fork */ - { AS(read_args), (sy_call_t *)read, AUE_NULL, NULL, 0, 0 }, /* 3 = read */ - { AS(write_args), (sy_call_t *)write, AUE_NULL, NULL, 0, 0 }, /* 4 = write */ - { AS(open_args), (sy_call_t *)open, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 5 = open */ - { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0 }, /* 6 = close */ - { AS(wait_args), (sy_call_t *)wait4, AUE_WAIT4, NULL, 0, 0 }, /* 7 = wait4 */ - { compat(AS(ocreat_args),creat), AUE_CREAT, NULL, 0, 0 }, /* 8 = old creat */ - { AS(link_args), (sy_call_t *)link, AUE_LINK, NULL, 0, 0 }, /* 9 = link */ - { AS(unlink_args), (sy_call_t *)unlink, AUE_UNLINK, NULL, 0, 0 }, /* 10 = unlink */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 11 = obsolete execv */ - { AS(chdir_args), (sy_call_t *)chdir, AUE_CHDIR, NULL, 0, 0 }, /* 12 = chdir */ - { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR, NULL, 0, 0 }, /* 13 = fchdir */ - { AS(mknod_args), (sy_call_t *)mknod, AUE_MKNOD, NULL, 0, 0 }, /* 14 = mknod */ - { AS(chmod_args), (sy_call_t *)chmod, AUE_CHMOD, NULL, 0, 0 }, /* 15 = chmod */ - { AS(chown_args), (sy_call_t *)chown, AUE_CHOWN, NULL, 0, 0 }, /* 16 = chown */ - { AS(obreak_args), (sy_call_t *)obreak, AUE_NULL, NULL, 0, 0 }, /* 17 = break */ - { compat4(AS(freebsd4_getfsstat_args),getfsstat), AUE_GETFSSTAT, NULL, 0, 0 }, /* 18 = old getfsstat */ - { compat(AS(olseek_args),lseek), AUE_LSEEK, NULL, 0, 0 }, /* 19 = old lseek */ - { 0, (sy_call_t *)getpid, AUE_GETPID, NULL, 0, 0 }, /* 20 = getpid */ - { AS(mount_args), (sy_call_t *)mount, AUE_MOUNT, NULL, 0, 0 }, /* 21 = mount */ - { AS(unmount_args), (sy_call_t *)unmount, AUE_UMOUNT, NULL, 0, 0 }, /* 22 = unmount */ - { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID, NULL, 0, 0 }, /* 23 = setuid */ - { 0, (sy_call_t *)getuid, AUE_GETUID, NULL, 0, 0 }, /* 24 = getuid */ - { 0, (sy_call_t *)geteuid, AUE_GETEUID, NULL, 0, 0 }, /* 25 = geteuid */ - { AS(ptrace_args), (sy_call_t *)ptrace, AUE_PTRACE, NULL, 0, 0 }, /* 26 = ptrace */ - { AS(recvmsg_args), (sy_call_t *)recvmsg, AUE_RECVMSG, NULL, 0, 0 }, /* 27 = recvmsg */ - { AS(sendmsg_args), (sy_call_t *)sendmsg, AUE_SENDMSG, NULL, 0, 0 }, /* 28 = sendmsg */ - { AS(recvfrom_args), (sy_call_t *)recvfrom, AUE_RECVFROM, NULL, 0, 0 }, /* 29 = recvfrom */ - { AS(accept_args), (sy_call_t *)accept, AUE_ACCEPT, NULL, 0, 0 }, /* 30 = accept */ - { AS(getpeername_args), (sy_call_t *)getpeername, AUE_GETPEERNAME, NULL, 0, 0 }, /* 31 = getpeername */ - { AS(getsockname_args), (sy_call_t *)getsockname, AUE_GETSOCKNAME, NULL, 0, 0 }, /* 32 = getsockname */ - { AS(access_args), (sy_call_t *)access, AUE_ACCESS, NULL, 0, 0 }, /* 33 = access */ - { AS(chflags_args), (sy_call_t *)chflags, AUE_CHFLAGS, NULL, 0, 0 }, /* 34 = chflags */ - { AS(fchflags_args), (sy_call_t *)fchflags, AUE_FCHFLAGS, NULL, 0, 0 }, /* 35 = fchflags */ - { 0, (sy_call_t *)sync, AUE_SYNC, NULL, 0, 0 }, /* 36 = sync */ - { AS(kill_args), (sy_call_t *)kill, AUE_KILL, NULL, 0, 0 }, /* 37 = kill */ - { compat(AS(ostat_args),stat), AUE_STAT, NULL, 0, 0 }, /* 38 = old stat */ - { 0, (sy_call_t *)getppid, AUE_GETPPID, NULL, 0, 0 }, /* 39 = getppid */ - { compat(AS(olstat_args),lstat), AUE_LSTAT, NULL, 0, 0 }, /* 40 = old lstat */ - { AS(dup_args), (sy_call_t *)dup, AUE_DUP, NULL, 0, 0 }, /* 41 = dup */ - { 0, (sy_call_t *)pipe, AUE_PIPE, NULL, 0, 0 }, /* 42 = pipe */ - { 0, (sy_call_t *)getegid, AUE_GETEGID, NULL, 0, 0 }, /* 43 = getegid */ - { AS(profil_args), (sy_call_t *)profil, AUE_PROFILE, NULL, 0, 0 }, /* 44 = profil */ - { AS(ktrace_args), (sy_call_t *)ktrace, AUE_KTRACE, NULL, 0, 0 }, /* 45 = ktrace */ - { compat(AS(osigaction_args),sigaction), AUE_SIGACTION, NULL, 0, 0 }, /* 46 = old sigaction */ - { 0, (sy_call_t *)getgid, AUE_GETGID, NULL, 0, 0 }, /* 47 = getgid */ - { compat(AS(osigprocmask_args),sigprocmask), AUE_SIGPROCMASK, NULL, 0, 0 }, /* 48 = old sigprocmask */ - { AS(getlogin_args), (sy_call_t *)getlogin, AUE_GETLOGIN, NULL, 0, 0 }, /* 49 = getlogin */ - { AS(setlogin_args), (sy_call_t *)setlogin, AUE_SETLOGIN, NULL, 0, 0 }, /* 50 = setlogin */ - { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0 }, /* 51 = acct */ - { compat(0,sigpending), AUE_SIGPENDING, NULL, 0, 0 }, /* 52 = old sigpending */ - { AS(sigaltstack_args), (sy_call_t *)sigaltstack, AUE_SIGALTSTACK, NULL, 0, 0 }, /* 53 = sigaltstack */ - { AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL, NULL, 0, 0 }, /* 54 = ioctl */ - { AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT, NULL, 0, 0 }, /* 55 = reboot */ - { AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE, NULL, 0, 0 }, /* 56 = revoke */ - { AS(symlink_args), (sy_call_t *)symlink, AUE_SYMLINK, NULL, 0, 0 }, /* 57 = symlink */ - { AS(readlink_args), (sy_call_t *)readlink, AUE_READLINK, NULL, 0, 0 }, /* 58 = readlink */ - { AS(execve_args), (sy_call_t *)execve, AUE_EXECVE, NULL, 0, 0 }, /* 59 = execve */ - { AS(umask_args), (sy_call_t *)umask, AUE_UMASK, NULL, 0, 0 }, /* 60 = umask */ - { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT, NULL, 0, 0 }, /* 61 = chroot */ - { compat(AS(ofstat_args),fstat), AUE_FSTAT, NULL, 0, 0 }, /* 62 = old fstat */ - { compat(AS(getkerninfo_args),getkerninfo), AUE_NULL, NULL, 0, 0 }, /* 63 = old getkerninfo */ - { compat(0,getpagesize), AUE_NULL, NULL, 0, 0 }, /* 64 = old getpagesize */ - { AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0 }, /* 65 = msync */ - { 0, (sy_call_t *)vfork, AUE_VFORK, NULL, 0, 0 }, /* 66 = vfork */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 67 = obsolete vread */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 68 = obsolete vwrite */ - { AS(sbrk_args), (sy_call_t *)sbrk, AUE_SBRK, NULL, 0, 0 }, /* 69 = sbrk */ - { AS(sstk_args), (sy_call_t *)sstk, AUE_SSTK, NULL, 0, 0 }, /* 70 = sstk */ - { compat(AS(ommap_args),mmap), AUE_MMAP, NULL, 0, 0 }, /* 71 = old mmap */ - { AS(ovadvise_args), (sy_call_t *)ovadvise, AUE_O_VADVISE, NULL, 0, 0 }, /* 72 = vadvise */ - { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0 }, /* 73 = munmap */ - { AS(mprotect_args), (sy_call_t *)mprotect, AUE_MPROTECT, NULL, 0, 0 }, /* 74 = mprotect */ - { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0 }, /* 75 = madvise */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 76 = obsolete vhangup */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 77 = obsolete vlimit */ - { AS(mincore_args), (sy_call_t *)mincore, AUE_MINCORE, NULL, 0, 0 }, /* 78 = mincore */ - { AS(getgroups_args), (sy_call_t *)getgroups, AUE_GETGROUPS, NULL, 0, 0 }, /* 79 = getgroups */ - { AS(setgroups_args), (sy_call_t *)setgroups, AUE_SETGROUPS, NULL, 0, 0 }, /* 80 = setgroups */ - { 0, (sy_call_t *)getpgrp, AUE_GETPGRP, NULL, 0, 0 }, /* 81 = getpgrp */ - { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP, NULL, 0, 0 }, /* 82 = setpgid */ - { AS(setitimer_args), (sy_call_t *)setitimer, AUE_SETITIMER, NULL, 0, 0 }, /* 83 = setitimer */ - { compat(0,wait), AUE_WAIT4, NULL, 0, 0 }, /* 84 = old wait */ - { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON, NULL, 0, 0 }, /* 85 = swapon */ - { AS(getitimer_args), (sy_call_t *)getitimer, AUE_GETITIMER, NULL, 0, 0 }, /* 86 = getitimer */ - { compat(AS(gethostname_args),gethostname), AUE_SYSCTL, NULL, 0, 0 }, /* 87 = old gethostname */ - { compat(AS(sethostname_args),sethostname), AUE_SYSCTL, NULL, 0, 0 }, /* 88 = old sethostname */ - { 0, (sy_call_t *)getdtablesize, AUE_GETDTABLESIZE, NULL, 0, 0 }, /* 89 = getdtablesize */ - { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2, NULL, 0, 0 }, /* 90 = dup2 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 91 = getdopt */ - { AS(fcntl_args), (sy_call_t *)fcntl, AUE_FCNTL, NULL, 0, 0 }, /* 92 = fcntl */ - { AS(select_args), (sy_call_t *)select, AUE_SELECT, NULL, 0, 0 }, /* 93 = select */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 94 = setdopt */ - { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0 }, /* 95 = fsync */ - { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY, NULL, 0, 0 }, /* 96 = setpriority */ - { AS(socket_args), (sy_call_t *)socket, AUE_SOCKET, NULL, 0, 0 }, /* 97 = socket */ - { AS(connect_args), (sy_call_t *)connect, AUE_CONNECT, NULL, 0, 0 }, /* 98 = connect */ - { compat(AS(accept_args),accept), AUE_ACCEPT, NULL, 0, 0 }, /* 99 = old accept */ - { AS(getpriority_args), (sy_call_t *)getpriority, AUE_GETPRIORITY, NULL, 0, 0 }, /* 100 = getpriority */ - { compat(AS(osend_args),send), AUE_SEND, NULL, 0, 0 }, /* 101 = old send */ - { compat(AS(orecv_args),recv), AUE_RECV, NULL, 0, 0 }, /* 102 = old recv */ - { compat(AS(osigreturn_args),sigreturn), AUE_SIGRETURN, NULL, 0, 0 }, /* 103 = old sigreturn */ - { AS(bind_args), (sy_call_t *)bind, AUE_BIND, NULL, 0, 0 }, /* 104 = bind */ - { AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT, NULL, 0, 0 }, /* 105 = setsockopt */ - { AS(listen_args), (sy_call_t *)listen, AUE_LISTEN, NULL, 0, 0 }, /* 106 = listen */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 107 = obsolete vtimes */ - { compat(AS(osigvec_args),sigvec), AUE_NULL, NULL, 0, 0 }, /* 108 = old sigvec */ - { compat(AS(osigblock_args),sigblock), AUE_NULL, NULL, 0, 0 }, /* 109 = old sigblock */ - { compat(AS(osigsetmask_args),sigsetmask), AUE_NULL, NULL, 0, 0 }, /* 110 = old sigsetmask */ - { compat(AS(osigsuspend_args),sigsuspend), AUE_NULL, NULL, 0, 0 }, /* 111 = old sigsuspend */ - { compat(AS(osigstack_args),sigstack), AUE_NULL, NULL, 0, 0 }, /* 112 = old sigstack */ - { compat(AS(orecvmsg_args),recvmsg), AUE_RECVMSG, NULL, 0, 0 }, /* 113 = old recvmsg */ - { compat(AS(osendmsg_args),sendmsg), AUE_SENDMSG, NULL, 0, 0 }, /* 114 = old sendmsg */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 115 = obsolete vtrace */ - { AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_GETTIMEOFDAY, NULL, 0, 0 }, /* 116 = gettimeofday */ - { AS(getrusage_args), (sy_call_t *)getrusage, AUE_GETRUSAGE, NULL, 0, 0 }, /* 117 = getrusage */ - { AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_GETSOCKOPT, NULL, 0, 0 }, /* 118 = getsockopt */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 119 = resuba */ - { AS(readv_args), (sy_call_t *)readv, AUE_READV, NULL, 0, 0 }, /* 120 = readv */ - { AS(writev_args), (sy_call_t *)writev, AUE_WRITEV, NULL, 0, 0 }, /* 121 = writev */ - { AS(settimeofday_args), (sy_call_t *)settimeofday, AUE_SETTIMEOFDAY, NULL, 0, 0 }, /* 122 = settimeofday */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN, NULL, 0, 0 }, /* 123 = fchown */ - { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD, NULL, 0, 0 }, /* 124 = fchmod */ - { compat(AS(recvfrom_args),recvfrom), AUE_RECVFROM, NULL, 0, 0 }, /* 125 = old recvfrom */ - { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID, NULL, 0, 0 }, /* 126 = setreuid */ - { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID, NULL, 0, 0 }, /* 127 = setregid */ - { AS(rename_args), (sy_call_t *)rename, AUE_RENAME, NULL, 0, 0 }, /* 128 = rename */ - { compat(AS(otruncate_args),truncate), AUE_TRUNCATE, NULL, 0, 0 }, /* 129 = old truncate */ - { compat(AS(oftruncate_args),ftruncate), AUE_FTRUNCATE, NULL, 0, 0 }, /* 130 = old ftruncate */ - { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0 }, /* 131 = flock */ - { AS(mkfifo_args), (sy_call_t *)mkfifo, AUE_MKFIFO, NULL, 0, 0 }, /* 132 = mkfifo */ - { AS(sendto_args), (sy_call_t *)sendto, AUE_SENDTO, NULL, 0, 0 }, /* 133 = sendto */ - { AS(shutdown_args), (sy_call_t *)shutdown, AUE_SHUTDOWN, NULL, 0, 0 }, /* 134 = shutdown */ - { AS(socketpair_args), (sy_call_t *)socketpair, AUE_SOCKETPAIR, NULL, 0, 0 }, /* 135 = socketpair */ - { AS(mkdir_args), (sy_call_t *)mkdir, AUE_MKDIR, NULL, 0, 0 }, /* 136 = mkdir */ - { AS(rmdir_args), (sy_call_t *)rmdir, AUE_RMDIR, NULL, 0, 0 }, /* 137 = rmdir */ - { AS(utimes_args), (sy_call_t *)utimes, AUE_UTIMES, NULL, 0, 0 }, /* 138 = utimes */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 139 = obsolete 4.2 sigreturn */ - { AS(adjtime_args), (sy_call_t *)adjtime, AUE_ADJTIME, NULL, 0, 0 }, /* 140 = adjtime */ - { compat(AS(ogetpeername_args),getpeername), AUE_GETPEERNAME, NULL, 0, 0 }, /* 141 = old getpeername */ - { compat(0,gethostid), AUE_SYSCTL, NULL, 0, 0 }, /* 142 = old gethostid */ - { compat(AS(osethostid_args),sethostid), AUE_SYSCTL, NULL, 0, 0 }, /* 143 = old sethostid */ - { compat(AS(ogetrlimit_args),getrlimit), AUE_GETRLIMIT, NULL, 0, 0 }, /* 144 = old getrlimit */ - { compat(AS(osetrlimit_args),setrlimit), AUE_SETRLIMIT, NULL, 0, 0 }, /* 145 = old setrlimit */ - { compat(AS(okillpg_args),killpg), AUE_KILLPG, NULL, 0, 0 }, /* 146 = old killpg */ - { 0, (sy_call_t *)setsid, AUE_SETSID, NULL, 0, 0 }, /* 147 = setsid */ - { AS(quotactl_args), (sy_call_t *)quotactl, AUE_QUOTACTL, NULL, 0, 0 }, /* 148 = quotactl */ - { compat(0,quota), AUE_O_QUOTA, NULL, 0, 0 }, /* 149 = old quota */ - { compat(AS(getsockname_args),getsockname), AUE_GETSOCKNAME, NULL, 0, 0 }, /* 150 = old getsockname */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 151 = sem_lock */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 152 = sem_wakeup */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 153 = asyncdaemon */ - { AS(nlm_syscall_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 154 = nlm_syscall */ - { AS(nfssvc_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 155 = nfssvc */ - { compat(AS(ogetdirentries_args),getdirentries), AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 156 = old getdirentries */ - { compat4(AS(freebsd4_statfs_args),statfs), AUE_STATFS, NULL, 0, 0 }, /* 157 = old statfs */ - { compat4(AS(freebsd4_fstatfs_args),fstatfs), AUE_FSTATFS, NULL, 0, 0 }, /* 158 = old fstatfs */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 159 = nosys */ - { AS(lgetfh_args), (sy_call_t *)lgetfh, AUE_LGETFH, NULL, 0, 0 }, /* 160 = lgetfh */ - { AS(getfh_args), (sy_call_t *)getfh, AUE_NFS_GETFH, NULL, 0, 0 }, /* 161 = getfh */ - { compat4(AS(freebsd4_getdomainname_args),getdomainname), AUE_SYSCTL, NULL, 0, 0 }, /* 162 = old getdomainname */ - { compat4(AS(freebsd4_setdomainname_args),setdomainname), AUE_SYSCTL, NULL, 0, 0 }, /* 163 = old setdomainname */ - { compat4(AS(freebsd4_uname_args),uname), AUE_NULL, NULL, 0, 0 }, /* 164 = old uname */ - { AS(sysarch_args), (sy_call_t *)sysarch, AUE_SYSARCH, NULL, 0, 0 }, /* 165 = sysarch */ - { AS(rtprio_args), (sy_call_t *)rtprio, AUE_RTPRIO, NULL, 0, 0 }, /* 166 = rtprio */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 167 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 168 = nosys */ - { AS(semsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 169 = semsys */ - { AS(msgsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 170 = msgsys */ - { AS(shmsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 171 = shmsys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 172 = nosys */ - { AS(freebsd6_pread_args), (sy_call_t *)freebsd6_pread, AUE_PREAD, NULL, 0, 0 }, /* 173 = freebsd6_pread */ - { AS(freebsd6_pwrite_args), (sy_call_t *)freebsd6_pwrite, AUE_PWRITE, NULL, 0, 0 }, /* 174 = freebsd6_pwrite */ - { AS(setfib_args), (sy_call_t *)setfib, AUE_NULL, NULL, 0, 0 }, /* 175 = setfib */ - { AS(ntp_adjtime_args), (sy_call_t *)ntp_adjtime, AUE_NTP_ADJTIME, NULL, 0, 0 }, /* 176 = ntp_adjtime */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 177 = sfork */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 178 = getdescriptor */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 179 = setdescriptor */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 180 = nosys */ - { AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID, NULL, 0, 0 }, /* 181 = setgid */ - { AS(setegid_args), (sy_call_t *)setegid, AUE_SETEGID, NULL, 0, 0 }, /* 182 = setegid */ - { AS(seteuid_args), (sy_call_t *)seteuid, AUE_SETEUID, NULL, 0, 0 }, /* 183 = seteuid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 184 = lfs_bmapv */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 185 = lfs_markv */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 186 = lfs_segclean */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 187 = lfs_segwait */ - { AS(stat_args), (sy_call_t *)stat, AUE_STAT, NULL, 0, 0 }, /* 188 = stat */ - { AS(fstat_args), (sy_call_t *)fstat, AUE_FSTAT, NULL, 0, 0 }, /* 189 = fstat */ - { AS(lstat_args), (sy_call_t *)lstat, AUE_LSTAT, NULL, 0, 0 }, /* 190 = lstat */ - { AS(pathconf_args), (sy_call_t *)pathconf, AUE_PATHCONF, NULL, 0, 0 }, /* 191 = pathconf */ - { AS(fpathconf_args), (sy_call_t *)fpathconf, AUE_FPATHCONF, NULL, 0, 0 }, /* 192 = fpathconf */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 193 = nosys */ - { AS(__getrlimit_args), (sy_call_t *)getrlimit, AUE_GETRLIMIT, NULL, 0, 0 }, /* 194 = getrlimit */ - { AS(__setrlimit_args), (sy_call_t *)setrlimit, AUE_SETRLIMIT, NULL, 0, 0 }, /* 195 = setrlimit */ - { AS(getdirentries_args), (sy_call_t *)getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 196 = getdirentries */ - { AS(freebsd6_mmap_args), (sy_call_t *)freebsd6_mmap, AUE_MMAP, NULL, 0, 0 }, /* 197 = freebsd6_mmap */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 198 = __syscall */ - { AS(freebsd6_lseek_args), (sy_call_t *)freebsd6_lseek, AUE_LSEEK, NULL, 0, 0 }, /* 199 = freebsd6_lseek */ - { AS(freebsd6_truncate_args), (sy_call_t *)freebsd6_truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 200 = freebsd6_truncate */ - { AS(freebsd6_ftruncate_args), (sy_call_t *)freebsd6_ftruncate, AUE_FTRUNCATE, NULL, 0, 0 }, /* 201 = freebsd6_ftruncate */ - { AS(sysctl_args), (sy_call_t *)__sysctl, AUE_SYSCTL, NULL, 0, 0 }, /* 202 = __sysctl */ - { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK, NULL, 0, 0 }, /* 203 = mlock */ - { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK, NULL, 0, 0 }, /* 204 = munlock */ - { AS(undelete_args), (sy_call_t *)undelete, AUE_UNDELETE, NULL, 0, 0 }, /* 205 = undelete */ - { AS(futimes_args), (sy_call_t *)futimes, AUE_FUTIMES, NULL, 0, 0 }, /* 206 = futimes */ - { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0 }, /* 207 = getpgid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 208 = newreboot */ - { AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0 }, /* 209 = poll */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 210 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 211 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 212 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 213 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 214 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 215 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 216 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 217 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 218 = lkmnosys */ - { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 219 = lkmnosys */ - { AS(__semctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 220 = __semctl */ - { AS(semget_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 221 = semget */ - { AS(semop_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 222 = semop */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 223 = semconfig */ - { AS(msgctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 224 = msgctl */ - { AS(msgget_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 225 = msgget */ - { AS(msgsnd_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 226 = msgsnd */ - { AS(msgrcv_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 227 = msgrcv */ - { AS(shmat_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 228 = shmat */ - { AS(shmctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 229 = shmctl */ - { AS(shmdt_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 230 = shmdt */ - { AS(shmget_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 231 = shmget */ - { AS(clock_gettime_args), (sy_call_t *)clock_gettime, AUE_NULL, NULL, 0, 0 }, /* 232 = clock_gettime */ - { AS(clock_settime_args), (sy_call_t *)clock_settime, AUE_CLOCK_SETTIME, NULL, 0, 0 }, /* 233 = clock_settime */ - { AS(clock_getres_args), (sy_call_t *)clock_getres, AUE_NULL, NULL, 0, 0 }, /* 234 = clock_getres */ - { AS(ktimer_create_args), (sy_call_t *)ktimer_create, AUE_NULL, NULL, 0, 0 }, /* 235 = ktimer_create */ - { AS(ktimer_delete_args), (sy_call_t *)ktimer_delete, AUE_NULL, NULL, 0, 0 }, /* 236 = ktimer_delete */ - { AS(ktimer_settime_args), (sy_call_t *)ktimer_settime, AUE_NULL, NULL, 0, 0 }, /* 237 = ktimer_settime */ - { AS(ktimer_gettime_args), (sy_call_t *)ktimer_gettime, AUE_NULL, NULL, 0, 0 }, /* 238 = ktimer_gettime */ - { AS(ktimer_getoverrun_args), (sy_call_t *)ktimer_getoverrun, AUE_NULL, NULL, 0, 0 }, /* 239 = ktimer_getoverrun */ - { AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL, NULL, 0, 0 }, /* 240 = nanosleep */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 241 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 242 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 243 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 244 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 245 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 246 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 247 = nosys */ - { AS(ntp_gettime_args), (sy_call_t *)ntp_gettime, AUE_NULL, NULL, 0, 0 }, /* 248 = ntp_gettime */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 249 = nosys */ - { AS(minherit_args), (sy_call_t *)minherit, AUE_MINHERIT, NULL, 0, 0 }, /* 250 = minherit */ - { AS(rfork_args), (sy_call_t *)rfork, AUE_RFORK, NULL, 0, 0 }, /* 251 = rfork */ - { AS(openbsd_poll_args), (sy_call_t *)openbsd_poll, AUE_POLL, NULL, 0, 0 }, /* 252 = openbsd_poll */ - { 0, (sy_call_t *)issetugid, AUE_ISSETUGID, NULL, 0, 0 }, /* 253 = issetugid */ - { AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0 }, /* 254 = lchown */ - { AS(aio_read_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 255 = aio_read */ - { AS(aio_write_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 256 = aio_write */ - { AS(lio_listio_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 257 = lio_listio */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 258 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 259 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 260 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 261 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 262 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 263 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 264 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 265 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 266 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 267 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 268 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 269 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 270 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 271 = nosys */ - { AS(getdents_args), (sy_call_t *)getdents, AUE_O_GETDENTS, NULL, 0, 0 }, /* 272 = getdents */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 273 = nosys */ - { AS(lchmod_args), (sy_call_t *)lchmod, AUE_LCHMOD, NULL, 0, 0 }, /* 274 = lchmod */ - { AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0 }, /* 275 = netbsd_lchown */ - { AS(lutimes_args), (sy_call_t *)lutimes, AUE_LUTIMES, NULL, 0, 0 }, /* 276 = lutimes */ - { AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0 }, /* 277 = netbsd_msync */ - { AS(nstat_args), (sy_call_t *)nstat, AUE_STAT, NULL, 0, 0 }, /* 278 = nstat */ - { AS(nfstat_args), (sy_call_t *)nfstat, AUE_FSTAT, NULL, 0, 0 }, /* 279 = nfstat */ - { AS(nlstat_args), (sy_call_t *)nlstat, AUE_LSTAT, NULL, 0, 0 }, /* 280 = nlstat */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 281 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 282 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 283 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 284 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 285 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 286 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 287 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 288 = nosys */ - { AS(preadv_args), (sy_call_t *)preadv, AUE_PREADV, NULL, 0, 0 }, /* 289 = preadv */ - { AS(pwritev_args), (sy_call_t *)pwritev, AUE_PWRITEV, NULL, 0, 0 }, /* 290 = pwritev */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 291 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 292 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 293 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 294 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 295 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 296 = nosys */ - { compat4(AS(freebsd4_fhstatfs_args),fhstatfs), AUE_FHSTATFS, NULL, 0, 0 }, /* 297 = old fhstatfs */ - { AS(fhopen_args), (sy_call_t *)fhopen, AUE_FHOPEN, NULL, 0, 0 }, /* 298 = fhopen */ - { AS(fhstat_args), (sy_call_t *)fhstat, AUE_FHSTAT, NULL, 0, 0 }, /* 299 = fhstat */ - { AS(modnext_args), (sy_call_t *)modnext, AUE_NULL, NULL, 0, 0 }, /* 300 = modnext */ - { AS(modstat_args), (sy_call_t *)modstat, AUE_NULL, NULL, 0, 0 }, /* 301 = modstat */ - { AS(modfnext_args), (sy_call_t *)modfnext, AUE_NULL, NULL, 0, 0 }, /* 302 = modfnext */ - { AS(modfind_args), (sy_call_t *)modfind, AUE_NULL, NULL, 0, 0 }, /* 303 = modfind */ - { AS(kldload_args), (sy_call_t *)kldload, AUE_MODLOAD, NULL, 0, 0 }, /* 304 = kldload */ - { AS(kldunload_args), (sy_call_t *)kldunload, AUE_MODUNLOAD, NULL, 0, 0 }, /* 305 = kldunload */ - { AS(kldfind_args), (sy_call_t *)kldfind, AUE_NULL, NULL, 0, 0 }, /* 306 = kldfind */ - { AS(kldnext_args), (sy_call_t *)kldnext, AUE_NULL, NULL, 0, 0 }, /* 307 = kldnext */ - { AS(kldstat_args), (sy_call_t *)kldstat, AUE_NULL, NULL, 0, 0 }, /* 308 = kldstat */ - { AS(kldfirstmod_args), (sy_call_t *)kldfirstmod, AUE_NULL, NULL, 0, 0 }, /* 309 = kldfirstmod */ - { AS(getsid_args), (sy_call_t *)getsid, AUE_GETSID, NULL, 0, 0 }, /* 310 = getsid */ - { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID, NULL, 0, 0 }, /* 311 = setresuid */ - { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID, NULL, 0, 0 }, /* 312 = setresgid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 313 = obsolete signanosleep */ - { AS(aio_return_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 314 = aio_return */ - { AS(aio_suspend_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 315 = aio_suspend */ - { AS(aio_cancel_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 316 = aio_cancel */ - { AS(aio_error_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 317 = aio_error */ - { AS(oaio_read_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 318 = oaio_read */ - { AS(oaio_write_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 319 = oaio_write */ - { AS(olio_listio_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 320 = olio_listio */ - { 0, (sy_call_t *)yield, AUE_NULL, NULL, 0, 0 }, /* 321 = yield */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 322 = obsolete thr_sleep */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 323 = obsolete thr_wakeup */ - { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL, NULL, 0, 0 }, /* 324 = mlockall */ - { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL, NULL, 0, 0 }, /* 325 = munlockall */ - { AS(__getcwd_args), (sy_call_t *)__getcwd, AUE_GETCWD, NULL, 0, 0 }, /* 326 = __getcwd */ - { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL, NULL, 0, 0 }, /* 327 = sched_setparam */ - { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL, NULL, 0, 0 }, /* 328 = sched_getparam */ - { AS(sched_setscheduler_args), (sy_call_t *)sched_setscheduler, AUE_NULL, NULL, 0, 0 }, /* 329 = sched_setscheduler */ - { AS(sched_getscheduler_args), (sy_call_t *)sched_getscheduler, AUE_NULL, NULL, 0, 0 }, /* 330 = sched_getscheduler */ - { 0, (sy_call_t *)sched_yield, AUE_NULL, NULL, 0, 0 }, /* 331 = sched_yield */ - { AS(sched_get_priority_max_args), (sy_call_t *)sched_get_priority_max, AUE_NULL, NULL, 0, 0 }, /* 332 = sched_get_priority_max */ - { AS(sched_get_priority_min_args), (sy_call_t *)sched_get_priority_min, AUE_NULL, NULL, 0, 0 }, /* 333 = sched_get_priority_min */ - { AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_NULL, NULL, 0, 0 }, /* 334 = sched_rr_get_interval */ - { AS(utrace_args), (sy_call_t *)utrace, AUE_NULL, NULL, 0, 0 }, /* 335 = utrace */ - { compat4(AS(freebsd4_sendfile_args),sendfile), AUE_SENDFILE, NULL, 0, 0 }, /* 336 = old sendfile */ - { AS(kldsym_args), (sy_call_t *)kldsym, AUE_NULL, NULL, 0, 0 }, /* 337 = kldsym */ - { AS(jail_args), (sy_call_t *)jail, AUE_JAIL, NULL, 0, 0 }, /* 338 = jail */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 339 = pioctl */ - { AS(sigprocmask_args), (sy_call_t *)sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0 }, /* 340 = sigprocmask */ - { AS(sigsuspend_args), (sy_call_t *)sigsuspend, AUE_SIGSUSPEND, NULL, 0, 0 }, /* 341 = sigsuspend */ - { compat4(AS(freebsd4_sigaction_args),sigaction), AUE_SIGACTION, NULL, 0, 0 }, /* 342 = old sigaction */ - { AS(sigpending_args), (sy_call_t *)sigpending, AUE_SIGPENDING, NULL, 0, 0 }, /* 343 = sigpending */ - { compat4(AS(freebsd4_sigreturn_args),sigreturn), AUE_SIGRETURN, NULL, 0, 0 }, /* 344 = old sigreturn */ - { AS(sigtimedwait_args), (sy_call_t *)sigtimedwait, AUE_SIGWAIT, NULL, 0, 0 }, /* 345 = sigtimedwait */ - { AS(sigwaitinfo_args), (sy_call_t *)sigwaitinfo, AUE_NULL, NULL, 0, 0 }, /* 346 = sigwaitinfo */ - { AS(__acl_get_file_args), (sy_call_t *)__acl_get_file, AUE_NULL, NULL, 0, 0 }, /* 347 = __acl_get_file */ - { AS(__acl_set_file_args), (sy_call_t *)__acl_set_file, AUE_NULL, NULL, 0, 0 }, /* 348 = __acl_set_file */ - { AS(__acl_get_fd_args), (sy_call_t *)__acl_get_fd, AUE_NULL, NULL, 0, 0 }, /* 349 = __acl_get_fd */ - { AS(__acl_set_fd_args), (sy_call_t *)__acl_set_fd, AUE_NULL, NULL, 0, 0 }, /* 350 = __acl_set_fd */ - { AS(__acl_delete_file_args), (sy_call_t *)__acl_delete_file, AUE_NULL, NULL, 0, 0 }, /* 351 = __acl_delete_file */ - { AS(__acl_delete_fd_args), (sy_call_t *)__acl_delete_fd, AUE_NULL, NULL, 0, 0 }, /* 352 = __acl_delete_fd */ - { AS(__acl_aclcheck_file_args), (sy_call_t *)__acl_aclcheck_file, AUE_NULL, NULL, 0, 0 }, /* 353 = __acl_aclcheck_file */ - { AS(__acl_aclcheck_fd_args), (sy_call_t *)__acl_aclcheck_fd, AUE_NULL, NULL, 0, 0 }, /* 354 = __acl_aclcheck_fd */ - { AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_EXTATTRCTL, NULL, 0, 0 }, /* 355 = extattrctl */ - { AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_EXTATTR_SET_FILE, NULL, 0, 0 }, /* 356 = extattr_set_file */ - { AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_EXTATTR_GET_FILE, NULL, 0, 0 }, /* 357 = extattr_get_file */ - { AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_EXTATTR_DELETE_FILE, NULL, 0, 0 }, /* 358 = extattr_delete_file */ - { AS(aio_waitcomplete_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 359 = aio_waitcomplete */ - { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0 }, /* 360 = getresuid */ - { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0 }, /* 361 = getresgid */ - { 0, (sy_call_t *)kqueue, AUE_KQUEUE, NULL, 0, 0 }, /* 362 = kqueue */ - { AS(kevent_args), (sy_call_t *)kevent, AUE_NULL, NULL, 0, 0 }, /* 363 = kevent */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 364 = __cap_get_proc */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 365 = __cap_set_proc */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 366 = __cap_get_fd */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 367 = __cap_get_file */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 368 = __cap_set_fd */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 369 = __cap_set_file */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 370 = nosys */ - { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_EXTATTR_SET_FD, NULL, 0, 0 }, /* 371 = extattr_set_fd */ - { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_EXTATTR_GET_FD, NULL, 0, 0 }, /* 372 = extattr_get_fd */ - { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_EXTATTR_DELETE_FD, NULL, 0, 0 }, /* 373 = extattr_delete_fd */ - { AS(__setugid_args), (sy_call_t *)__setugid, AUE_NULL, NULL, 0, 0 }, /* 374 = __setugid */ - { AS(nfsclnt_args), (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 375 = nfsclnt */ - { AS(eaccess_args), (sy_call_t *)eaccess, AUE_EACCESS, NULL, 0, 0 }, /* 376 = eaccess */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 377 = afs_syscall */ - { AS(nmount_args), (sy_call_t *)nmount, AUE_NMOUNT, NULL, 0, 0 }, /* 378 = nmount */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 379 = kse_exit */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 380 = kse_wakeup */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 381 = kse_create */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 382 = kse_thr_interrupt */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 383 = kse_release */ - { AS(__mac_get_proc_args), (sy_call_t *)__mac_get_proc, AUE_NULL, NULL, 0, 0 }, /* 384 = __mac_get_proc */ - { AS(__mac_set_proc_args), (sy_call_t *)__mac_set_proc, AUE_NULL, NULL, 0, 0 }, /* 385 = __mac_set_proc */ - { AS(__mac_get_fd_args), (sy_call_t *)__mac_get_fd, AUE_NULL, NULL, 0, 0 }, /* 386 = __mac_get_fd */ - { AS(__mac_get_file_args), (sy_call_t *)__mac_get_file, AUE_NULL, NULL, 0, 0 }, /* 387 = __mac_get_file */ - { AS(__mac_set_fd_args), (sy_call_t *)__mac_set_fd, AUE_NULL, NULL, 0, 0 }, /* 388 = __mac_set_fd */ - { AS(__mac_set_file_args), (sy_call_t *)__mac_set_file, AUE_NULL, NULL, 0, 0 }, /* 389 = __mac_set_file */ - { AS(kenv_args), (sy_call_t *)kenv, AUE_NULL, NULL, 0, 0 }, /* 390 = kenv */ - { AS(lchflags_args), (sy_call_t *)lchflags, AUE_LCHFLAGS, NULL, 0, 0 }, /* 391 = lchflags */ - { AS(uuidgen_args), (sy_call_t *)uuidgen, AUE_NULL, NULL, 0, 0 }, /* 392 = uuidgen */ - { AS(sendfile_args), (sy_call_t *)sendfile, AUE_SENDFILE, NULL, 0, 0 }, /* 393 = sendfile */ - { AS(mac_syscall_args), (sy_call_t *)mac_syscall, AUE_NULL, NULL, 0, 0 }, /* 394 = mac_syscall */ - { AS(getfsstat_args), (sy_call_t *)getfsstat, AUE_GETFSSTAT, NULL, 0, 0 }, /* 395 = getfsstat */ - { AS(statfs_args), (sy_call_t *)statfs, AUE_STATFS, NULL, 0, 0 }, /* 396 = statfs */ - { AS(fstatfs_args), (sy_call_t *)fstatfs, AUE_FSTATFS, NULL, 0, 0 }, /* 397 = fstatfs */ - { AS(fhstatfs_args), (sy_call_t *)fhstatfs, AUE_FHSTATFS, NULL, 0, 0 }, /* 398 = fhstatfs */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 399 = nosys */ - { AS(ksem_close_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 400 = ksem_close */ - { AS(ksem_post_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 401 = ksem_post */ - { AS(ksem_wait_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 402 = ksem_wait */ - { AS(ksem_trywait_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 403 = ksem_trywait */ - { AS(ksem_init_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 404 = ksem_init */ - { AS(ksem_open_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 405 = ksem_open */ - { AS(ksem_unlink_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 406 = ksem_unlink */ - { AS(ksem_getvalue_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 407 = ksem_getvalue */ - { AS(ksem_destroy_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 408 = ksem_destroy */ - { AS(__mac_get_pid_args), (sy_call_t *)__mac_get_pid, AUE_NULL, NULL, 0, 0 }, /* 409 = __mac_get_pid */ - { AS(__mac_get_link_args), (sy_call_t *)__mac_get_link, AUE_NULL, NULL, 0, 0 }, /* 410 = __mac_get_link */ - { AS(__mac_set_link_args), (sy_call_t *)__mac_set_link, AUE_NULL, NULL, 0, 0 }, /* 411 = __mac_set_link */ - { AS(extattr_set_link_args), (sy_call_t *)extattr_set_link, AUE_EXTATTR_SET_LINK, NULL, 0, 0 }, /* 412 = extattr_set_link */ - { AS(extattr_get_link_args), (sy_call_t *)extattr_get_link, AUE_EXTATTR_GET_LINK, NULL, 0, 0 }, /* 413 = extattr_get_link */ - { AS(extattr_delete_link_args), (sy_call_t *)extattr_delete_link, AUE_EXTATTR_DELETE_LINK, NULL, 0, 0 }, /* 414 = extattr_delete_link */ - { AS(__mac_execve_args), (sy_call_t *)__mac_execve, AUE_NULL, NULL, 0, 0 }, /* 415 = __mac_execve */ - { AS(sigaction_args), (sy_call_t *)sigaction, AUE_SIGACTION, NULL, 0, 0 }, /* 416 = sigaction */ - { AS(sigreturn_args), (sy_call_t *)sigreturn, AUE_SIGRETURN, NULL, 0, 0 }, /* 417 = sigreturn */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 418 = __xstat */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 419 = __xfstat */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 420 = __xlstat */ - { AS(getcontext_args), (sy_call_t *)getcontext, AUE_NULL, NULL, 0, 0 }, /* 421 = getcontext */ - { AS(setcontext_args), (sy_call_t *)setcontext, AUE_NULL, NULL, 0, 0 }, /* 422 = setcontext */ - { AS(swapcontext_args), (sy_call_t *)swapcontext, AUE_NULL, NULL, 0, 0 }, /* 423 = swapcontext */ - { AS(swapoff_args), (sy_call_t *)swapoff, AUE_SWAPOFF, NULL, 0, 0 }, /* 424 = swapoff */ - { AS(__acl_get_link_args), (sy_call_t *)__acl_get_link, AUE_NULL, NULL, 0, 0 }, /* 425 = __acl_get_link */ - { AS(__acl_set_link_args), (sy_call_t *)__acl_set_link, AUE_NULL, NULL, 0, 0 }, /* 426 = __acl_set_link */ - { AS(__acl_delete_link_args), (sy_call_t *)__acl_delete_link, AUE_NULL, NULL, 0, 0 }, /* 427 = __acl_delete_link */ - { AS(__acl_aclcheck_link_args), (sy_call_t *)__acl_aclcheck_link, AUE_NULL, NULL, 0, 0 }, /* 428 = __acl_aclcheck_link */ - { AS(sigwait_args), (sy_call_t *)sigwait, AUE_SIGWAIT, NULL, 0, 0 }, /* 429 = sigwait */ - { AS(thr_create_args), (sy_call_t *)thr_create, AUE_NULL, NULL, 0, 0 }, /* 430 = thr_create */ - { AS(thr_exit_args), (sy_call_t *)thr_exit, AUE_NULL, NULL, 0, 0 }, /* 431 = thr_exit */ - { AS(thr_self_args), (sy_call_t *)thr_self, AUE_NULL, NULL, 0, 0 }, /* 432 = thr_self */ - { AS(thr_kill_args), (sy_call_t *)thr_kill, AUE_NULL, NULL, 0, 0 }, /* 433 = thr_kill */ - { AS(_umtx_lock_args), (sy_call_t *)_umtx_lock, AUE_NULL, NULL, 0, 0 }, /* 434 = _umtx_lock */ - { AS(_umtx_unlock_args), (sy_call_t *)_umtx_unlock, AUE_NULL, NULL, 0, 0 }, /* 435 = _umtx_unlock */ - { AS(jail_attach_args), (sy_call_t *)jail_attach, AUE_NULL, NULL, 0, 0 }, /* 436 = jail_attach */ - { AS(extattr_list_fd_args), (sy_call_t *)extattr_list_fd, AUE_EXTATTR_LIST_FD, NULL, 0, 0 }, /* 437 = extattr_list_fd */ - { AS(extattr_list_file_args), (sy_call_t *)extattr_list_file, AUE_EXTATTR_LIST_FILE, NULL, 0, 0 }, /* 438 = extattr_list_file */ - { AS(extattr_list_link_args), (sy_call_t *)extattr_list_link, AUE_EXTATTR_LIST_LINK, NULL, 0, 0 }, /* 439 = extattr_list_link */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 440 = kse_switchin */ - { AS(ksem_timedwait_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 441 = ksem_timedwait */ - { AS(thr_suspend_args), (sy_call_t *)thr_suspend, AUE_NULL, NULL, 0, 0 }, /* 442 = thr_suspend */ - { AS(thr_wake_args), (sy_call_t *)thr_wake, AUE_NULL, NULL, 0, 0 }, /* 443 = thr_wake */ - { AS(kldunloadf_args), (sy_call_t *)kldunloadf, AUE_MODUNLOAD, NULL, 0, 0 }, /* 444 = kldunloadf */ - { AS(audit_args), (sy_call_t *)audit, AUE_AUDIT, NULL, 0, 0 }, /* 445 = audit */ - { AS(auditon_args), (sy_call_t *)auditon, AUE_AUDITON, NULL, 0, 0 }, /* 446 = auditon */ - { AS(getauid_args), (sy_call_t *)getauid, AUE_GETAUID, NULL, 0, 0 }, /* 447 = getauid */ - { AS(setauid_args), (sy_call_t *)setauid, AUE_SETAUID, NULL, 0, 0 }, /* 448 = setauid */ - { AS(getaudit_args), (sy_call_t *)getaudit, AUE_GETAUDIT, NULL, 0, 0 }, /* 449 = getaudit */ - { AS(setaudit_args), (sy_call_t *)setaudit, AUE_SETAUDIT, NULL, 0, 0 }, /* 450 = setaudit */ - { AS(getaudit_addr_args), (sy_call_t *)getaudit_addr, AUE_GETAUDIT_ADDR, NULL, 0, 0 }, /* 451 = getaudit_addr */ - { AS(setaudit_addr_args), (sy_call_t *)setaudit_addr, AUE_SETAUDIT_ADDR, NULL, 0, 0 }, /* 452 = setaudit_addr */ - { AS(auditctl_args), (sy_call_t *)auditctl, AUE_AUDITCTL, NULL, 0, 0 }, /* 453 = auditctl */ - { AS(_umtx_op_args), (sy_call_t *)_umtx_op, AUE_NULL, NULL, 0, 0 }, /* 454 = _umtx_op */ - { AS(thr_new_args), (sy_call_t *)thr_new, AUE_NULL, NULL, 0, 0 }, /* 455 = thr_new */ - { AS(sigqueue_args), (sy_call_t *)sigqueue, AUE_NULL, NULL, 0, 0 }, /* 456 = sigqueue */ - { AS(kmq_open_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 457 = kmq_open */ - { AS(kmq_setattr_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 458 = kmq_setattr */ - { AS(kmq_timedreceive_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 459 = kmq_timedreceive */ - { AS(kmq_timedsend_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 460 = kmq_timedsend */ - { AS(kmq_notify_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 461 = kmq_notify */ - { AS(kmq_unlink_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 462 = kmq_unlink */ - { AS(abort2_args), (sy_call_t *)abort2, AUE_NULL, NULL, 0, 0 }, /* 463 = abort2 */ - { AS(thr_set_name_args), (sy_call_t *)thr_set_name, AUE_NULL, NULL, 0, 0 }, /* 464 = thr_set_name */ - { AS(aio_fsync_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 465 = aio_fsync */ - { AS(rtprio_thread_args), (sy_call_t *)rtprio_thread, AUE_RTPRIO, NULL, 0, 0 }, /* 466 = rtprio_thread */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 467 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 468 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 469 = __getpath_fromfd */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 470 = __getpath_fromaddr */ - { AS(sctp_peeloff_args), (sy_call_t *)sctp_peeloff, AUE_NULL, NULL, 0, 0 }, /* 471 = sctp_peeloff */ - { 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(pread_args), (sy_call_t *)pread, AUE_PREAD, NULL, 0, 0 }, /* 475 = pread */ - { AS(pwrite_args), (sy_call_t *)pwrite, AUE_PWRITE, NULL, 0, 0 }, /* 476 = pwrite */ - { AS(mmap_args), (sy_call_t *)mmap, AUE_MMAP, NULL, 0, 0 }, /* 477 = mmap */ - { AS(lseek_args), (sy_call_t *)lseek, AUE_LSEEK, NULL, 0, 0 }, /* 478 = lseek */ - { AS(truncate_args), (sy_call_t *)truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 479 = truncate */ - { AS(ftruncate_args), (sy_call_t *)ftruncate, AUE_FTRUNCATE, NULL, 0, 0 }, /* 480 = ftruncate */ - { AS(thr_kill2_args), (sy_call_t *)thr_kill2, AUE_KILL, NULL, 0, 0 }, /* 481 = thr_kill2 */ - { AS(shm_open_args), (sy_call_t *)shm_open, AUE_SHMOPEN, NULL, 0, 0 }, /* 482 = shm_open */ - { AS(shm_unlink_args), (sy_call_t *)shm_unlink, AUE_SHMUNLINK, NULL, 0, 0 }, /* 483 = shm_unlink */ - { AS(cpuset_args), (sy_call_t *)cpuset, AUE_NULL, NULL, 0, 0 }, /* 484 = cpuset */ - { AS(cpuset_setid_args), (sy_call_t *)cpuset_setid, AUE_NULL, NULL, 0, 0 }, /* 485 = cpuset_setid */ - { AS(cpuset_getid_args), (sy_call_t *)cpuset_getid, AUE_NULL, NULL, 0, 0 }, /* 486 = cpuset_getid */ - { AS(cpuset_getaffinity_args), (sy_call_t *)cpuset_getaffinity, AUE_NULL, NULL, 0, 0 }, /* 487 = cpuset_getaffinity */ - { AS(cpuset_setaffinity_args), (sy_call_t *)cpuset_setaffinity, AUE_NULL, NULL, 0, 0 }, /* 488 = cpuset_setaffinity */ - { AS(faccessat_args), (sy_call_t *)faccessat, AUE_FACCESSAT, NULL, 0, 0 }, /* 489 = faccessat */ - { AS(fchmodat_args), (sy_call_t *)fchmodat, AUE_FCHMODAT, NULL, 0, 0 }, /* 490 = fchmodat */ - { AS(fchownat_args), (sy_call_t *)fchownat, AUE_FCHOWNAT, NULL, 0, 0 }, /* 491 = fchownat */ - { AS(fexecve_args), (sy_call_t *)fexecve, AUE_FEXECVE, NULL, 0, 0 }, /* 492 = fexecve */ - { AS(fstatat_args), (sy_call_t *)fstatat, AUE_FSTATAT, NULL, 0, 0 }, /* 493 = fstatat */ - { AS(futimesat_args), (sy_call_t *)futimesat, AUE_FUTIMESAT, NULL, 0, 0 }, /* 494 = futimesat */ - { AS(linkat_args), (sy_call_t *)linkat, AUE_LINKAT, NULL, 0, 0 }, /* 495 = linkat */ - { AS(mkdirat_args), (sy_call_t *)mkdirat, AUE_MKDIRAT, NULL, 0, 0 }, /* 496 = mkdirat */ - { AS(mkfifoat_args), (sy_call_t *)mkfifoat, AUE_MKFIFOAT, NULL, 0, 0 }, /* 497 = mkfifoat */ - { AS(mknodat_args), (sy_call_t *)mknodat, AUE_MKNODAT, NULL, 0, 0 }, /* 498 = mknodat */ - { AS(openat_args), (sy_call_t *)openat, AUE_OPENAT_RWTC, NULL, 0, 0 }, /* 499 = openat */ - { AS(readlinkat_args), (sy_call_t *)readlinkat, AUE_READLINKAT, NULL, 0, 0 }, /* 500 = readlinkat */ - { AS(renameat_args), (sy_call_t *)renameat, AUE_RENAMEAT, NULL, 0, 0 }, /* 501 = renameat */ - { AS(symlinkat_args), (sy_call_t *)symlinkat, AUE_SYMLINKAT, NULL, 0, 0 }, /* 502 = symlinkat */ - { AS(unlinkat_args), (sy_call_t *)unlinkat, AUE_UNLINKAT, NULL, 0, 0 }, /* 503 = unlinkat */ - { AS(posix_openpt_args), (sy_call_t *)posix_openpt, AUE_POSIX_OPENPT, NULL, 0, 0 }, /* 504 = posix_openpt */ - { AS(gssd_syscall_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 505 = gssd_syscall */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 0 = syscall */ + { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0, SYF_CAPENABLED }, /* 1 = exit */ + { 0, (sy_call_t *)fork, AUE_FORK, NULL, 0, 0, SYF_CAPENABLED }, /* 2 = fork */ + { AS(read_args), (sy_call_t *)read, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 3 = read */ + { AS(write_args), (sy_call_t *)write, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 4 = write */ + { AS(open_args), (sy_call_t *)open, AUE_OPEN_RWTC, NULL, 0, 0, 0 }, /* 5 = open */ + { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0, SYF_CAPENABLED }, /* 6 = close */ + { AS(wait_args), (sy_call_t *)wait4, AUE_WAIT4, NULL, 0, 0, SYF_CAPENABLED }, /* 7 = wait4 */ + { compat(AS(ocreat_args),creat), AUE_CREAT, NULL, 0, 0, 0 }, /* 8 = old creat */ + { AS(link_args), (sy_call_t *)link, AUE_LINK, NULL, 0, 0, 0 }, /* 9 = link */ + { AS(unlink_args), (sy_call_t *)unlink, AUE_UNLINK, NULL, 0, 0, 0 }, /* 10 = unlink */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 11 = obsolete execv */ + { AS(chdir_args), (sy_call_t *)chdir, AUE_CHDIR, NULL, 0, 0, 0 }, /* 12 = chdir */ + { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR, NULL, 0, 0, 0 }, /* 13 = fchdir */ + { AS(mknod_args), (sy_call_t *)mknod, AUE_MKNOD, NULL, 0, 0, 0 }, /* 14 = mknod */ + { AS(chmod_args), (sy_call_t *)chmod, AUE_CHMOD, NULL, 0, 0, 0 }, /* 15 = chmod */ + { AS(chown_args), (sy_call_t *)chown, AUE_CHOWN, NULL, 0, 0, 0 }, /* 16 = chown */ + { AS(obreak_args), (sy_call_t *)obreak, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 17 = break */ + { compat4(AS(freebsd4_getfsstat_args),getfsstat), AUE_GETFSSTAT, NULL, 0, 0, 0 }, /* 18 = old getfsstat */ + { compat(AS(olseek_args),lseek), AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED }, /* 19 = old lseek */ + { 0, (sy_call_t *)getpid, AUE_GETPID, NULL, 0, 0, SYF_CAPENABLED }, /* 20 = getpid */ + { AS(mount_args), (sy_call_t *)mount, AUE_MOUNT, NULL, 0, 0, 0 }, /* 21 = mount */ + { AS(unmount_args), (sy_call_t *)unmount, AUE_UMOUNT, NULL, 0, 0, 0 }, /* 22 = unmount */ + { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID, NULL, 0, 0, SYF_CAPENABLED }, /* 23 = setuid */ + { 0, (sy_call_t *)getuid, AUE_GETUID, NULL, 0, 0, SYF_CAPENABLED }, /* 24 = getuid */ + { 0, (sy_call_t *)geteuid, AUE_GETEUID, NULL, 0, 0, SYF_CAPENABLED }, /* 25 = geteuid */ + { AS(ptrace_args), (sy_call_t *)ptrace, AUE_PTRACE, NULL, 0, 0, 0 }, /* 26 = ptrace */ + { AS(recvmsg_args), (sy_call_t *)recvmsg, AUE_RECVMSG, NULL, 0, 0, SYF_CAPENABLED }, /* 27 = recvmsg */ + { AS(sendmsg_args), (sy_call_t *)sendmsg, AUE_SENDMSG, NULL, 0, 0, SYF_CAPENABLED }, /* 28 = sendmsg */ + { AS(recvfrom_args), (sy_call_t *)recvfrom, AUE_RECVFROM, NULL, 0, 0, SYF_CAPENABLED }, /* 29 = recvfrom */ + { AS(accept_args), (sy_call_t *)accept, AUE_ACCEPT, NULL, 0, 0, SYF_CAPENABLED }, /* 30 = accept */ + { AS(getpeername_args), (sy_call_t *)getpeername, AUE_GETPEERNAME, NULL, 0, 0, SYF_CAPENABLED }, /* 31 = getpeername */ + { AS(getsockname_args), (sy_call_t *)getsockname, AUE_GETSOCKNAME, NULL, 0, 0, SYF_CAPENABLED }, /* 32 = getsockname */ + { AS(access_args), (sy_call_t *)access, AUE_ACCESS, NULL, 0, 0, 0 }, /* 33 = access */ + { AS(chflags_args), (sy_call_t *)chflags, AUE_CHFLAGS, NULL, 0, 0, 0 }, /* 34 = chflags */ + { AS(fchflags_args), (sy_call_t *)fchflags, AUE_FCHFLAGS, NULL, 0, 0, SYF_CAPENABLED }, /* 35 = fchflags */ + { 0, (sy_call_t *)sync, AUE_SYNC, NULL, 0, 0, SYF_CAPENABLED }, /* 36 = sync */ + { AS(kill_args), (sy_call_t *)kill, AUE_KILL, NULL, 0, 0, 0 }, /* 37 = kill */ + { compat(AS(ostat_args),stat), AUE_STAT, NULL, 0, 0, 0 }, /* 38 = old stat */ + { 0, (sy_call_t *)getppid, AUE_GETPPID, NULL, 0, 0, SYF_CAPENABLED }, /* 39 = getppid */ + { compat(AS(olstat_args),lstat), AUE_LSTAT, NULL, 0, 0, 0 }, /* 40 = old lstat */ + { AS(dup_args), (sy_call_t *)dup, AUE_DUP, NULL, 0, 0, SYF_CAPENABLED }, /* 41 = dup */ + { 0, (sy_call_t *)pipe, AUE_PIPE, NULL, 0, 0, SYF_CAPENABLED }, /* 42 = pipe */ + { 0, (sy_call_t *)getegid, AUE_GETEGID, NULL, 0, 0, SYF_CAPENABLED }, /* 43 = getegid */ + { AS(profil_args), (sy_call_t *)profil, AUE_PROFILE, NULL, 0, 0, SYF_CAPENABLED }, /* 44 = profil */ + { AS(ktrace_args), (sy_call_t *)ktrace, AUE_KTRACE, NULL, 0, 0, 0 }, /* 45 = ktrace */ + { compat(AS(osigaction_args),sigaction), AUE_SIGACTION, NULL, 0, 0, SYF_CAPENABLED }, /* 46 = old sigaction */ + { 0, (sy_call_t *)getgid, AUE_GETGID, NULL, 0, 0, SYF_CAPENABLED }, /* 47 = getgid */ + { compat(AS(osigprocmask_args),sigprocmask), AUE_SIGPROCMASK, NULL, 0, 0, SYF_CAPENABLED }, /* 48 = old sigprocmask */ + { AS(getlogin_args), (sy_call_t *)getlogin, AUE_GETLOGIN, NULL, 0, 0, SYF_CAPENABLED }, /* 49 = getlogin */ + { AS(setlogin_args), (sy_call_t *)setlogin, AUE_SETLOGIN, NULL, 0, 0, 0 }, /* 50 = setlogin */ + { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0, 0 }, /* 51 = acct */ + { compat(0,sigpending), AUE_SIGPENDING, NULL, 0, 0, SYF_CAPENABLED }, /* 52 = old sigpending */ + { AS(sigaltstack_args), (sy_call_t *)sigaltstack, AUE_SIGALTSTACK, NULL, 0, 0, SYF_CAPENABLED }, /* 53 = sigaltstack */ + { AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL, NULL, 0, 0, 0 }, /* 54 = ioctl */ + { AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT, NULL, 0, 0, 0 }, /* 55 = reboot */ + { AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE, NULL, 0, 0, 0 }, /* 56 = revoke */ + { AS(symlink_args), (sy_call_t *)symlink, AUE_SYMLINK, NULL, 0, 0, 0 }, /* 57 = symlink */ + { AS(readlink_args), (sy_call_t *)readlink, AUE_READLINK, NULL, 0, 0, 0 }, /* 58 = readlink */ + { AS(execve_args), (sy_call_t *)execve, AUE_EXECVE, NULL, 0, 0, 0 }, /* 59 = execve */ + { AS(umask_args), (sy_call_t *)umask, AUE_UMASK, NULL, 0, 0, SYF_CAPENABLED }, /* 60 = umask */ + { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT, NULL, 0, 0, 0 }, /* 61 = chroot */ + { compat(AS(ofstat_args),fstat), AUE_FSTAT, NULL, 0, 0, SYF_CAPENABLED }, /* 62 = old fstat */ + { compat(AS(getkerninfo_args),getkerninfo), AUE_NULL, NULL, 0, 0, 0 }, /* 63 = old getkerninfo */ + { compat(0,getpagesize), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 64 = old getpagesize */ + { AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0, SYF_CAPENABLED }, /* 65 = msync */ + { 0, (sy_call_t *)vfork, AUE_VFORK, NULL, 0, 0, SYF_CAPENABLED }, /* 66 = vfork */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 67 = obsolete vread */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 68 = obsolete vwrite */ + { AS(sbrk_args), (sy_call_t *)sbrk, AUE_SBRK, NULL, 0, 0, SYF_CAPENABLED }, /* 69 = sbrk */ + { AS(sstk_args), (sy_call_t *)sstk, AUE_SSTK, NULL, 0, 0, SYF_CAPENABLED }, /* 70 = sstk */ + { compat(AS(ommap_args),mmap), AUE_MMAP, NULL, 0, 0, SYF_CAPENABLED }, /* 71 = old mmap */ + { AS(ovadvise_args), (sy_call_t *)ovadvise, AUE_O_VADVISE, NULL, 0, 0, 0 }, /* 72 = vadvise */ + { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0, SYF_CAPENABLED }, /* 73 = munmap */ + { AS(mprotect_args), (sy_call_t *)mprotect, AUE_MPROTECT, NULL, 0, 0, SYF_CAPENABLED }, /* 74 = mprotect */ + { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0, SYF_CAPENABLED }, /* 75 = madvise */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 76 = obsolete vhangup */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 77 = obsolete vlimit */ + { AS(mincore_args), (sy_call_t *)mincore, AUE_MINCORE, NULL, 0, 0, SYF_CAPENABLED }, /* 78 = mincore */ + { AS(getgroups_args), (sy_call_t *)getgroups, AUE_GETGROUPS, NULL, 0, 0, SYF_CAPENABLED }, /* 79 = getgroups */ + { AS(setgroups_args), (sy_call_t *)setgroups, AUE_SETGROUPS, NULL, 0, 0, 0 }, /* 80 = setgroups */ + { 0, (sy_call_t *)getpgrp, AUE_GETPGRP, NULL, 0, 0, SYF_CAPENABLED }, /* 81 = getpgrp */ + { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP, NULL, 0, 0, 0 }, /* 82 = setpgid */ + { AS(setitimer_args), (sy_call_t *)setitimer, AUE_SETITIMER, NULL, 0, 0, SYF_CAPENABLED }, /* 83 = setitimer */ + { compat(0,wait), AUE_WAIT4, NULL, 0, 0, SYF_CAPENABLED }, /* 84 = old wait */ + { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON, NULL, 0, 0, 0 }, /* 85 = swapon */ + { AS(getitimer_args), (sy_call_t *)getitimer, AUE_GETITIMER, NULL, 0, 0, SYF_CAPENABLED }, /* 86 = getitimer */ + { compat(AS(gethostname_args),gethostname), AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED }, /* 87 = old gethostname */ + { compat(AS(sethostname_args),sethostname), AUE_SYSCTL, NULL, 0, 0, 0 }, /* 88 = old sethostname */ + { 0, (sy_call_t *)getdtablesize, AUE_GETDTABLESIZE, NULL, 0, 0, 0 }, /* 89 = getdtablesize */ + { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2, NULL, 0, 0, SYF_CAPENABLED }, /* 90 = dup2 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 91 = getdopt */ + { AS(fcntl_args), (sy_call_t *)fcntl, AUE_FCNTL, NULL, 0, 0, SYF_CAPENABLED }, /* 92 = fcntl */ + { AS(select_args), (sy_call_t *)select, AUE_SELECT, NULL, 0, 0, SYF_CAPENABLED }, /* 93 = select */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 94 = setdopt */ + { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0, SYF_CAPENABLED }, /* 95 = fsync */ + { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY, NULL, 0, 0, SYF_CAPENABLED }, /* 96 = setpriority */ + { AS(socket_args), (sy_call_t *)socket, AUE_SOCKET, NULL, 0, 0, 0 }, /* 97 = socket */ + { AS(connect_args), (sy_call_t *)connect, AUE_CONNECT, NULL, 0, 0, SYF_CAPENABLED }, /* 98 = connect */ + { compat(AS(accept_args),accept), AUE_ACCEPT, NULL, 0, 0, SYF_CAPENABLED }, /* 99 = old accept */ + { AS(getpriority_args), (sy_call_t *)getpriority, AUE_GETPRIORITY, NULL, 0, 0, SYF_CAPENABLED }, /* 100 = getpriority */ + { compat(AS(osend_args),send), AUE_SEND, NULL, 0, 0, SYF_CAPENABLED }, /* 101 = old send */ + { compat(AS(orecv_args),recv), AUE_RECV, NULL, 0, 0, SYF_CAPENABLED }, /* 102 = old recv */ + { compat(AS(osigreturn_args),sigreturn), AUE_SIGRETURN, NULL, 0, 0, SYF_CAPENABLED }, /* 103 = old sigreturn */ + { AS(bind_args), (sy_call_t *)bind, AUE_BIND, NULL, 0, 0, SYF_CAPENABLED }, /* 104 = bind */ + { AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT, NULL, 0, 0, SYF_CAPENABLED }, /* 105 = setsockopt */ + { AS(listen_args), (sy_call_t *)listen, AUE_LISTEN, NULL, 0, 0, SYF_CAPENABLED }, /* 106 = listen */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 107 = obsolete vtimes */ + { compat(AS(osigvec_args),sigvec), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 108 = old sigvec */ + { compat(AS(osigblock_args),sigblock), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 109 = old sigblock */ + { compat(AS(osigsetmask_args),sigsetmask), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 110 = old sigsetmask */ + { compat(AS(osigsuspend_args),sigsuspend), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 111 = old sigsuspend */ + { compat(AS(osigstack_args),sigstack), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 112 = old sigstack */ + { compat(AS(orecvmsg_args),recvmsg), AUE_RECVMSG, NULL, 0, 0, SYF_CAPENABLED }, /* 113 = old recvmsg */ + { compat(AS(osendmsg_args),sendmsg), AUE_SENDMSG, NULL, 0, 0, SYF_CAPENABLED }, /* 114 = old sendmsg */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 115 = obsolete vtrace */ + { AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_GETTIMEOFDAY, NULL, 0, 0, SYF_CAPENABLED }, /* 116 = gettimeofday */ + { AS(getrusage_args), (sy_call_t *)getrusage, AUE_GETRUSAGE, NULL, 0, 0, SYF_CAPENABLED }, /* 117 = getrusage */ + { AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_GETSOCKOPT, NULL, 0, 0, SYF_CAPENABLED }, /* 118 = getsockopt */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 119 = resuba */ + { AS(readv_args), (sy_call_t *)readv, AUE_READV, NULL, 0, 0, SYF_CAPENABLED }, /* 120 = readv */ + { AS(writev_args), (sy_call_t *)writev, AUE_WRITEV, NULL, 0, 0, SYF_CAPENABLED }, /* 121 = writev */ + { AS(settimeofday_args), (sy_call_t *)settimeofday, AUE_SETTIMEOFDAY, NULL, 0, 0, 0 }, /* 122 = settimeofday */ + { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN, NULL, 0, 0, SYF_CAPENABLED }, /* 123 = fchown */ + { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD, NULL, 0, 0, SYF_CAPENABLED }, /* 124 = fchmod */ + { compat(AS(recvfrom_args),recvfrom), AUE_RECVFROM, NULL, 0, 0, SYF_CAPENABLED }, /* 125 = old recvfrom */ + { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID, NULL, 0, 0, SYF_CAPENABLED }, /* 126 = setreuid */ + { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID, NULL, 0, 0, SYF_CAPENABLED }, /* 127 = setregid */ + { AS(rename_args), (sy_call_t *)rename, AUE_RENAME, NULL, 0, 0, 0 }, /* 128 = rename */ + { compat(AS(otruncate_args),truncate), AUE_TRUNCATE, NULL, 0, 0, 0 }, /* 129 = old truncate */ + { compat(AS(oftruncate_args),ftruncate), AUE_FTRUNCATE, NULL, 0, 0, SYF_CAPENABLED }, /* 130 = old ftruncate */ + { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0, SYF_CAPENABLED }, /* 131 = flock */ + { AS(mkfifo_args), (sy_call_t *)mkfifo, AUE_MKFIFO, NULL, 0, 0, 0 }, /* 132 = mkfifo */ + { AS(sendto_args), (sy_call_t *)sendto, AUE_SENDTO, NULL, 0, 0, SYF_CAPENABLED }, /* 133 = sendto */ + { AS(shutdown_args), (sy_call_t *)shutdown, AUE_SHUTDOWN, NULL, 0, 0, SYF_CAPENABLED }, /* 134 = shutdown */ + { AS(socketpair_args), (sy_call_t *)socketpair, AUE_SOCKETPAIR, NULL, 0, 0, SYF_CAPENABLED }, /* 135 = socketpair */ + { AS(mkdir_args), (sy_call_t *)mkdir, AUE_MKDIR, NULL, 0, 0, 0 }, /* 136 = mkdir */ + { AS(rmdir_args), (sy_call_t *)rmdir, AUE_RMDIR, NULL, 0, 0, 0 }, /* 137 = rmdir */ + { AS(utimes_args), (sy_call_t *)utimes, AUE_UTIMES, NULL, 0, 0, 0 }, /* 138 = utimes */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 139 = obsolete 4.2 sigreturn */ + { AS(adjtime_args), (sy_call_t *)adjtime, AUE_ADJTIME, NULL, 0, 0, 0 }, /* 140 = adjtime */ + { compat(AS(ogetpeername_args),getpeername), AUE_GETPEERNAME, NULL, 0, 0, SYF_CAPENABLED }, /* 141 = old getpeername */ + { compat(0,gethostid), AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED }, /* 142 = old gethostid */ + { compat(AS(osethostid_args),sethostid), AUE_SYSCTL, NULL, 0, 0, 0 }, /* 143 = old sethostid */ + { compat(AS(ogetrlimit_args),getrlimit), AUE_GETRLIMIT, NULL, 0, 0, SYF_CAPENABLED }, /* 144 = old getrlimit */ + { compat(AS(osetrlimit_args),setrlimit), AUE_SETRLIMIT, NULL, 0, 0, SYF_CAPENABLED }, /* 145 = old setrlimit */ + { compat(AS(okillpg_args),killpg), AUE_KILLPG, NULL, 0, 0, 0 }, /* 146 = old killpg */ + { 0, (sy_call_t *)setsid, AUE_SETSID, NULL, 0, 0, SYF_CAPENABLED }, /* 147 = setsid */ + { AS(quotactl_args), (sy_call_t *)quotactl, AUE_QUOTACTL, NULL, 0, 0, 0 }, /* 148 = quotactl */ + { compat(0,quota), AUE_O_QUOTA, NULL, 0, 0, 0 }, /* 149 = old quota */ + { compat(AS(getsockname_args),getsockname), AUE_GETSOCKNAME, NULL, 0, 0, SYF_CAPENABLED }, /* 150 = old getsockname */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 151 = sem_lock */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 152 = sem_wakeup */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 153 = asyncdaemon */ + { AS(nlm_syscall_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 154 = nlm_syscall */ + { AS(nfssvc_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 155 = nfssvc */ + { compat(AS(ogetdirentries_args),getdirentries), AUE_GETDIRENTRIES, NULL, 0, 0, SYF_CAPENABLED }, /* 156 = old getdirentries */ + { compat4(AS(freebsd4_statfs_args),statfs), AUE_STATFS, NULL, 0, 0, 0 }, /* 157 = old statfs */ + { compat4(AS(freebsd4_fstatfs_args),fstatfs), AUE_FSTATFS, NULL, 0, 0, SYF_CAPENABLED }, /* 158 = old fstatfs */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 159 = nosys */ + { AS(lgetfh_args), (sy_call_t *)lgetfh, AUE_LGETFH, NULL, 0, 0, 0 }, /* 160 = lgetfh */ + { AS(getfh_args), (sy_call_t *)getfh, AUE_NFS_GETFH, NULL, 0, 0, 0 }, /* 161 = getfh */ + { compat4(AS(freebsd4_getdomainname_args),getdomainname), AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED }, /* 162 = old getdomainname */ + { compat4(AS(freebsd4_setdomainname_args),setdomainname), AUE_SYSCTL, NULL, 0, 0, 0 }, /* 163 = old setdomainname */ + { compat4(AS(freebsd4_uname_args),uname), AUE_NULL, NULL, 0, 0, 0 }, /* 164 = old uname */ + { AS(sysarch_args), (sy_call_t *)sysarch, AUE_SYSARCH, NULL, 0, 0, 0 }, /* 165 = sysarch */ + { AS(rtprio_args), (sy_call_t *)rtprio, AUE_RTPRIO, NULL, 0, 0, SYF_CAPENABLED }, /* 166 = rtprio */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 167 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 168 = nosys */ + { AS(semsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 169 = semsys */ + { AS(msgsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 170 = msgsys */ + { AS(shmsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 171 = shmsys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 172 = nosys */ + { AS(freebsd6_pread_args), (sy_call_t *)freebsd6_pread, AUE_PREAD, NULL, 0, 0, SYF_CAPENABLED }, /* 173 = freebsd6_pread */ + { AS(freebsd6_pwrite_args), (sy_call_t *)freebsd6_pwrite, AUE_PWRITE, NULL, 0, 0, SYF_CAPENABLED }, /* 174 = freebsd6_pwrite */ + { AS(setfib_args), (sy_call_t *)setfib, AUE_NULL, NULL, 0, 0, 0 }, /* 175 = setfib */ + { AS(ntp_adjtime_args), (sy_call_t *)ntp_adjtime, AUE_NTP_ADJTIME, NULL, 0, 0, 0 }, /* 176 = ntp_adjtime */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 177 = sfork */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 178 = getdescriptor */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 179 = setdescriptor */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 180 = nosys */ + { AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID, NULL, 0, 0, SYF_CAPENABLED }, /* 181 = setgid */ + { AS(setegid_args), (sy_call_t *)setegid, AUE_SETEGID, NULL, 0, 0, SYF_CAPENABLED }, /* 182 = setegid */ + { AS(seteuid_args), (sy_call_t *)seteuid, AUE_SETEUID, NULL, 0, 0, SYF_CAPENABLED }, /* 183 = seteuid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 184 = lfs_bmapv */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 185 = lfs_markv */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 186 = lfs_segclean */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 187 = lfs_segwait */ + { AS(stat_args), (sy_call_t *)stat, AUE_STAT, NULL, 0, 0, 0 }, /* 188 = stat */ + { AS(fstat_args), (sy_call_t *)fstat, AUE_FSTAT, NULL, 0, 0, SYF_CAPENABLED }, /* 189 = fstat */ + { AS(lstat_args), (sy_call_t *)lstat, AUE_LSTAT, NULL, 0, 0, 0 }, /* 190 = lstat */ + { AS(pathconf_args), (sy_call_t *)pathconf, AUE_PATHCONF, NULL, 0, 0, 0 }, /* 191 = pathconf */ + { AS(fpathconf_args), (sy_call_t *)fpathconf, AUE_FPATHCONF, NULL, 0, 0, SYF_CAPENABLED }, /* 192 = fpathconf */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 193 = nosys */ + { AS(__getrlimit_args), (sy_call_t *)getrlimit, AUE_GETRLIMIT, NULL, 0, 0, SYF_CAPENABLED }, /* 194 = getrlimit */ + { AS(__setrlimit_args), (sy_call_t *)setrlimit, AUE_SETRLIMIT, NULL, 0, 0, SYF_CAPENABLED }, /* 195 = setrlimit */ + { AS(getdirentries_args), (sy_call_t *)getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0, SYF_CAPENABLED }, /* 196 = getdirentries */ + { AS(freebsd6_mmap_args), (sy_call_t *)freebsd6_mmap, AUE_MMAP, NULL, 0, 0, SYF_CAPENABLED }, /* 197 = freebsd6_mmap */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 198 = __syscall */ + { AS(freebsd6_lseek_args), (sy_call_t *)freebsd6_lseek, AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED }, /* 199 = freebsd6_lseek */ + { AS(freebsd6_truncate_args), (sy_call_t *)freebsd6_truncate, AUE_TRUNCATE, NULL, 0, 0, 0 }, /* 200 = freebsd6_truncate */ + { AS(freebsd6_ftruncate_args), (sy_call_t *)freebsd6_ftruncate, AUE_FTRUNCATE, NULL, 0, 0, SYF_CAPENABLED }, /* 201 = freebsd6_ftruncate */ + { AS(sysctl_args), (sy_call_t *)__sysctl, AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED }, /* 202 = __sysctl */ + { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK, NULL, 0, 0, SYF_CAPENABLED }, /* 203 = mlock */ + { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK, NULL, 0, 0, SYF_CAPENABLED }, /* 204 = munlock */ + { AS(undelete_args), (sy_call_t *)undelete, AUE_UNDELETE, NULL, 0, 0, 0 }, /* 205 = undelete */ + { AS(futimes_args), (sy_call_t *)futimes, AUE_FUTIMES, NULL, 0, 0, SYF_CAPENABLED }, /* 206 = futimes */ + { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0, SYF_CAPENABLED }, /* 207 = getpgid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 208 = newreboot */ + { AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0, SYF_CAPENABLED }, /* 209 = poll */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 210 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 211 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 212 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 213 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 214 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 215 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 216 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 217 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 218 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 219 = lkmnosys */ + { AS(__semctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 220 = __semctl */ + { AS(semget_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 221 = semget */ + { AS(semop_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 222 = semop */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 223 = semconfig */ + { AS(msgctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 224 = msgctl */ + { AS(msgget_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 225 = msgget */ + { AS(msgsnd_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 226 = msgsnd */ + { AS(msgrcv_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 227 = msgrcv */ + { AS(shmat_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 228 = shmat */ + { AS(shmctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 229 = shmctl */ + { AS(shmdt_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 230 = shmdt */ + { AS(shmget_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 231 = shmget */ + { AS(clock_gettime_args), (sy_call_t *)clock_gettime, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 232 = clock_gettime */ + { AS(clock_settime_args), (sy_call_t *)clock_settime, AUE_CLOCK_SETTIME, NULL, 0, 0, 0 }, /* 233 = clock_settime */ + { AS(clock_getres_args), (sy_call_t *)clock_getres, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 234 = clock_getres */ + { AS(ktimer_create_args), (sy_call_t *)ktimer_create, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 235 = ktimer_create */ + { AS(ktimer_delete_args), (sy_call_t *)ktimer_delete, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 236 = ktimer_delete */ + { AS(ktimer_settime_args), (sy_call_t *)ktimer_settime, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 237 = ktimer_settime */ + { AS(ktimer_gettime_args), (sy_call_t *)ktimer_gettime, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 238 = ktimer_gettime */ + { AS(ktimer_getoverrun_args), (sy_call_t *)ktimer_getoverrun, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 239 = ktimer_getoverrun */ + { AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 240 = nanosleep */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 241 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 242 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 243 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 244 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 245 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 246 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 247 = nosys */ + { AS(ntp_gettime_args), (sy_call_t *)ntp_gettime, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 248 = ntp_gettime */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 249 = nosys */ + { AS(minherit_args), (sy_call_t *)minherit, AUE_MINHERIT, NULL, 0, 0, SYF_CAPENABLED }, /* 250 = minherit */ + { AS(rfork_args), (sy_call_t *)rfork, AUE_RFORK, NULL, 0, 0, SYF_CAPENABLED }, /* 251 = rfork */ + { AS(openbsd_poll_args), (sy_call_t *)openbsd_poll, AUE_POLL, NULL, 0, 0, SYF_CAPENABLED }, /* 252 = openbsd_poll */ + { 0, (sy_call_t *)issetugid, AUE_ISSETUGID, NULL, 0, 0, SYF_CAPENABLED }, /* 253 = issetugid */ + { AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0, 0 }, /* 254 = lchown */ + { AS(aio_read_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 255 = aio_read */ + { AS(aio_write_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 256 = aio_write */ + { AS(lio_listio_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 257 = lio_listio */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 258 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 259 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 260 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 261 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 262 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 263 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 264 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 265 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 266 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 267 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 268 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 269 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 270 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 271 = nosys */ + { AS(getdents_args), (sy_call_t *)getdents, AUE_O_GETDENTS, NULL, 0, 0, SYF_CAPENABLED }, /* 272 = getdents */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 273 = nosys */ + { AS(lchmod_args), (sy_call_t *)lchmod, AUE_LCHMOD, NULL, 0, 0, 0 }, /* 274 = lchmod */ + { AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0, 0 }, /* 275 = netbsd_lchown */ + { AS(lutimes_args), (sy_call_t *)lutimes, AUE_LUTIMES, NULL, 0, 0, 0 }, /* 276 = lutimes */ + { AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0, SYF_CAPENABLED }, /* 277 = netbsd_msync */ + { AS(nstat_args), (sy_call_t *)nstat, AUE_STAT, NULL, 0, 0, 0 }, /* 278 = nstat */ + { AS(nfstat_args), (sy_call_t *)nfstat, AUE_FSTAT, NULL, 0, 0, 0 }, /* 279 = nfstat */ + { AS(nlstat_args), (sy_call_t *)nlstat, AUE_LSTAT, NULL, 0, 0, 0 }, /* 280 = nlstat */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 281 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 282 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 283 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 284 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 285 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 286 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 287 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 288 = nosys */ + { AS(preadv_args), (sy_call_t *)preadv, AUE_PREADV, NULL, 0, 0, SYF_CAPENABLED }, /* 289 = preadv */ + { AS(pwritev_args), (sy_call_t *)pwritev, AUE_PWRITEV, NULL, 0, 0, SYF_CAPENABLED }, /* 290 = pwritev */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 291 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 292 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 293 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 294 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 295 = nosys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 296 = nosys */ + { compat4(AS(freebsd4_fhstatfs_args),fhstatfs), AUE_FHSTATFS, NULL, 0, 0, 0 }, /* 297 = old fhstatfs */ + { AS(fhopen_args), (sy_call_t *)fhopen, AUE_FHOPEN, NULL, 0, 0, 0 }, /* 298 = fhopen */ + { AS(fhstat_args), (sy_call_t *)fhstat, AUE_FHSTAT, NULL, 0, 0, 0 }, /* 299 = fhstat */ + { AS(modnext_args), (sy_call_t *)modnext, AUE_NULL, NULL, 0, 0, 0 }, /* 300 = modnext */ + { AS(modstat_args), (sy_call_t *)modstat, AUE_NULL, NULL, 0, 0, 0 }, /* 301 = modstat */ + { AS(modfnext_args), (sy_call_t *)modfnext, AUE_NULL, NULL, 0, 0, 0 }, /* 302 = modfnext */ + { AS(modfind_args), (sy_call_t *)modfind, AUE_NULL, NULL, 0, 0, 0 }, /* 303 = modfind */ + { AS(kldload_args), (sy_call_t *)kldload, AUE_MODLOAD, NULL, 0, 0, 0 }, /* 304 = kldload */ + { AS(kldunload_args), (sy_call_t *)kldunload, AUE_MODUNLOAD, NULL, 0, 0, 0 }, /* 305 = kldunload */ + { AS(kldfind_args), (sy_call_t *)kldfind, AUE_NULL, NULL, 0, 0, 0 }, /* 306 = kldfind */ + { AS(kldnext_args), (sy_call_t *)kldnext, AUE_NULL, NULL, 0, 0, 0 }, /* 307 = kldnext */ + { AS(kldstat_args), (sy_call_t *)kldstat, AUE_NULL, NULL, 0, 0, 0 }, /* 308 = kldstat */ + { AS(kldfirstmod_args), (sy_call_t *)kldfirstmod, AUE_NULL, NULL, 0, 0, 0 }, /* 309 = kldfirstmod */ + { AS(getsid_args), (sy_call_t *)getsid, AUE_GETSID, NULL, 0, 0, SYF_CAPENABLED }, /* 310 = getsid */ + { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID, NULL, 0, 0, SYF_CAPENABLED }, /* 311 = setresuid */ + { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID, NULL, 0, 0, SYF_CAPENABLED }, /* 312 = setresgid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 313 = obsolete signanosleep */ + { AS(aio_return_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 314 = aio_return */ + { AS(aio_suspend_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 315 = aio_suspend */ + { AS(aio_cancel_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 316 = aio_cancel */ + { AS(aio_error_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 317 = aio_error */ + { AS(oaio_read_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 318 = oaio_read */ + { AS(oaio_write_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 319 = oaio_write */ + { AS(olio_listio_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 320 = olio_listio */ + { 0, (sy_call_t *)yield, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 321 = yield */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 322 = obsolete thr_sleep */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 323 = obsolete thr_wakeup */ + { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL, NULL, 0, 0, SYF_CAPENABLED }, /* 324 = mlockall */ + { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL, NULL, 0, 0, SYF_CAPENABLED }, /* 325 = munlockall */ + { AS(__getcwd_args), (sy_call_t *)__getcwd, AUE_GETCWD, NULL, 0, 0, 0 }, /* 326 = __getcwd */ + { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 327 = sched_setparam */ + { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 328 = sched_getparam */ + { AS(sched_setscheduler_args), (sy_call_t *)sched_setscheduler, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 329 = sched_setscheduler */ + { AS(sched_getscheduler_args), (sy_call_t *)sched_getscheduler, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 330 = sched_getscheduler */ + { 0, (sy_call_t *)sched_yield, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 331 = sched_yield */ + { AS(sched_get_priority_max_args), (sy_call_t *)sched_get_priority_max, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 332 = sched_get_priority_max */ + { AS(sched_get_priority_min_args), (sy_call_t *)sched_get_priority_min, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 333 = sched_get_priority_min */ + { AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_NULL, NULL, 0, 0, 0 }, /* 334 = sched_rr_get_interval */ + { AS(utrace_args), (sy_call_t *)utrace, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 335 = utrace */ + { compat4(AS(freebsd4_sendfile_args),sendfile), AUE_SENDFILE, NULL, 0, 0, SYF_CAPENABLED }, /* 336 = old sendfile */ + { AS(kldsym_args), (sy_call_t *)kldsym, AUE_NULL, NULL, 0, 0, 0 }, /* 337 = kldsym */ + { AS(jail_args), (sy_call_t *)jail, AUE_JAIL, NULL, 0, 0, 0 }, /* 338 = jail */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 339 = pioctl */ + { AS(sigprocmask_args), (sy_call_t *)sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0, SYF_CAPENABLED }, /* 340 = sigprocmask */ + { AS(sigsuspend_args), (sy_call_t *)sigsuspend, AUE_SIGSUSPEND, NULL, 0, 0, SYF_CAPENABLED }, /* 341 = sigsuspend */ + { compat4(AS(freebsd4_sigaction_args),sigaction), AUE_SIGACTION, NULL, 0, 0, SYF_CAPENABLED }, /* 342 = old sigaction */ + { AS(sigpending_args), (sy_call_t *)sigpending, AUE_SIGPENDING, NULL, 0, 0, SYF_CAPENABLED }, /* 343 = sigpending */ + { compat4(AS(freebsd4_sigreturn_args),sigreturn), AUE_SIGRETURN, NULL, 0, 0, SYF_CAPENABLED }, /* 344 = old sigreturn */ + { AS(sigtimedwait_args), (sy_call_t *)sigtimedwait, AUE_SIGWAIT, NULL, 0, 0, SYF_CAPENABLED }, /* 345 = sigtimedwait */ + { AS(sigwaitinfo_args), (sy_call_t *)sigwaitinfo, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 346 = sigwaitinfo */ + { AS(__acl_get_file_args), (sy_call_t *)__acl_get_file, AUE_NULL, NULL, 0, 0, 0 }, /* 347 = __acl_get_file */ + { AS(__acl_set_file_args), (sy_call_t *)__acl_set_file, AUE_NULL, NULL, 0, 0, 0 }, /* 348 = __acl_set_file */ + { AS(__acl_get_fd_args), (sy_call_t *)__acl_get_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 349 = __acl_get_fd */ + { AS(__acl_set_fd_args), (sy_call_t *)__acl_set_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 350 = __acl_set_fd */ + { AS(__acl_delete_file_args), (sy_call_t *)__acl_delete_file, AUE_NULL, NULL, 0, 0, 0 }, /* 351 = __acl_delete_file */ + { AS(__acl_delete_fd_args), (sy_call_t *)__acl_delete_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 352 = __acl_delete_fd */ + { AS(__acl_aclcheck_file_args), (sy_call_t *)__acl_aclcheck_file, AUE_NULL, NULL, 0, 0, 0 }, /* 353 = __acl_aclcheck_file */ + { AS(__acl_aclcheck_fd_args), (sy_call_t *)__acl_aclcheck_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 354 = __acl_aclcheck_fd */ + { AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_EXTATTRCTL, NULL, 0, 0, 0 }, /* 355 = extattrctl */ + { AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_EXTATTR_SET_FILE, NULL, 0, 0, 0 }, /* 356 = extattr_set_file */ + { AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_EXTATTR_GET_FILE, NULL, 0, 0, 0 }, /* 357 = extattr_get_file */ + { AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_EXTATTR_DELETE_FILE, NULL, 0, 0, 0 }, /* 358 = extattr_delete_file */ + { AS(aio_waitcomplete_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 359 = aio_waitcomplete */ + { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0, SYF_CAPENABLED }, /* 360 = getresuid */ + { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0, SYF_CAPENABLED }, /* 361 = getresgid */ + { 0, (sy_call_t *)kqueue, AUE_KQUEUE, NULL, 0, 0, SYF_CAPENABLED }, /* 362 = kqueue */ + { AS(kevent_args), (sy_call_t *)kevent, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 363 = kevent */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 364 = __cap_get_proc */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 365 = __cap_set_proc */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 366 = __cap_get_fd */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 367 = __cap_get_file */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 368 = __cap_set_fd */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 369 = __cap_set_file */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 370 = nosys */ + { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_EXTATTR_SET_FD, NULL, 0, 0, SYF_CAPENABLED }, /* 371 = extattr_set_fd */ + { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_EXTATTR_GET_FD, NULL, 0, 0, SYF_CAPENABLED }, /* 372 = extattr_get_fd */ + { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_EXTATTR_DELETE_FD, NULL, 0, 0, SYF_CAPENABLED }, /* 373 = extattr_delete_fd */ + { AS(__setugid_args), (sy_call_t *)__setugid, AUE_NULL, NULL, 0, 0, 0 }, /* 374 = __setugid */ + { AS(nfsclnt_args), (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 375 = nfsclnt */ + { AS(eaccess_args), (sy_call_t *)eaccess, AUE_EACCESS, NULL, 0, 0, 0 }, /* 376 = eaccess */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 377 = afs_syscall */ + { AS(nmount_args), (sy_call_t *)nmount, AUE_NMOUNT, NULL, 0, 0, 0 }, /* 378 = nmount */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 379 = kse_exit */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 380 = kse_wakeup */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 381 = kse_create */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 382 = kse_thr_interrupt */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 383 = kse_release */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 17 16:49:18 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 474461065672; Sat, 17 Jan 2009 16:49:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 04A30106566B for ; Sat, 17 Jan 2009 16:49:18 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E44D58FC0A for ; Sat, 17 Jan 2009 16:49:17 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0HGnH3m000169 for ; Sat, 17 Jan 2009 16:49:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0HGnHmX000167 for perforce@freebsd.org; Sat, 17 Jan 2009 16:49:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 17 Jan 2009 16:49:17 GMT Message-Id: <200901171649.n0HGnHmX000167@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156293 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Jan 2009 16:49:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=156293 Change 156293 by rwatson@rwatson_freebsd_capabilities on 2009/01/17 16:48:44 Return the process descriptor from pdfork() by reference, as 0 is a valid file descriptor number, and the child needs to be able to check for 0 in order to tell if it is the child or not. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#22 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_fork.c#6 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#23 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.master#15 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#23 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#23 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#23 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#23 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#22 (text+ko) ==== @@ -538,7 +538,7 @@ { AS(cap_getrights_args), (sy_call_t *)cap_getrights, AUE_CAP_GETRIGHTS, NULL, 0, 0, SYF_CAPENABLED }, /* 507 = cap_getrights */ { 0, (sy_call_t *)cap_enter, AUE_CAP_ENTER, NULL, 0, 0, SYF_CAPENABLED }, /* 508 = cap_enter */ { AS(cap_getmode_args), (sy_call_t *)cap_getmode, AUE_CAP_GETMODE, NULL, 0, 0, SYF_CAPENABLED }, /* 509 = cap_getmode */ - { 0, (sy_call_t *)pdfork, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 510 = pdfork */ + { AS(pdfork_args), (sy_call_t *)pdfork, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 510 = pdfork */ { AS(pdkill_args), (sy_call_t *)pdkill, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 511 = pdkill */ { AS(pdgetpid_args), (sy_call_t *)pdgetpid, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 512 = pdgetpid */ { AS(pdwait4_args), (sy_call_t *)pdwait4, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 513 = pdwait4 */ ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_fork.c#6 (text+ko) ==== @@ -121,13 +121,25 @@ struct pdfork_args *uap; { #ifdef PROCDESC - int error; + int error, fd; struct proc *p2; + /* + * XXXRW: For now, we play a slight game here to avoid changing the + * arguments to fork1() - when a process descriptor is requested, we + * will initially return the file descriptor via td_retval[0], then + * in pdfork(), we copy that out and replace the retval with the pid. + * + * It is necessary to return fd by reference as 0 is a valid file + * descriptor number, and the child needs to be able to distinguish + * itself from the parent using the return value. + */ error = fork1(td, RFFDG | RFPROC | RFPROCDESC, 0, &p2); if (error == 0) { - /* td->td_retval[0] will be set to fd in fork1(). */ + fd = td->td_retval[0]; + td->td_retval[0] = p2->p_pid; td->td_retval[1] = 0; + error = copyout(&fd, uap->fdp, sizeof(fd)); } return (error); #else ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#23 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.master#15 (text+ko) ==== @@ -910,7 +910,7 @@ ; ; Process descriptor system calls. These need audit event identifiers. ; -510 AUE_NULL STD { int pdfork(void); } +510 AUE_NULL STD { int pdfork(int *fdp); } 511 AUE_NULL STD { int pdkill(int fd, int signum); } 512 AUE_NULL STD { int pdgetpid(int fd, pid_t *pidp); } 513 AUE_NULL STD { int pdwait4(int fd, int *status, \ ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#23 (text+ko) ==== @@ -3070,7 +3070,9 @@ } /* pdfork */ case 510: { - *n_args = 0; + struct pdfork_args *p = params; + uarg[0] = (intptr_t) p->fdp; /* int * */ + *n_args = 1; break; } /* pdkill */ @@ -8170,6 +8172,13 @@ break; /* pdfork */ case 510: + switch(ndx) { + case 0: + p = "int *"; + break; + default: + break; + }; break; /* pdkill */ case 511: ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#23 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#23 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#23 (text+ko) ==== @@ -1640,7 +1640,7 @@ char modep_l_[PADL_(u_int *)]; u_int * modep; char modep_r_[PADR_(u_int *)]; }; struct pdfork_args { - register_t dummy; + char fdp_l_[PADL_(int *)]; int * fdp; char fdp_r_[PADR_(int *)]; }; struct pdkill_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; From owner-p4-projects@FreeBSD.ORG Sat Jan 17 19:20:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37FF31065670; Sat, 17 Jan 2009 19:20:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 83FED1065673 for ; Sat, 17 Jan 2009 19:20:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 56E5B8FC0C for ; Sat, 17 Jan 2009 19:20:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0HJKp7U015036 for ; Sat, 17 Jan 2009 19:20:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0HJKp4s015034 for perforce@freebsd.org; Sat, 17 Jan 2009 19:20:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 17 Jan 2009 19:20:51 GMT Message-Id: <200901171920.n0HJKp4s015034@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156296 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Jan 2009 19:20:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=156296 Change 156296 by rwatson@rwatson_freebsd_capabilities on 2009/01/17 19:20:51 Fix typo. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/usr.bin/procstat/procstat_files.c#8 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/usr.bin/procstat/procstat_files.c#8 (text+ko) ==== @@ -324,7 +324,7 @@ break; case KF_TYPE_PROCDESC: - print("%-3 %d", "-", kif->kf_pid); + printf("%-3 %d", "-", kif->kf_pid); break; default: From owner-p4-projects@FreeBSD.ORG Sat Jan 17 19:45:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32E911065674; Sat, 17 Jan 2009 19:45:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E35C3106564A for ; Sat, 17 Jan 2009 19:45:16 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D09BA8FC14 for ; Sat, 17 Jan 2009 19:45:16 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0HJjG7b017147 for ; Sat, 17 Jan 2009 19:45:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0HJjGrb017145 for perforce@freebsd.org; Sat, 17 Jan 2009 19:45:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 17 Jan 2009 19:45:16 GMT Message-Id: <200901171945.n0HJjGrb017145@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156299 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Jan 2009 19:45:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=156299 Change 156299 by rwatson@rwatson_freebsd_capabilities on 2009/01/17 19:44:50 Gosh darn it, another typo in the *same* printf line. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/usr.bin/procstat/procstat_files.c#9 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/usr.bin/procstat/procstat_files.c#9 (text+ko) ==== @@ -324,7 +324,7 @@ break; case KF_TYPE_PROCDESC: - printf("%-3 %d", "-", kif->kf_pid); + printf("%-3s %d", "-", kif->kf_pid); break; default: From owner-p4-projects@FreeBSD.ORG Sat Jan 17 20:50:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32810106567B; Sat, 17 Jan 2009 20:50:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DE7251065673 for ; Sat, 17 Jan 2009 20:50:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B84DD8FC13 for ; Sat, 17 Jan 2009 20:50:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0HKoMUC035767 for ; Sat, 17 Jan 2009 20:50:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0HKoMdL035765 for perforce@freebsd.org; Sat, 17 Jan 2009 20:50:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 17 Jan 2009 20:50:22 GMT Message-Id: <200901172050.n0HKoMdL035765@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156302 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Jan 2009 20:50:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=156302 Change 156302 by rwatson@rwatson_freebsd_capabilities on 2009/01/17 20:49:23 Put public process descriptor system calls in procdesc.h. Add process descriptor system call symbols to libc symbol version list. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/Symbol.map#12 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/procdesc.h#2 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/Symbol.map#12 (text) ==== @@ -350,6 +350,10 @@ mkfifoat; mknodat; openat; + pdfork; + pdgetpid; + pdkill; + pdwait4; readlinkat; renameat; setfib; ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/procdesc.h#2 (text+ko) ==== @@ -80,6 +80,11 @@ /* * Process descriptor system calls. */ +struct rusage; +int pdfork(int *fdp); +int pdkill(int fd, int signum); +int pdgetpid(int fd, pid_t *pidp); +int pdwait4(int fd, int *status, int options, struct rusage *rusage); #endif /* _KERNEL */ From owner-p4-projects@FreeBSD.ORG Sat Jan 17 22:38:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B924B10656C6; Sat, 17 Jan 2009 22:38:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7229210656BE for ; Sat, 17 Jan 2009 22:38:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5F7FF8FC19 for ; Sat, 17 Jan 2009 22:38:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0HMcCg1046390 for ; Sat, 17 Jan 2009 22:38:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0HMcCmc046388 for perforce@freebsd.org; Sat, 17 Jan 2009 22:38:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 17 Jan 2009 22:38:12 GMT Message-Id: <200901172238.n0HMcCmc046388@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156304 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Jan 2009 22:38:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=156304 Change 156304 by rwatson@rwatson_freebsd_capabilities on 2009/01/17 22:37:14 When procdesc decides the parent shouldn't be signaled on exit, we still need to lock the parent for the benefits of the scheduler, so do so. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exit.c#7 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exit.c#7 (text+ko) ==== @@ -536,6 +536,8 @@ psignal(p->p_pptr, p->p_sigparent); } #ifdef PROCDESC + } else { + PROC_LOCK(p->p_pptr); } #endif sx_xunlock(&proctree_lock); From owner-p4-projects@FreeBSD.ORG Sat Jan 17 22:38:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24A221065740; Sat, 17 Jan 2009 22:38:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9430C10656C3 for ; Sat, 17 Jan 2009 22:38:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8148E8FC1F for ; Sat, 17 Jan 2009 22:38:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0HMcCrI046395 for ; Sat, 17 Jan 2009 22:38:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0HMcCmG046393 for perforce@freebsd.org; Sat, 17 Jan 2009 22:38:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 17 Jan 2009 22:38:12 GMT Message-Id: <200901172238.n0HMcCmG046393@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156305 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Jan 2009 22:38:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=156305 Change 156305 by rwatson@rwatson_freebsd_capabilities on 2009/01/17 22:38:00 When creating a process descriptor for a process, hook it up so that it can be found later. Assert that a process descriptor is closed before freeing it. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#2 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#2 (text+ko) ==== @@ -208,6 +208,7 @@ pd = uma_zalloc(procdesc_zone, M_WAITOK | M_ZERO); pd->pd_proc = p; pd->pd_pid = p->p_pid; + p->p_procdesc = pd; /* * Process descriptors start out with two references: one from their @@ -226,6 +227,8 @@ if (refcount_release(&pd->pd_refcount)) { KASSERT(pd->pd_proc == NULL, ("procdesc_free: pd_proc != NULL")); + KASSERT((pd->pd_flags & PD_CLOSED), + ("procdesc_free: !PD_CLOSED")); uma_zfree(procdesc_zone, pd); }