From owner-p4-projects@FreeBSD.ORG Sun Dec 2 00:01:33 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B686D16A420; Sun, 2 Dec 2007 00:01:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5E91B16A418 for ; Sun, 2 Dec 2007 00:01:33 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4662A13C44B for ; Sun, 2 Dec 2007 00:01:33 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB201XIh000824 for ; Sun, 2 Dec 2007 00:01:33 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB201XbN000811 for perforce@freebsd.org; Sun, 2 Dec 2007 00:01:33 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 00:01:33 GMT Message-Id: <200712020001.lB201XbN000811@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 129920 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 00:01:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=129920 Change 129920 by hselasky@hselasky_laptop001 on 2007/12/02 00:00:47 "buf_data" will be removed and replaced by "frbuffers + 0". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#12 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#12 (text+ko) ==== @@ -1286,7 +1286,7 @@ uipd = urb->iso_frame_desc + x; uipd->actual_length = xfer->frlengths[x]; uipd->status = 0; - usbd_copy_out(&(xfer->buf_data), offset, + usbd_copy_out(xfer->frbuffers + 0, offset, ((uint8_t *)(urb->transfer_buffer)) + uipd->offset, uipd->actual_length); offset += max_frame; @@ -1354,7 +1354,7 @@ for (x = 0; x < urb->number_of_packets; x++) { uipd = urb->iso_frame_desc + x; xfer->frlengths[x] = uipd->length; - usbd_copy_in(&(xfer->buf_data), offset, + usbd_copy_in(xfer->frbuffers + 0, offset, ((uint8_t *)(urb->transfer_buffer)) + uipd->offset, uipd->length); offset += uipd->length; From owner-p4-projects@FreeBSD.ORG Sun Dec 2 00:02:34 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7D5E16A468; Sun, 2 Dec 2007 00:02: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 8DADC16A420 for ; Sun, 2 Dec 2007 00:02:34 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7285713C447 for ; Sun, 2 Dec 2007 00:02:34 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB202Ypa001185 for ; Sun, 2 Dec 2007 00:02:34 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB202YjB001182 for perforce@freebsd.org; Sun, 2 Dec 2007 00:02:34 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 00:02:34 GMT Message-Id: <200712020002.lB202YjB001182@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 129921 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 00:02:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=129921 Change 129921 by hselasky@hselasky_laptop001 on 2007/12/02 00:01:35 The "bdma_enable" flag was temporary and is going away. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/README#22 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/README#22 (text+ko) ==== @@ -321,12 +321,6 @@ transfers. This flag is mostly useful for the USB device side. This flag can be changed during operation. - bdma_enable - Setting this flag allows you to load virtual buffers directly - into DMA. Virtual buffers are loaded by a call to - "usbd_set_frame_data()". This flag can not be changed during - operation. - - The "bufsize" field sets the total buffer size in bytes. If this field is zero, "wMaxPacketSize" will be used, multiplied by the "frames" field if the transfer type is ISOCHRONOUS. This is useful for From owner-p4-projects@FreeBSD.ORG Sun Dec 2 00:02:35 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3848416A526; Sun, 2 Dec 2007 00:02:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AFC2E16A41B for ; Sun, 2 Dec 2007 00:02:34 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 97BE113C448 for ; Sun, 2 Dec 2007 00:02:34 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB202YUM001191 for ; Sun, 2 Dec 2007 00:02:34 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB202YaN001188 for perforce@freebsd.org; Sun, 2 Dec 2007 00:02:34 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 00:02:34 GMT Message-Id: <200712020002.lB202YaN001188@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 129922 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 00:02:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=129922 Change 129922 by hselasky@hselasky_laptop001 on 2007/12/02 00:02:14 Call the correct function. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uhci.c#46 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uhci.c#46 (text+ko) ==== @@ -1052,10 +1052,9 @@ xfer, xfer->pipe)); /* sync any DMA memory before doing fixups */ - if (xfer->flags.bdma_enable) { - usbd_dma_load_post_sync(xfer); - XXX; - } + + usbd_bdma_post_sync(xfer); + while (nframes--) { if (td == NULL) { panic("%s:%d: out of TD's\n", @@ -1239,9 +1238,9 @@ #endif /* sync any DMA memory before doing fixups */ - if (xfer->flags.bdma_enable) { - usbd_dma_load_post_sync(xfer); - } + + usbd_bdma_post_sync(xfer); + /* reset scanner */ xfer->td_transfer_cache = xfer->td_transfer_first; From owner-p4-projects@FreeBSD.ORG Sun Dec 2 00:05:38 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F39E16A419; Sun, 2 Dec 2007 00:05:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 33EB416A417 for ; Sun, 2 Dec 2007 00:05:38 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1AE1E13C461 for ; Sun, 2 Dec 2007 00:05:38 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB205c9p002862 for ; Sun, 2 Dec 2007 00:05:38 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB205bgN002859 for perforce@freebsd.org; Sun, 2 Dec 2007 00:05:37 GMT (envelope-from peter@freebsd.org) Date: Sun, 2 Dec 2007 00:05:37 GMT Message-Id: <200712020005.lB205bgN002859@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 129923 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 00:05:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=129923 Change 129923 by peter@peter_daintree on 2007/12/02 00:05:31 re-add stub function (meant to be streamlined sched_add() replacement) Affected files ... .. //depot/projects/bike_sched/sys/kern/sched_4bsd.c#13 edit .. //depot/projects/bike_sched/sys/kern/sched_ule.c#13 edit Differences ... ==== //depot/projects/bike_sched/sys/kern/sched_4bsd.c#13 (text+ko) ==== @@ -1162,6 +1162,12 @@ #endif /* SMP */ void +sched_run_ithread(struct thread *td) +{ + sched_add(td, SRQ_INTR); +} + +void sched_rem(struct thread *td) { struct td_sched *ts; ==== //depot/projects/bike_sched/sys/kern/sched_ule.c#13 (text+ko) ==== @@ -2381,6 +2381,12 @@ sched_setpreempt(td); } +void +sched_run_ithread(struct thread *td) +{ + sched_add(td, SRQ_INTR); +} + /* * Remove a thread from a run-queue without running it. This is used * when we're stealing a thread from a remote queue. Otherwise all threads From owner-p4-projects@FreeBSD.ORG Sun Dec 2 00:11:45 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD3E316A41A; Sun, 2 Dec 2007 00: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 4846016A418 for ; Sun, 2 Dec 2007 00: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 2F65B13C459 for ; Sun, 2 Dec 2007 00: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.1/8.14.1) with ESMTP id lB20Bjhk003862 for ; Sun, 2 Dec 2007 00:11:45 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB20BjmN003859 for perforce@freebsd.org; Sun, 2 Dec 2007 00:11:45 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 00:11:45 GMT Message-Id: <200712020011.lB20BjmN003859@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 129925 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 00:11:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=129925 Change 129925 by hselasky@hselasky_laptop001 on 2007/12/02 00:11:06 This commit finishes change 129799 with regard to "usb_subr.h". The USBD_BDMA state has been removed, hence I was able to simplify the statemachine. New bus method "xfer_unsetup". Currently unused. Struct "usbd_page" has been simplified to only contain the physical address. Struct "usbd_page_cache" now contains the BUS-DMA "tag" and "map". New structure "usbd_dma_tag" which is used to cache DMA-tags. "buf_data" field in "struct usbd_xfer" was replaced by "frbuffers + 0". Some new prototypes. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#62 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#62 (text+ko) ==== @@ -73,8 +73,14 @@ #define USBD_GET_STATE(xfer) ((xfer)->usb_state) #define USBD_GET_DATA_ISREAD(xfer) ((xfer)->flags_int.is_dci ? \ -((xfer->endpoint & UE_DIR_IN) ? 0 : 1) : \ - ((xfer->endpoint & UE_DIR_IN) ? 1 : 0)) + ((xfer->endpoint & UE_DIR_IN) ? 0 : 1) : \ + ((xfer->endpoint & UE_DIR_IN) ? 1 : 0)) + +#undef LIST_PREV +#define LIST_PREV(head,elm,field) \ + (((elm) == LIST_FIRST(head)) ? ((__typeof(elm))0) : \ + ((__typeof(elm))(((uint8_t *)((elm)->field.le_prev)) - \ + ((uint8_t *)&LIST_NEXT((__typeof(elm))0,field))))) /* USB transfer states */ @@ -84,20 +90,6 @@ USBD_ST_ERROR, }; -/* - * USB BUS-DMA transfer states - * - * Hence the BUS-DMA framework does not support DMA load abort we need - * to keep track of the BUS-DMA state in the USB transfer. - */ - -enum { - USBD_BDMA_ST_IDLE, - USBD_BDMA_ST_LOADING, - USBD_BDMA_ST_CANCELLING, - USBD_BDMA_ST_CANCEL_AND_LOAD, -}; - struct usbd_xfer; struct usbd_pipe; struct usbd_bus; @@ -115,9 +107,6 @@ struct proc; struct usb_device; /* Linux compat */ struct cdev; -struct ehci_hw_softc; -struct uhci_hw_softc; -struct ohci_hw_softc; typedef uint8_t usbd_status; @@ -139,6 +128,7 @@ void (*pipe_init) (struct usbd_device *udev, usb_endpoint_descriptor_t *edesc, struct usbd_pipe *pipe); void (*do_poll) (struct usbd_bus *); void (*xfer_setup) (struct usbd_setup_params *parm); + void (*xfer_unsetup) (struct usbd_xfer *xfer); }; struct usbd_pipe_methods { @@ -183,8 +173,16 @@ }; struct usbd_page { + bus_size_t physaddr; +}; + +struct usbd_page_search { void *buffer; bus_size_t physaddr; + uint32_t length; +}; + +struct usbd_page_cache { #ifdef __FreeBSD__ bus_dma_tag_t tag; @@ -192,72 +190,62 @@ #endif #ifdef __NetBSD__ + bus_dma_segment_t seg; bus_dma_tag_t tag; bus_dmamap_t map; - bus_dma_segment_t seg; int32_t seg_count; #endif - uint32_t length; -}; - -struct usbd_page_search { - void *buffer; - struct usbd_page *page; - bus_size_t physaddr; - uint32_t length; -}; - -struct usbd_page_cache { struct usbd_page *page_start; - struct usbd_xfer *p_xfer; /* this backpointer to the USB - * transfer is used when loading - * virtual buffers into DMA */ - void *p_buffer; /* virtual buffer to be loaded by - * BUS-DMA */ + struct usbd_xfer *xfer; /* if set, backpointer to USB transfer */ + void *buffer; /* virtual buffer pointer */ uint32_t page_offset_buf; uint32_t page_offset_end; uint8_t isread:1; }; struct usbd_setup_params { - struct usbd_page_cache pc; - + struct usbd_dma_tag *dma_tag_p; struct usbd_page *dma_page_ptr; - struct usbd_page *page_ptr; + struct usbd_page_cache *dma_page_cache_ptr; /* these will be + * auto-freed */ + struct usbd_page_cache *xfer_page_cache_ptr; /* these will not be + * auto-freed */ struct usbd_device *udev; struct usbd_xfer *curr_xfer; const struct usbd_config *curr_setup; const struct usbd_pipe_methods *methods; void *buf; + uint32_t *xfer_length_ptr; - uint32_t size[4]; - uint32_t total_size[3]; + uint32_t size[7]; uint32_t bufsize; + uint32_t bufsize_max; uint32_t hc_max_frame_size; uint16_t hc_max_packet_size; uint8_t hc_max_packet_count; uint8_t speed; + uint8_t dma_tag_max; usbd_status err; }; +struct usbd_dma_tag { + bus_dma_tag_t tag; + uint32_t align; + uint32_t size; +}; + +#define USB_BUS_DMA_TAG_MAX 8 + struct usbd_bus { struct usb_device_stats stats; struct mtx mtx; - struct usbd_page hw_page; + + device_t bdev; /* filled by HC driver */ - union { - struct ehci_hw_softc *ehci; - struct uhci_hw_softc *uhci; - struct ohci_hw_softc *ohci; - void *data; - } hw_ptr; + struct usbd_dma_tag dma_tags[USB_BUS_DMA_TAG_MAX]; + bus_dma_tag_t dma_tag_parent; - device_t bdev; /* filled by HC driver */ - bus_dma_tag_t dma_tag_1b; /* 1 byte aligned DMA-tag, filled by - * HC driver */ - bus_dma_tag_t dma_tag_ps; /* page size aligned DMA-tag, filled - * by HC driver */ eventhandler_tag usb_clone_tag; struct usbd_bus_methods *methods; /* filled by HC driver */ struct usbd_device *devices[USB_MAX_DEVICES]; @@ -269,6 +257,7 @@ uint16_t isoc_time_last; /* ms */ + uint8_t alloc_failed; /* Set if memory allocation failed. */ uint8_t is_exploring; uint8_t wait_explore; uint8_t needs_explore; /* Set if a hub signalled a change. @@ -385,11 +374,6 @@ uint8_t ext_buffer:1; /* uses external DMA buffer */ uint8_t manual_status:1; /* non automatic status stage on * control transfers */ - uint8_t bdma_enable:1; /* setting this flag allows you to - * load buffers directly into DMA for - * the USB transfer the flag belongs - * to. The flag can not be changed - * during operation. */ }; struct usbd_xfer_flags_int { @@ -407,11 +391,11 @@ uint8_t short_frames_ok:1; /* filtered version */ uint8_t short_xfer_ok:1; /* filtered version */ - uint8_t bdma_state:2; /* BUS-DMA state */ - uint8_t bdma_error:1; /* BUS-DMA error flag */ uint8_t bdma_enable:1; /* filtered version (only set if * hardware supports DMA) */ - uint8_t bdma_draining:1; + uint8_t bdma_no_post_sync:1; /* set if the USB callback wrapper + * should not do the BUS-DMA post sync + * operation */ uint8_t isochronous_xfr:1; /* set if isochronous transfer */ uint8_t is_dci:1; /* set if hardware is a device * controller interface */ @@ -437,17 +421,15 @@ struct usbd_xfer { struct usb_callout timeout_handle; - struct usbd_page_cache buf_data;/* buffer page cache */ - struct usbd_page_cache buf_fixup; /* fixup buffer */ + struct usbd_page_cache *buf_fixup; /* fixup buffer(s) */ LIST_ENTRY(usbd_xfer) interrupt_list; /* used by HC driver */ LIST_ENTRY(usbd_xfer) pipe_list; /* used by HC driver */ + LIST_ENTRY(usbd_xfer) dma_list;/* used by BUS-DMA */ - bus_dmamap_t dma_rx_map; - bus_dmamap_t dma_tx_map; struct usbd_page *dma_page_ptr; struct usbd_pipe *pipe; struct usbd_device *udev; - struct mtx *priv_mtx; + struct mtx *priv_mtx; /* cannot be changed during operation */ struct mtx *usb_mtx; /* used by HC driver */ struct usbd_memory_info *usb_root; /* used by HC driver */ struct thread *usb_thread; /* used by HC driver */ @@ -459,11 +441,11 @@ void *td_transfer_cache; /* used by HC driver */ void *priv_sc; void *priv_fifo; + void *local_buffer; uint32_t *frlengths; struct usbd_page_cache *frbuffers; usbd_callback_t *callback; - uint32_t dma_refcount; uint32_t max_usb_frame_size; uint32_t max_data_length; uint32_t sumlen; /* sum of all lengths in bytes */ @@ -496,22 +478,33 @@ struct usbd_xfer_flags_int flags_int; }; -struct usbd_dma_load_mem_info { - struct usbd_page *page_ptr; - struct usbd_page_cache *page_cache; - uint32_t frame_length; -}; +struct usbd_memory_info { + LIST_HEAD(, usbd_xfer) dma_head; -struct usbd_memory_info { void *memory_base; struct mtx *priv_mtx; struct mtx *usb_mtx; - struct usbd_page *page_base; + struct usbd_page_cache *dma_page_cache_start; + struct usbd_page_cache *dma_page_cache_end; + struct usbd_page_cache *xfer_page_cache_start; + struct usbd_page_cache *xfer_page_cache_end; + struct usbd_xfer *dma_curr_xfer; + struct usbd_dma_tag *dma_tag_p; uint32_t memory_size; uint32_t memory_refcount; uint32_t setup_refcount; uint32_t page_size; + uint32_t dma_refcount; + + uint8_t dma_error; /* set if virtual memory could not be + * loaded */ + uint8_t dma_draining; /* set if someone is waiting for a + * BUS-DMA load operation to complete */ + uint8_t dma_no_callback; /* set if callback should not be + * called */ + + uint8_t dma_tag_max; }; struct usbd_mbuf { @@ -667,6 +660,9 @@ #endif #endif +typedef void (usbd_bus_mem_sub_cb_t)(struct usbd_bus *bus, struct usbd_page_cache *pc, struct usbd_page *pg, uint32_t size, uint32_t align); +typedef void (usbd_bus_mem_cb_t)(struct usbd_bus *bus, usbd_bus_mem_sub_cb_t *scb); + void usbd_devinfo(struct usbd_device *udev, char *dst_ptr, uint16_t dst_len); const char *usbd_errstr(usbd_status err); void usb_delay_ms(struct usbd_bus *bus, uint32_t ms); @@ -700,29 +696,20 @@ int usbd_uiomove(struct usbd_page_cache *pc, struct uio *uio, uint32_t pc_offset, uint32_t len); void usbd_copy_out(struct usbd_page_cache *cache, uint32_t offset, void *ptr, uint32_t len); void usbd_bzero(struct usbd_page_cache *cache, uint32_t offset, uint32_t len); -uint8_t usbd_page_alloc(bus_dma_tag_t tag, struct usbd_page *page, uint32_t npages); -void usbd_page_free(struct usbd_page *page, uint32_t npages); -void usbd_page_cache_init(struct usbd_page_cache *pc, struct usbd_page *page_ptr, uint32_t offset, uint32_t size); -uint32_t usbd_page_fit_obj(uint32_t size, uint32_t obj_len); -void *usbd_mem_alloc(bus_dma_tag_t parent, struct usbd_page *page, uint32_t size, uint8_t align_power); -void usbd_mem_free(struct usbd_page *page); -bus_dma_tag_t usbd_dma_tag_alloc(bus_dma_tag_t parent, uint32_t seg_size, uint32_t alignment, uint32_t max_size, uint8_t single_seg); -void usbd_dma_tag_free(bus_dma_tag_t tag); -void *usbd_mem_alloc_sub(bus_dma_tag_t tag, struct usbd_page *page, uint32_t size, uint32_t alignment); -void usbd_mem_free_sub(struct usbd_page *page); -void usbd_dma_load_setup(struct usbd_setup_params *parm); -void usbd_dma_load_unsetup(struct usbd_xfer *xfer); -void usbd_dma_load_pre_sync(struct usbd_xfer *xfer); -void usbd_dma_load_post_sync(struct usbd_xfer *xfer); -void usbd_page_cpu_invalidate(struct usbd_page *page); -void usbd_page_cpu_flush(struct usbd_page *page); -void usbd_pio_load_mem(struct usbd_xfer *xfer, struct usbd_dma_load_mem_info *info); +bus_dma_tag_t usbd_dma_tag_create(bus_dma_tag_t tag_parent, uint32_t size, uint32_t align); +void usbd_dma_tag_destroy(bus_dma_tag_t tag); +uint8_t usbd_pc_alloc_mem(bus_dma_tag_t parent_tag, struct usbd_dma_tag *utag, struct usbd_page_cache *pc, struct usbd_page *pg, uint32_t size, uint32_t align, uint8_t utag_max); +void usbd_pc_free_mem(struct usbd_page_cache *pc); +void usbd_pc_load_mem(struct usbd_page_cache *pc, uint32_t size); +void usbd_pc_cpu_invalidate(struct usbd_page_cache *pc); +void usbd_pc_cpu_flush(struct usbd_page_cache *pc); +uint8_t usbd_pc_dmamap_create(struct usbd_page_cache *pc, uint32_t size); +void usbd_pc_dmamap_destroy(struct usbd_page_cache *pc); uint8_t usbd_make_str_desc(void *ptr, uint16_t max_len, const char *s); uint32_t mtx_drop_recurse(struct mtx *mtx); void mtx_pickup_recurse(struct mtx *mtx, uint32_t recurse_level); uint8_t usbd_config_td_setup(struct usbd_config_td *ctd, void *priv_sc, struct mtx *priv_mtx, usbd_config_td_end_of_commands_t *p_func_eoc, uint16_t item_size, uint16_t item_count); void usbd_config_td_stop(struct usbd_config_td *ctd); -void usbd_transfer_drain(struct usbd_xfer *xfer); void usbd_config_td_unsetup(struct usbd_config_td *ctd); void usbd_config_td_queue_command(struct usbd_config_td *ctd, usbd_config_td_command_t *pre_func, usbd_config_td_command_t *post_func, uint16_t command_qcount, uint16_t command_ref); uint8_t usbd_config_td_is_gone(struct usbd_config_td *ctd); @@ -730,9 +717,12 @@ struct mbuf *usbd_ether_get_mbuf(void); int32_t device_delete_all_children(device_t dev); uint16_t usbd_isoc_time_expand(struct usbd_bus *bus, uint16_t isoc_time_curr); -void usbd_dma_load_mem(struct usbd_xfer *xfer, struct usbd_dma_load_mem_info *info); -uint8_t usbd_bus_mem_setup(struct usbd_bus *bus, bus_dma_tag_t parent_tag, uint32_t hw_mem_size, uint8_t hw_addr_lines, uint8_t hw_align_power); -void usbd_bus_mem_unsetup(struct usbd_bus *bus); +bus_dma_tag_t usbd_dma_tag_setup(bus_dma_tag_t tag_parent, struct usbd_dma_tag *udt, uint32_t size, uint32_t align, uint8_t nudt); +void usbd_dma_tag_unsetup(struct usbd_dma_tag *udt, uint8_t nudt); +void usbd_bus_mem_flush_all(struct usbd_bus *bus, usbd_bus_mem_cb_t *cb); +uint8_t usbd_bus_mem_alloc_all(struct usbd_bus *bus, usbd_bus_mem_cb_t *cb); +void usbd_bus_mem_free_all(struct usbd_bus *bus, usbd_bus_mem_cb_t *cb); +uint8_t usbd_transfer_setup_sub_malloc(struct usbd_setup_params *parm, struct usbd_page_search *info, struct usbd_page_cache **ppc, uint32_t size, uint32_t align); /* prototypes from usb.c */ @@ -768,9 +758,12 @@ void usbd_transfer_unsetup(struct usbd_xfer **pxfer, uint16_t n_setup); uint8_t usbd_std_root_transfer(struct usbd_std_root_transfer *std, struct thread *ctd, usbd_std_root_transfer_func_t *func); void usbd_start_hardware(struct usbd_xfer *xfer); -void usbd_bdma_done_event(struct usbd_xfer *xfer); +void usbd_bdma_done_event(struct usbd_memory_info *info); +void usbd_bdma_pre_sync(struct usbd_xfer *xfer); +void usbd_bdma_post_sync(struct usbd_xfer *xfer); void usbd_transfer_start(struct usbd_xfer *xfer); void usbd_transfer_stop(struct usbd_xfer *xfer); +void usbd_transfer_drain(struct usbd_xfer *xfer); void usbd_set_frame_data(struct usbd_xfer *xfer, void *ptr, uint32_t len, uint32_t frindex); void usbd_set_frame_offset(struct usbd_xfer *xfer, uint32_t offset, uint32_t frindex); void usbd_callback_wrapper(struct usbd_xfer *xfer); From owner-p4-projects@FreeBSD.ORG Sun Dec 2 00:16:51 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42C5E16A468; Sun, 2 Dec 2007 00:16:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D8A3E16A417 for ; Sun, 2 Dec 2007 00:16:50 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BF7FA13C455 for ; Sun, 2 Dec 2007 00:16:50 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB20Gosi004488 for ; Sun, 2 Dec 2007 00:16:50 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB20GoED004485 for perforce@freebsd.org; Sun, 2 Dec 2007 00:16:50 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 00:16:50 GMT Message-Id: <200712020016.lB20GoED004485@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 129926 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 00:16:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=129926 Change 129926 by hselasky@hselasky_laptop001 on 2007/12/02 00:16:43 This commit finishes change 129799 with regard to "usb_subr.c". The "page_cache" now holds the pointer to the virtual buffer and "usbd_get_page" has been updated to reflect the latest changes. Factored out most CPU cache flush / invalidate calls. There is a new set of functions added that abstract the BUS-DMA interface towards USB. The old BUS-DMA abstraction functions were removed. The NetBSD specific part of "usb_subr.c" has not been updated with regard to this. TODO. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#57 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#57 (text+ko) ==== @@ -1783,6 +1783,8 @@ { struct usbd_page *page; + res->buffer = USBD_ADD_BYTES(pc->buffer, offset); + offset += pc->page_offset_buf; if ((offset >= pc->page_offset_end) || @@ -1793,7 +1795,6 @@ res->length = 0; res->buffer = NULL; res->physaddr = 0; - res->page = NULL; return; } /* compute destination page */ @@ -1805,9 +1806,7 @@ offset %= USB_PAGE_SIZE; res->length = USB_PAGE_SIZE - offset; - res->buffer = USBD_ADD_BYTES(page->buffer, offset); res->physaddr = page->physaddr + offset; - res->page = page; return; } @@ -1831,15 +1830,11 @@ if (res.length > len) { res.length = len; } - usbd_page_cpu_invalidate(res.page); - bcopy(ptr, res.buffer, res.length); - usbd_page_cpu_flush(res.page); - offset += res.length; len -= res.length; - ptr = ((const uint8_t *)ptr) + res.length; + ptr = USBD_ADD_BYTES(ptr, res.length); } return; } @@ -1898,16 +1893,12 @@ if (res.length > len) { res.length = len; } - usbd_page_cpu_invalidate(res.page); - /* * "uiomove()" can sleep so one needs to make a wrapper, * exiting the mutex and checking things */ error = uiomove(res.buffer, len, uio); - usbd_page_cpu_flush(res.page); - if (error) { break; } @@ -1937,12 +1928,8 @@ if (res.length > len) { res.length = len; } - usbd_page_cpu_invalidate(res.page); - bcopy(res.buffer, ptr, res.length); - usbd_page_cpu_flush(res.page); - offset += res.length; len -= res.length; ptr = USBD_ADD_BYTES(ptr, res.length); @@ -1969,480 +1956,283 @@ if (res.length > len) { res.length = len; } - usbd_page_cpu_invalidate(res.page); - bzero(res.buffer, res.length); - usbd_page_cpu_flush(res.page); - offset += res.length; len -= res.length; } return; } +#ifdef __FreeBSD__ + /*------------------------------------------------------------------------* - * usbd_page_alloc - allocate multiple DMA-able memory pages + * usbd_pc_tag_create - allocate a DMA tag * - * Returns: - * 1: failure - * 0: success + * NOTE: If the "align" parameter has a value of 1 the DMA-tag will + * allow multi-segment mappings. Else all mappings are single-segment. *------------------------------------------------------------------------*/ -uint8_t -usbd_page_alloc(bus_dma_tag_t tag, struct usbd_page *page, - uint32_t npages) +bus_dma_tag_t +usbd_dma_tag_create(bus_dma_tag_t tag_parent, uint32_t size, uint32_t align) { - uint32_t x; - void *ptr; + bus_dma_tag_t tag; - for (x = 0; x < npages; x++) { - -repeat: - - ptr = usbd_mem_alloc_sub(tag, page + x, - USB_PAGE_SIZE, USB_PAGE_SIZE); - if (ptr == NULL) { - - while (x--) { - usbd_mem_free_sub(page + x); - } - return (1); /* failure */ - } else { - - if ((page + x)->physaddr == 0) { - - /* - * at least the OHCI controller gives - * special meaning to physaddr == 0, so - * discard that page if it gets here: - */ - printf("%s:%d: Discarded memory " - "page with physaddr=0!\n", - __FUNCTION__, __LINE__); - goto repeat; - } - } + if (bus_dma_tag_create + ( /* parent */ tag_parent, + /* alignment */ align, + /* boundary */ 0, + /* lowaddr */ BUS_SPACE_MAXADDR_32BIT, + /* highaddr */ BUS_SPACE_MAXADDR, + /* filter */ NULL, + /* filterarg */ NULL, + /* maxsize */ size, + /* nsegments */ (align == 1) ? + (2 + (size / USB_PAGE_SIZE)) : 1, + /* maxsegsz */ USB_PAGE_SIZE, + /* flags */ 0, + /* lock */ NULL, + /* */ NULL, + &tag)) { + tag = NULL; } - return (0); /* success */ + return (tag); } /*------------------------------------------------------------------------* - * usbd_page_free - free multiple DMA-able memory pages + * usbd_dma_tag_free - free a DMA tag *------------------------------------------------------------------------*/ void -usbd_page_free(struct usbd_page *page, uint32_t npages) +usbd_dma_tag_destroy(bus_dma_tag_t tag) { - while (npages--) { - usbd_mem_free_sub(page + npages); - } + bus_dma_tag_destroy(tag); return; } /*------------------------------------------------------------------------* - * usbd_page_cache_init + * usbd_pc_alloc_mem_cb *------------------------------------------------------------------------*/ -void -usbd_page_cache_init(struct usbd_page_cache *pc, struct usbd_page *page_ptr, - uint32_t offset, uint32_t size) +static void +usbd_pc_alloc_mem_cb(void *arg, bus_dma_segment_t *segs, + int nseg, int error) { - pc->page_start = page_ptr + (offset / USB_PAGE_SIZE); - pc->page_offset_buf = (offset % USB_PAGE_SIZE); - pc->page_offset_end = pc->page_offset_buf + size; - return; -} + struct usbd_xfer *xfer; + struct usbd_page_cache *pc; + struct usbd_page *pg; + uint32_t rem; -/*------------------------------------------------------------------------* - * usbd_page_fit_obj - fit object function - *------------------------------------------------------------------------*/ -uint32_t -usbd_page_fit_obj(uint32_t size, uint32_t obj_len) -{ - uint32_t adj; + xfer = pc->xfer; - if (obj_len > (USB_PAGE_SIZE - (size & (USB_PAGE_SIZE - 1)))) { + /* XXX sometimes recursive locking here */ - if (obj_len > USB_PAGE_SIZE) { - panic("%s:%d Too large object, %d bytes, will " - "not fit on a USB page, %d bytes!\n", - __FUNCTION__, __LINE__, obj_len, - (int32_t)USB_PAGE_SIZE); + if (error) { + if (xfer) { + mtx_lock(xfer->priv_mtx); + xfer->usb_root->dma_error = 1; + usbd_bdma_done_event(xfer->usb_root); + mtx_unlock(xfer->priv_mtx); } - /* - * adjust offset to the beginning of the next page: - */ - adj = ((-size) & (USB_PAGE_SIZE - 1)); - } else { - adj = 0; + return; } - return (adj); -} + pc = arg; + pg = pc->page_start; + pg->physaddr = segs->ds_addr & ~(USB_PAGE_SIZE - 1); + rem = segs->ds_addr & (USB_PAGE_SIZE - 1); + pc->page_offset_buf = rem; + pc->page_offset_end += rem; + nseg--; -/*------------------------------------------------------------------------* - * usbd_mem_alloc - allocate DMA-able memory - *------------------------------------------------------------------------*/ -void * -usbd_mem_alloc(bus_dma_tag_t parent, struct usbd_page *page, uint32_t size, - uint8_t align_power) -{ - bus_dma_tag_t tag; - uint32_t alignment = (1 << align_power); - void *ptr; - - tag = usbd_dma_tag_alloc(parent, size, alignment, size, 1); - - if (tag == NULL) { - return (NULL); + while (nseg > 0) { + nseg--; + segs++; + pg++; + pg->physaddr = segs->ds_addr & ~(USB_PAGE_SIZE - 1); } - ptr = usbd_mem_alloc_sub(tag, page, size, alignment); - if (ptr == NULL) { - usbd_dma_tag_free(tag); - return (NULL); + if (xfer) { + mtx_lock(xfer->priv_mtx); + usbd_bdma_done_event(xfer->usb_root); + mtx_unlock(xfer->priv_mtx); } - return (ptr); -} - -/*------------------------------------------------------------------------* - * usbd_mem_free - free DMA-able memory - *------------------------------------------------------------------------*/ -void -usbd_mem_free(struct usbd_page *page) -{ - bus_dma_tag_t tag; - - tag = page->tag; - - usbd_mem_free_sub(page); - - usbd_dma_tag_free(tag); - return; } -#ifdef __FreeBSD__ /*------------------------------------------------------------------------* - * bus_dmamap_load_callback + * usbd_pc_alloc_mem - allocate DMA'able memory + * + * Returns: + * 0: Success + * Else: Failure *------------------------------------------------------------------------*/ -static void -bus_dmamap_load_callback(void *arg, bus_dma_segment_t *segs, - int nseg, int error) -{ - __KASSERT(nseg == 1, ("Invalid number of segments, %d!\n", nseg)); - __KASSERT(error == 0, ("Could not load memory into DMA!\n")); - - *((bus_size_t *)arg) = segs->ds_addr; - - return; -} - -/*------------------------------------------------------------------------* - * usbd_dma_tag_alloc - allocate a bus-DMA tag - *------------------------------------------------------------------------*/ -bus_dma_tag_t -usbd_dma_tag_alloc(bus_dma_tag_t parent, uint32_t seg_size, - uint32_t alignment, uint32_t max_size, uint8_t single_seg) +uint8_t +usbd_pc_alloc_mem(bus_dma_tag_t parent_tag, struct usbd_dma_tag *utag, + struct usbd_page_cache *pc, struct usbd_page *pg, uint32_t size, + uint32_t align, uint8_t utag_max) { bus_dma_tag_t tag; - - if (bus_dma_tag_create - ( /* parent */ parent, - /* alignment */ alignment, - /* boundary */ 0, - /* lowaddr */ BUS_SPACE_MAXADDR_32BIT, - /* highaddr */ BUS_SPACE_MAXADDR, - /* filter */ NULL, - /* filterarg */ NULL, - /* maxsize */ max_size, - /* nsegments */ (single_seg ? 1 : ((16 * 1024 * 1024) / USB_PAGE_SIZE)), - /* maxsegsz */ seg_size, - /* flags */ 0, - /* lock */ NULL, - /* */ NULL, - &tag)) { - tag = NULL; - } - return (tag); -} - -/*------------------------------------------------------------------------* - * usbd_dma_tag_free - free a bus-DMA tag - *------------------------------------------------------------------------*/ -void -usbd_dma_tag_free(bus_dma_tag_t tag) -{ - bus_dma_tag_destroy(tag); - return; -} - -/*------------------------------------------------------------------------* - * usbd_mem_alloc_sub - allocate DMA-able memory - *------------------------------------------------------------------------*/ -void * -usbd_mem_alloc_sub(bus_dma_tag_t tag, struct usbd_page *page, - uint32_t size, uint32_t alignment) -{ bus_dmamap_t map; - bus_size_t physaddr = 0; void *ptr; + /* get the correct DMA tag */ + tag = usbd_dma_tag_setup(parent_tag, utag, size, align, utag_max); + if (tag == NULL) { + goto error; + } + /* allocate memory */ if (bus_dmamem_alloc (tag, &ptr, (BUS_DMA_WAITOK | BUS_DMA_COHERENT), &map)) { - return (NULL); + goto error; } + /* setup page cache */ + pc->buffer = ptr; + pc->page_start = pg; + pc->page_offset_buf = 0; + pc->page_offset_end = size; + pc->map = map; + pc->tag = tag; + + /* load memory into DMA */ if (bus_dmamap_load - (tag, map, ptr, size, &bus_dmamap_load_callback, - &physaddr, (BUS_DMA_WAITOK | BUS_DMA_COHERENT))) { + (tag, map, ptr, size, &usbd_pc_alloc_mem_cb, + pc, (BUS_DMA_WAITOK | BUS_DMA_COHERENT))) { bus_dmamem_free(tag, ptr, map); - return (NULL); + goto error; } - page->tag = tag; - page->map = map; - page->physaddr = physaddr; - page->buffer = ptr; - page->length = size; + bzero(ptr, size); + + usbd_pc_cpu_flush(pc); - usbd_page_cpu_invalidate(page); - bzero(ptr, size); - usbd_page_cpu_flush(page); + return (0); -#ifdef USB_DEBUG - if (usbdebug > 14) { - printf("%s: %p, %d bytes, phys=%p\n", - __FUNCTION__, ptr, size, - ((char *)0) + physaddr); - } -#endif - return (ptr); +error: + /* reset most of the page cache */ + pc->buffer = NULL; + pc->page_start = NULL; + pc->page_offset_buf = 0; + pc->page_offset_end = 0; + pc->map = NULL; + pc->tag = NULL; + return (1); } /*------------------------------------------------------------------------* - * usbd_mem_free_sub - free DMA-able memory + * usbd_pc_free_mem - free DMA memory + * + * This function is NULL safe. *------------------------------------------------------------------------*/ void -usbd_mem_free_sub(struct usbd_page *page) +usbd_pc_free_mem(struct usbd_page_cache *pc) { - /* - * NOTE: make a copy of "tag", "map", and "buffer" in case "page" is - * part of the allocated memory: - */ - bus_dma_tag_t tag = page->tag; - bus_dmamap_t map = page->map; - void *ptr = page->buffer; + if (pc && pc->buffer) { - bus_dmamap_unload(tag, map); + bus_dmamap_unload(pc->tag, pc->map); - bus_dmamem_free(tag, ptr, map); + bus_dmamem_free(pc->tag, pc->buffer, pc->map); -#ifdef USB_DEBUG - if (usbdebug > 14) { - printf("%s: %p\n", - __FUNCTION__, ptr); + pc->buffer = NULL; } -#endif return; } /*------------------------------------------------------------------------* - * usbd_dma_load_setup - allocate BUS-DMA maps + * usbd_pc_load_mem - load virtual memory into DMA *------------------------------------------------------------------------*/ void -usbd_dma_load_setup(struct usbd_setup_params *parm) +usbd_pc_load_mem(struct usbd_page_cache *pc, uint32_t size) { - struct usbd_xfer *xfer; - - if (parm->buf == NULL) { + /* sanity check */ + if (pc->xfer == NULL) { + panic("This page cache is not loadable!\n"); return; } - xfer = parm->curr_xfer; + /* setup page cache */ + pc->page_offset_buf = 0; + pc->page_offset_end = size; + + if (size > 0) { - if (bus_dmamap_create(xfer->udev->bus->dma_tag_1b, 0, - &(xfer->dma_tx_map))) { - xfer->dma_tx_map = NULL; - parm->err = USBD_NOMEM; - return; - } - if (bus_dmamap_create(xfer->udev->bus->dma_tag_1b, 0, - &(xfer->dma_rx_map))) { - xfer->dma_rx_map = NULL; - parm->err = USBD_NOMEM; - return; - } - return; -} + pc->xfer->usb_root->dma_refcount++; -/*------------------------------------------------------------------------* - * usbd_dma_load_unsetup - release BUS-DMA maps - *------------------------------------------------------------------------*/ -void -usbd_dma_load_unsetup(struct usbd_xfer *xfer) -{ - if (xfer->dma_tx_map) { - bus_dmamap_destroy(xfer->udev->bus->dma_tag_1b, - xfer->dma_tx_map); + /* try to load memory into DMA */ + if (bus_dmamap_load( + pc->tag, pc->map, pc->buffer, size, + &usbd_pc_alloc_mem_cb, pc, 0)) { + } } - if (xfer->dma_rx_map) { - bus_dmamap_destroy(xfer->udev->bus->dma_tag_1b, - xfer->dma_rx_map); - } return; } /*------------------------------------------------------------------------* - * usbd_dma_load_pre_sync - flush CPU cache, if any + * usbd_pc_cpu_invalidate - invalidate CPU cache *------------------------------------------------------------------------*/ void -usbd_dma_load_pre_sync(struct usbd_xfer *xfer) +usbd_pc_cpu_invalidate(struct usbd_page_cache *pc) { - bus_dmamap_sync(xfer->udev->bus->dma_tag_1b, xfer->dma_tx_map, - BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); - return; -} - -/*------------------------------------------------------------------------* - * usbd_dma_load_post_sync - invalidate CPU cache, if any - *------------------------------------------------------------------------*/ -void -usbd_dma_load_post_sync(struct usbd_xfer *xfer) -{ - bus_dmamap_sync(xfer->udev->bus->dma_tag_1b, xfer->dma_rx_map, + bus_dmamap_sync(pc->tag, pc->map, BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD); return; } /*------------------------------------------------------------------------* - * usbd_page_cpu_invalidate - invalidate CPU cache + * usbd_pc_cpu_flush - flush CPU cache *------------------------------------------------------------------------*/ void -usbd_page_cpu_invalidate(struct usbd_page *page) +usbd_pc_cpu_flush(struct usbd_page_cache *pc) { - bus_dmamap_sync(page->tag, page->map, - BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD); - return; -} - -/*------------------------------------------------------------------------* - * usbd_page_cpu_flush - flush CPU cache - *------------------------------------------------------------------------*/ -void -usbd_page_cpu_flush(struct usbd_page *page) -{ - bus_dmamap_sync(page->tag, page->map, + bus_dmamap_sync(pc->tag, pc->map, BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); return; } /*------------------------------------------------------------------------* - * usbd_dma_load_mem_callback - internal callback + * usbd_pc_dmamap_create + * + * Returns: + * 0: Success + * Else: Failure *------------------------------------------------------------------------*/ -static void -usbd_dma_load_mem_callback(void *arg, bus_dma_segment_t *segs, - int nseg, int error) +uint8_t +usbd_pc_dmamap_create(struct usbd_page_cache *pc, uint32_t size) { - struct usbd_page_cache *pc; - struct usbd_xfer *xfer; - struct usbd_page *pg; - uint32_t rem; + struct usbd_memory_info *info; + bus_dma_tag_t tag; - pc = arg; - xfer = pc->p_xfer; + /* sanity check */ + if (pc->xfer == NULL) { + goto error; + } + info = pc->xfer->usb_root; + tag = pc->xfer->udev->bus->dma_tag_parent; - /* XXX sometimes recursive locking here */ - - mtx_lock(xfer->priv_mtx); - - if (error) { - printf("%s: %s: error=%d\n", - __FILE__, __FUNCTION__, error); - - xfer->flags_int.bdma_error = 1; - } else { - __KASSERT(nseg > 0, ("Invalid number of segments!\n")); - - pg = pc->page_start; - rem = segs->ds_addr & (USB_PAGE_SIZE - 1); - - pc->page_offset_buf += rem; - pc->page_offset_end += rem; - - pg->physaddr = segs->ds_addr & ~(USB_PAGE_SIZE - 1); - - while (1) { - - if (--nseg == 0) { - break; - } - pg++; - segs++; - pg->physaddr = segs->ds_addr & ~(USB_PAGE_SIZE - 1); - } + tag = usbd_dma_tag_setup(tag, info->dma_tag_p, + size, 1, info->dma_tag_max); + if (tag == NULL) { + goto error; + } + if (bus_dmamap_create(tag, 0, &(pc->map))) { + goto error; } + pc->tag = tag; + return 0; /* success */ - usbd_bdma_done_event(xfer); - - mtx_unlock(xfer->priv_mtx); - return; +error: + pc->map = NULL; + pc->tag = NULL; + return 1; /* failure */ } /*------------------------------------------------------------------------* - * usbd_dma_load_mem - load DMA memory if any + * usbd_pc_dmamap_destroy + * + * This function is NULL safe. *------------------------------------------------------------------------*/ void -usbd_dma_load_mem(struct usbd_xfer *xfer, struct usbd_dma_load_mem_info *info) +usbd_pc_dmamap_destroy(struct usbd_page_cache *pc) { - struct usbd_page_cache *pc; - struct usbd_page *pg; - bus_dma_tag_t dma_tag; - bus_dmamap_t dma_map; - uint32_t npg; - int error; - - pc = info->page_cache; - - if (info->frame_length == 0) { - /* not used */ - pc->page_start = NULL; - pc->page_offset_buf = 0; - pc->page_offset_end = 0; - return; - } - /* select the one byte alignment DMA tag */ - - dma_tag = xfer->udev->bus->dma_tag_1b; - if (pc->isread) { - dma_map = xfer->dma_rx_map; - } else { - dma_map = xfer->dma_tx_map; + if (pc && pc->tag) { + bus_dmamap_destroy(pc->tag, pc->map); + pc->tag = NULL; + pc->map = NULL; } - - /* increment refcount */ - - xfer->dma_refcount++; - - /* initialize the "usbd_page_cache" structure */ - - pc->page_start = info->page_ptr; - pc->page_offset_buf = 0; - pc->page_offset_end = info->frame_length; - - /* initialize the "usbd_page" structure */ - - npg = (info->frame_length / USB_PAGE_SIZE) + 2; - pg = info->page_ptr; - - while (npg--) { - pg->tag = dma_tag; - pg->map = dma_map; - pg->length = USB_PAGE_SIZE; - pg++; - } - - /* update "page_ptr" to the next pointer value */ - - info->page_ptr = pg; - - error = bus_dmamap_load(dma_tag, dma_map, pc->p_buffer, - info->frame_length, usbd_dma_load_mem_callback, pc, 0); - return; } @@ -2496,9 +2286,7 @@ page->length = size; usbd_page_cpu_invalidate(page); - bzero(ptr, size); - usbd_page_cpu_flush(page); #ifdef USB_DEBUG @@ -2547,23 +2335,31 @@ } /*------------------------------------------------------------------------* - * usbd_page_cpu_invalidate - invalidate CPU cache + * usbd_pc_cpu_invalidate - invalidate CPU cache *------------------------------------------------------------------------*/ void -usbd_page_cpu_invalidate(struct usbd_page *page) +usbd_pc_cpu_invalidate(struct usbd_page_cache *pc) { - bus_dmamap_sync(page->tag, page->map, 0, page->length, + uint32_t len; + + len = pc->page_offset_end - pc->page_offset_buf; + + bus_dmamap_sync(pc->tag, pc->map, 0, len, BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD); return; } /*------------------------------------------------------------------------* - * usbd_page_cpu_flush - flush CPU cache + * usbd_pc_cpu_flush - flush CPU cache *------------------------------------------------------------------------*/ void -usbd_page_cpu_flush(struct usbd_page *page) +usbd_pc_cpu_flush(struct usbd_page_cache *pc) { - bus_dmamap_sync(page->tag, page->map, 0, page->length, + uint32_t len; + + len = pc->page_offset_end - pc->page_offset_buf; + + bus_dmamap_sync(page->tag, page->map, 0, len, BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); return; } @@ -2571,59 +2367,6 @@ #endif /*------------------------------------------------------------------------* - * usbd_pio_load_mem - load virtual memory if any - *------------------------------------------------------------------------*/ -void -usbd_pio_load_mem(struct usbd_xfer *xfer, struct usbd_dma_load_mem_info *info) -{ - struct usbd_page_cache *pc; - struct usbd_page *pg; - uint32_t npg; - uint32_t rem; - uint8_t *ptr; - - pc = info->page_cache; - pg = info->page_ptr; - - if (info->frame_length == 0) { - /* not used */ - pc->page_start = NULL; - pc->page_offset_buf = 0; - pc->page_offset_end = 0; - return; - } - ptr = pc->p_buffer; - rem = POINTER_TO_UNSIGNED(ptr) & (USB_PAGE_SIZE - 1); - ptr -= rem; /* page align */ - info->frame_length += rem; /* adjust */ - - pc->page_start = pg; - pc->page_offset_buf = rem; - pc->page_offset_end = info->frame_length; - - npg = (info->frame_length + (USB_PAGE_SIZE - 1)) / USB_PAGE_SIZE; - - while (npg--) { - - /* - * NOTE: We only setup the fields - * we need for PIO in "struct usbd_page" - */ - pg->buffer = ptr; - pg->length = USB_PAGE_SIZE; - - ptr += USB_PAGE_SIZE; - pg++; - } - - /* update page pointer */ - - info->page_ptr = pg; - - return; -} - -/*------------------------------------------------------------------------* * usbd_make_str_desc - convert an ASCII string into a UNICODE string *------------------------------------------------------------------------*/ uint8_t @@ -3121,64 +2864,172 @@ } /*------------------------------------------------------------------------* - * usbd_bus_mem_setup - factored out code - * - * Return: - * 0: Success - * Else: Failure + * usbd_bus_tag_setup - factored out code *------------------------------------------------------------------------*/ -uint8_t -usbd_bus_mem_setup(struct usbd_bus *bus, bus_dma_tag_t parent_tag, - uint32_t hw_mem_size, uint8_t hw_addr_lines, uint8_t hw_align_power) +bus_dma_tag_t +usbd_dma_tag_setup(bus_dma_tag_t tag_parent, struct usbd_dma_tag *udt, + uint32_t size, uint32_t align, uint8_t nudt) { + __KASSERT(align > 0, ("Invalid parameter align = 0!\n")); + __KASSERT(size > 0, ("Invalid parameter size = 0!\n")); + + while (nudt--) { - if (hw_mem_size > 0) { + if (udt->align == 0) { + udt->tag = + usbd_dma_tag_create(tag_parent, size, align); + if (udt->tag == NULL) { + return (NULL); + } + udt->align = align; + udt->size = size; + return (udt->tag); + } + if ((udt->align == align) && (udt->size == size)) { + return (udt->tag); + } + udt++; + } + return (NULL); +} - bus->hw_ptr.data = - usbd_mem_alloc(parent_tag, &(bus->hw_page), - hw_mem_size, hw_align_power); +/*------------------------------------------------------------------------* + * usbd_bus_tag_unsetup - factored out code + *------------------------------------------------------------------------*/ +void +usbd_dma_tag_unsetup(struct usbd_dma_tag *udt, uint8_t nudt) +{ + while (nudt--) { - if (bus->hw_ptr.data == NULL) { - goto error; + if (udt->align) { + usbd_dma_tag_destroy(udt->tag); + udt->align = 0; } + udt++; } - bus->dma_tag_1b = - usbd_dma_tag_alloc(parent_tag, USB_PAGE_SIZE, 1, 0 - 1, 0); + return; +} + +/*------------------------------------------------------------------------* + * usbd_bus_mem_flush_all_cb + *------------------------------------------------------------------------*/ +static void +usbd_bus_mem_flush_all_cb(struct usbd_bus *bus, struct usbd_page_cache *pc, + struct usbd_page *pg, uint32_t size, uint32_t align) +{ + usbd_pc_cpu_flush(pc); + return; +} + +/*------------------------------------------------------------------------* + * usbd_bus_mem_flush_all - factored out code + *------------------------------------------------------------------------*/ +void +usbd_bus_mem_flush_all(struct usbd_bus *bus, usbd_bus_mem_cb_t *cb) +{ + cb(bus, &usbd_bus_mem_flush_all_cb); + return; +} - if (bus->dma_tag_1b == NULL) { - goto error; +/*------------------------------------------------------------------------* + * usbd_bus_mem_alloc_all_cb + *------------------------------------------------------------------------*/ +static void +usbd_bus_mem_alloc_all_cb(struct usbd_bus *bus, struct usbd_page_cache *pc, + struct usbd_page *pg, uint32_t size, uint32_t align) +{ + if (usbd_pc_alloc_mem(bus->dma_tag_parent, + bus->dma_tags, pc, pg, size, align, + USB_BUS_DMA_TAG_MAX)) { + bus->alloc_failed = 1; } - bus->dma_tag_ps = - usbd_dma_tag_alloc(parent_tag, USB_PAGE_SIZE, - USB_PAGE_SIZE, USB_PAGE_SIZE, 1); + return; +} + +/*------------------------------------------------------------------------* + * usbd_bus_mem_alloc_all - factored out code + * + * Returns: + * 0: Success + * Else: Failure + *------------------------------------------------------------------------*/ +uint8_t +usbd_bus_mem_alloc_all(struct usbd_bus *bus, usbd_bus_mem_cb_t *cb) +{ + bus->alloc_failed = 0; + + cb(bus, &usbd_bus_mem_alloc_all_cb); - if (bus->dma_tag_ps == NULL) { - goto error; + if (bus->alloc_failed) { + usbd_bus_mem_free_all(bus, cb); } - return (0); + return (bus->alloc_failed); +} -error: - usbd_bus_mem_unsetup(bus); - return (1); +/*------------------------------------------------------------------------* + * usbd_bus_mem_free_all_cb + *------------------------------------------------------------------------*/ +static void +usbd_bus_mem_free_all_cb(struct usbd_bus *bus, struct usbd_page_cache *pc, + struct usbd_page *pg, uint32_t size, uint32_t align) +{ + usbd_pc_free_mem(pc); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 2 00:19:55 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F69816A418; Sun, 2 Dec 2007 00:19:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A867D16A469 for ; Sun, 2 Dec 2007 00:19:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 90B9413C45D for ; Sun, 2 Dec 2007 00:19:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB20JsiL004584 for ; Sun, 2 Dec 2007 00:19:54 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB20Jsd5004581 for perforce@freebsd.org; Sun, 2 Dec 2007 00:19:54 GMT (envelope-from jb@freebsd.org) Date: Sun, 2 Dec 2007 00:19:54 GMT Message-Id: <200712020019.lB20Jsd5004581@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129927 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 00:19:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=129927 Change 129927 by jb@jb_freebsd1 on 2007/12/02 00:19:20 IFC to loopback the elf change. Affected files ... .. //depot/projects/dtrace/src/share/man/man9/Makefile#24 integrate .. //depot/projects/dtrace/src/share/man/man9/stack.9#4 integrate .. //depot/projects/dtrace/src/sys/sys/elf_common.h#10 integrate Differences ... ==== //depot/projects/dtrace/src/share/man/man9/Makefile#24 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.319 2007/11/29 17:16:55 rwatson Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.320 2007/12/01 22:04:15 rwatson Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -1074,6 +1074,7 @@ stack.9 stack_put.9 \ stack.9 stack_save.9 \ stack.9 stack_sbuf_print.9 \ + stack.9 stack_sbuf_print_ddb.9 \ stack.9 stack_zero.9 MLINKS+=store.9 subyte.9 \ store.9 suswintr.9 \ ==== //depot/projects/dtrace/src/share/man/man9/stack.9#4 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/stack.9,v 1.3 2007/11/29 17:16:55 rwatson Exp $ +.\" $FreeBSD: src/share/man/man9/stack.9,v 1.4 2007/12/01 22:04:15 rwatson Exp $ .\" .Dd February 27, 2007 .Dt STACK 9 @@ -54,6 +54,8 @@ .Ft void .Fn stack_sbuf_print "struct sbuf sb*" "struct stack *st" .Ft void +.Fn stack_sbuf_print_ddb "struct sbuf sb*" "struct stack *st" +.Ft void .Fn stack_save "struct stack *st" .Sh DESCRIPTION The @@ -96,7 +98,17 @@ .Xr sbuf 9 . This function may sleep if an auto-extending .Dv struct sbuf -is used. +is used, and because the kernel linker (used to look up symbol names) uses +.Xr sx 9 +locks. +.Pp +In locking-sensitive environments, such as +.Xr DDB 4 , +the unsynchronized +.Fn stack_sbuf_print_ddb +variant may be invoked; this makes use of kernel linker data structures to +look up symbol names without following locking protocols, so is appropriate +for use in the debugger but not while the system is live. .Pp The utility functions .Nm stack_zero , @@ -107,7 +119,8 @@ .Sh SEE ALSO .Xr DDB 4 , .Xr printf 9 , -.Xr sbuf 9 +.Xr sbuf 9 , +.Xr sx 9 .Sh AUTHORS .An -nosplit The ==== //depot/projects/dtrace/src/sys/sys/elf_common.h#10 (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/sys/elf_common.h,v 1.22 2007/04/03 01:47:07 kan Exp $ + * $FreeBSD: src/sys/sys/elf_common.h,v 1.23 2007/12/02 00:05:18 jb Exp $ */ #ifndef _SYS_ELF_COMMON_H_ @@ -431,6 +431,9 @@ #define STV_INTERNAL 0x1 /* Special meaning in relocatable objects. */ #define STV_HIDDEN 0x2 /* Not visible. */ #define STV_PROTECTED 0x3 /* Visible but not preemptible. */ +#define STV_EXPORTED 0x4 +#define STV_SINGLETON 0x5 +#define STV_ELIMINATE 0x6 /* Special symbol table indexes. */ #define STN_UNDEF 0 /* Undefined symbol index. */ From owner-p4-projects@FreeBSD.ORG Sun Dec 2 00:20:56 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5999316A420; Sun, 2 Dec 2007 00:20:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 190F116A417 for ; Sun, 2 Dec 2007 00:20:56 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 005B613C442 for ; Sun, 2 Dec 2007 00:20:56 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB20KtgU004900 for ; Sun, 2 Dec 2007 00:20:55 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB20KtjM004897 for perforce@freebsd.org; Sun, 2 Dec 2007 00:20:55 GMT (envelope-from peter@freebsd.org) Date: Sun, 2 Dec 2007 00:20:55 GMT Message-Id: <200712020020.lB20KtjM004897@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 129928 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 00:20:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=129928 Change 129928 by peter@peter_daintree on 2007/12/02 00:20:54 Give cpu_set_upcall_kse a more appropriate name. It is used to set the initial function call in a new thread, so call it that. Affected files ... .. //depot/projects/bike_sched/sys/amd64/amd64/vm_machdep.c#6 edit .. //depot/projects/bike_sched/sys/arm/arm/vm_machdep.c#5 edit .. //depot/projects/bike_sched/sys/i386/i386/vm_machdep.c#5 edit .. //depot/projects/bike_sched/sys/ia64/ia64/vm_machdep.c#3 edit .. //depot/projects/bike_sched/sys/kern/kern_fork.c#6 edit .. //depot/projects/bike_sched/sys/kern/kern_switch.c#6 edit .. //depot/projects/bike_sched/sys/kern/kern_synch.c#6 edit .. //depot/projects/bike_sched/sys/kern/kern_thr.c#6 edit .. //depot/projects/bike_sched/sys/kern/kern_thread.c#9 edit .. //depot/projects/bike_sched/sys/kern/subr_witness.c#3 edit .. //depot/projects/bike_sched/sys/powerpc/powerpc/vm_machdep.c#3 edit .. //depot/projects/bike_sched/sys/sparc64/sparc64/vm_machdep.c#3 edit .. //depot/projects/bike_sched/sys/sun4v/sun4v/vm_machdep.c#2 edit .. //depot/projects/bike_sched/sys/sys/proc.h#5 edit Differences ... ==== //depot/projects/bike_sched/sys/amd64/amd64/vm_machdep.c#6 (text+ko) ==== @@ -317,7 +317,7 @@ * for the new thread to make a specific call as its first act. */ void -cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg, +cpu_set_upcall_func(struct thread *td, void (*entry)(void *), void *arg, stack_t *stack) { ==== //depot/projects/bike_sched/sys/arm/arm/vm_machdep.c#5 (text+ko) ==== @@ -299,7 +299,7 @@ * for the new thread to make a specific call as its first act. */ void -cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg, +cpu_set_upcall_func(struct thread *td, void (*entry)(void *), void *arg, stack_t *stack) { struct trapframe *tf = td->td_frame; ==== //depot/projects/bike_sched/sys/i386/i386/vm_machdep.c#5 (text+ko) ==== @@ -452,7 +452,7 @@ * for the new thread to make a specific call as its first act. */ void -cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg, +cpu_set_upcall_func(struct thread *td, void (*entry)(void *), void *arg, stack_t *stack) { ==== //depot/projects/bike_sched/sys/ia64/ia64/vm_machdep.c#3 (text+ko) ==== @@ -172,7 +172,7 @@ } void -cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg, +cpu_set_upcall_func(struct thread *td, void (*entry)(void *), void *arg, stack_t *stack) { struct ia64_fdesc *fd; ==== //depot/projects/bike_sched/sys/kern/kern_fork.c#6 (text+ko) ==== @@ -763,7 +763,7 @@ p = td->td_proc; KASSERT(p->p_state == PRS_NORMAL, ("executing process is still new")); - CTR4(KTR_PROC, "fork_exit: new thread %p (kse %p, pid %d, %s)", + CTR4(KTR_PROC, "fork_exit: new thread %p (td %p, pid %d, %s)", td, td->td_sched, p->p_pid, td->td_name); sched_fork_exit(td); ==== //depot/projects/bike_sched/sys/kern/kern_switch.c#6 (text+ko) ==== @@ -526,7 +526,7 @@ ts = TAILQ_FIRST(rqh); KASSERT(ts != NULL, ("runq_choose: no proc on busy queue")); CTR4(KTR_RUNQ, - "runq_choose_from: pri=%d kse=%p idx=%d rqh=%p", + "runq_choose_from: pri=%d ts=%p idx=%d rqh=%p", pri, ts, ts->ts_rqindex, rqh); return (ts); } ==== //depot/projects/bike_sched/sys/kern/kern_synch.c#6 (text+ko) ==== @@ -414,7 +414,7 @@ td->td_generation++; /* bump preempt-detect counter */ PCPU_INC(cnt.v_swtch); PCPU_SET(switchticks, ticks); - CTR4(KTR_PROC, "mi_switch: old thread %ld (kse %p, pid %ld, %s)", + CTR4(KTR_PROC, "mi_switch: old thread %ld (ts %p, pid %ld, %s)", td->td_tid, td->td_sched, p->p_pid, td->td_name); #if (KTR_COMPILE & KTR_SCHED) != 0 if (TD_IS_IDLETHREAD(td)) @@ -431,15 +431,11 @@ td, td->td_name, td->td_priority, td->td_inhibitors, td->td_wmesg, td->td_lockname); #endif - /* - * We call thread_switchout after the KTR_SCHED prints above so kse - * selecting a new thread to run does not show up as a preemption. - */ sched_switch(td, newtd, flags); CTR3(KTR_SCHED, "mi_switch: running %p(%s) prio %d", td, td->td_name, td->td_priority); - CTR4(KTR_PROC, "mi_switch: new thread %ld (kse %p, pid %ld, %s)", + CTR4(KTR_PROC, "mi_switch: new thread %ld (ts %p, pid %ld, %s)", td->td_tid, td->td_sched, p->p_pid, td->td_name); /* ==== //depot/projects/bike_sched/sys/kern/kern_thr.c#6 (text+ko) ==== @@ -214,7 +214,7 @@ stack.ss_sp = stack_base; stack.ss_size = stack_size; /* Set upcall address to user thread entry function. */ - cpu_set_upcall_kse(newtd, start_func, arg, &stack); + cpu_set_upcall_func(newtd, start_func, arg, &stack); /* Setup user TLS address and TLS pointer register. */ error = cpu_set_user_tls(newtd, tls_base); if (error != 0) { ==== //depot/projects/bike_sched/sys/kern/kern_thread.c#9 (text+ko) ==== @@ -259,7 +259,7 @@ #ifdef ZOMBIES /* - * Reap zombie kse resource. + * Reap zombie threads. */ void thread_reap(void) ==== //depot/projects/bike_sched/sys/kern/subr_witness.c#3 (text+ko) ==== @@ -447,7 +447,6 @@ #endif { "clk", &lock_class_mtx_spin }, { "mprof lock", &lock_class_mtx_spin }, - { "kse lock", &lock_class_mtx_spin }, { "zombie lock", &lock_class_mtx_spin }, { "ALD Queue", &lock_class_mtx_spin }, #ifdef __ia64__ ==== //depot/projects/bike_sched/sys/powerpc/powerpc/vm_machdep.c#3 (text+ko) ==== @@ -338,7 +338,7 @@ } void -cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg, +cpu_set_upcall_func(struct thread *td, void (*entry)(void *), void *arg, stack_t *stack) { struct trapframe *tf; ==== //depot/projects/bike_sched/sys/sparc64/sparc64/vm_machdep.c#3 (text+ko) ==== @@ -182,7 +182,7 @@ } void -cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg, +cpu_set_upcall_func(struct thread *td, void (*entry)(void *), void *arg, stack_t *stack) { struct trapframe *tf; ==== //depot/projects/bike_sched/sys/sun4v/sun4v/vm_machdep.c#2 (text+ko) ==== @@ -166,7 +166,7 @@ } void -cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg, +cpu_set_upcall_func(struct thread *td, void (*entry)(void *), void *arg, stack_t *stack) { struct trapframe *tf; ==== //depot/projects/bike_sched/sys/sys/proc.h#5 (text+ko) ==== @@ -502,11 +502,6 @@ int p_boundary_count;/* (c) Num threads at user boundary */ int p_pendingcnt; /* how many signals are pending */ struct itimers *p_itimers; /* (c) POSIX interval timers. */ - int p_numupcalls; /* (j) Num upcalls. */ - int p_upsleeps; /* (c) Num threads in kse_release(). */ - struct kse_thr_mailbox *p_completed; /* (c) Completed thread mboxes. */ - int p_nextupcall; /* (n) Next upcall time. */ - int p_upquantum; /* (n) Quantum to schedule an upcall. */ /* End area that is zeroed on creation. */ #define p_endzero p_magic @@ -821,7 +816,7 @@ /* New in KSE. */ void cpu_set_upcall(struct thread *td, struct thread *td0); -void cpu_set_upcall_kse(struct thread *, void (*)(void *), void *, stack_t *); +void cpu_set_upcall_func(struct thread *, void (*)(void *), void *, stack_t *); int cpu_set_user_tls(struct thread *, void *tls_base); void cpu_thread_alloc(struct thread *); void cpu_thread_clean(struct thread *); From owner-p4-projects@FreeBSD.ORG Sun Dec 2 00:23:00 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3963216A419; Sun, 2 Dec 2007 00:23:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C458C16A417 for ; Sun, 2 Dec 2007 00:22:59 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AD41513C442 for ; Sun, 2 Dec 2007 00:22:59 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB20MxN6005569 for ; Sun, 2 Dec 2007 00:22:59 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB20MxJb005545 for perforce@freebsd.org; Sun, 2 Dec 2007 00:22:59 GMT (envelope-from peter@freebsd.org) Date: Sun, 2 Dec 2007 00:22:59 GMT Message-Id: <200712020022.lB20MxJb005545@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 129929 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 00:23:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=129929 Change 129929 by peter@peter_daintree on 2007/12/02 00:22:07 IFC @129924 Affected files ... .. //depot/projects/bike_sched/sys/sys/elf_common.h#3 integrate Differences ... ==== //depot/projects/bike_sched/sys/sys/elf_common.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/elf_common.h,v 1.22 2007/04/03 01:47:07 kan Exp $ + * $FreeBSD: src/sys/sys/elf_common.h,v 1.23 2007/12/02 00:05:18 jb Exp $ */ #ifndef _SYS_ELF_COMMON_H_ @@ -431,6 +431,9 @@ #define STV_INTERNAL 0x1 /* Special meaning in relocatable objects. */ #define STV_HIDDEN 0x2 /* Not visible. */ #define STV_PROTECTED 0x3 /* Visible but not preemptible. */ +#define STV_EXPORTED 0x4 +#define STV_SINGLETON 0x5 +#define STV_ELIMINATE 0x6 /* Special symbol table indexes. */ #define STN_UNDEF 0 /* Undefined symbol index. */ From owner-p4-projects@FreeBSD.ORG Sun Dec 2 00:24:01 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E9DF16A41B; Sun, 2 Dec 2007 00:24: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 027CC16A468 for ; Sun, 2 Dec 2007 00:24:01 +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 DF7AF13C458 for ; Sun, 2 Dec 2007 00:24:00 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB20O0KI005915 for ; Sun, 2 Dec 2007 00:24:00 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB20O01Z005912 for perforce@freebsd.org; Sun, 2 Dec 2007 00:24:00 GMT (envelope-from gonzo@FreeBSD.org) Date: Sun, 2 Dec 2007 00:24:00 GMT Message-Id: <200712020024.lB20O01Z005912@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 129930 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 00:24:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=129930 Change 129930 by gonzo@gonzo_jeeves on 2007/12/02 00:23:20 o Use C-style comments since we use CPP to preprocess Symbol.map Affected files ... .. //depot/projects/mips2/src/lib/libc/mips/Symbol.map#3 edit Differences ... ==== //depot/projects/mips2/src/lib/libc/mips/Symbol.map#3 (text+ko) ==== @@ -1,12 +1,14 @@ -# $FreeBSD: src/lib/libc/arm/Symbol.map,v 1.1 2006/03/13 00:53:16 deischen Exp $ +/* + * $FreeBSD: src/lib/libc/arm/Symbol.map,v 1.1 2006/03/13 00:53:16 deischen Exp $ + */ -# -# This only needs to contain symbols that are not listed in -# symbol maps from other parts of libc (i.e., not found in -# stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...). -# +/* + * This only needs to contain symbols that are not listed in + * symbol maps from other parts of libc (i.e., not found in + * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...). + */ FBSD_1.0 { - # PSEUDO syscalls + /* PSEUDO syscalls */ _exit; _setjmp; @@ -31,13 +33,13 @@ __ntohs; vfork; brk; - cerror; # XXX - Should this be .cerror (see sys/cerror.S)? + cerror; /* XXX - Should this be .cerror (see sys/cerror.S)? */ fork; sbrk; }; -FBSDprivate { - # PSEUDO syscalls +FBSDprivate_1.0 { + /* PSEUDO syscalls */ __sys_getlogin; _getlogin; __sys_exit; @@ -56,7 +58,7 @@ __sys_vfork; _vfork; _brk; - end; # XXX - Should this be _end (see sys/brk.S)? + end; /* XXX - Should this be _end (see sys/brk.S)? */ curbrk; minbrk; _brk; From owner-p4-projects@FreeBSD.ORG Sun Dec 2 00:28:06 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C487416A419; Sun, 2 Dec 2007 00:28:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7F51016A417 for ; Sun, 2 Dec 2007 00:28:05 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6840013C448 for ; Sun, 2 Dec 2007 00:28:05 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB20S5oF006125 for ; Sun, 2 Dec 2007 00:28:05 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB20S5ub006122 for perforce@freebsd.org; Sun, 2 Dec 2007 00:28:05 GMT (envelope-from peter@freebsd.org) Date: Sun, 2 Dec 2007 00:28:05 GMT Message-Id: <200712020028.lB20S5ub006122@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 129932 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 00:28:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=129932 Change 129932 by peter@peter_daintree on 2007/12/02 00:27:55 The rumour of proc_linkup0()'s demise have been greatly exaggerated. Affected files ... .. //depot/projects/bike_sched/sys/amd64/amd64/machdep.c#5 edit .. //depot/projects/bike_sched/sys/i386/i386/machdep.c#5 edit .. //depot/projects/bike_sched/sys/ia64/ia64/machdep.c#5 edit .. //depot/projects/bike_sched/sys/pc98/pc98/machdep.c#6 edit .. //depot/projects/bike_sched/sys/powerpc/powerpc/machdep.c#4 edit .. //depot/projects/bike_sched/sys/sparc64/sparc64/machdep.c#4 edit Differences ... ==== //depot/projects/bike_sched/sys/amd64/amd64/machdep.c#5 (text+ko) ==== @@ -1136,7 +1136,7 @@ * This may be done better later if it gets more high level * components in it. If so just link td->td_proc here. */ - proc_linkup(&proc0, &thread0); + proc_linkup0(&proc0, &thread0); preload_metadata = (caddr_t)(uintptr_t)(modulep + KERNBASE); preload_bootstrap_relocate(KERNBASE); ==== //depot/projects/bike_sched/sys/i386/i386/machdep.c#5 (text+ko) ==== @@ -2085,7 +2085,7 @@ * This may be done better later if it gets more high level * components in it. If so just link td->td_proc here. */ - proc_linkup(&proc0, &thread0); + proc_linkup0(&proc0, &thread0); metadata_missing = 0; if (bootinfo.bi_modulep) { ==== //depot/projects/bike_sched/sys/ia64/ia64/machdep.c#5 (text+ko) ==== @@ -789,7 +789,7 @@ msgbufp = (struct msgbuf *)pmap_steal_memory(MSGBUF_SIZE); msgbufinit(msgbufp, MSGBUF_SIZE); - proc_linkup(&proc0, &thread0); + proc_linkup0(&proc0, &thread0); /* * Init mapping for kernel stack for proc 0 */ ==== //depot/projects/bike_sched/sys/pc98/pc98/machdep.c#6 (text+ko) ==== @@ -1914,7 +1914,7 @@ * This may be done better later if it gets more high level * components in it. If so just link td->td_proc here. */ - proc_linkup(&proc0, &thread0); + proc_linkup0(&proc0, &thread0); /* * Initialize DMAC ==== //depot/projects/bike_sched/sys/powerpc/powerpc/machdep.c#4 (text+ko) ==== @@ -292,7 +292,7 @@ /* * Start initializing proc0 and thread0. */ - proc_linkup(&proc0, &thread0); + proc_linkup0(&proc0, &thread0); thread0.td_frame = &frame0; /* ==== //depot/projects/bike_sched/sys/sparc64/sparc64/machdep.c#4 (text+ko) ==== @@ -399,7 +399,7 @@ /* * Initialize proc0 stuff (p_contested needs to be done early). */ - proc_linkup(&proc0, &thread0); + proc_linkup0(&proc0, &thread0); proc0.p_md.md_sigtramp = NULL; proc0.p_md.md_utrap = NULL; thread0.td_kstack = kstack0; From owner-p4-projects@FreeBSD.ORG Sun Dec 2 00:36:14 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75CDA16A46B; Sun, 2 Dec 2007 00:36: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 2677216A418 for ; Sun, 2 Dec 2007 00:36:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0F8C413C448 for ; Sun, 2 Dec 2007 00:36:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB20aDDu007512 for ; Sun, 2 Dec 2007 00:36:13 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB20aD6l007509 for perforce@freebsd.org; Sun, 2 Dec 2007 00:36:13 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 00:36:13 GMT Message-Id: <200712020036.lB20aD6l007509@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 129933 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 00:36:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=129933 Change 129933 by hselasky@hselasky_laptop001 on 2007/12/02 00:35:43 "xfer->flags_int.bdma_enable" must be set before calling "usbd_transfer_setup_sub" . Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci.c#54 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.c#44 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.c#47 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#54 (text+ko) ==== @@ -3697,6 +3697,7 @@ parm->hc_max_packet_size = 0x400; parm->hc_max_packet_count = 1; parm->hc_max_frame_size = EHCI_QTD_PAYLOAD_MAX; + xfer->flags_int.bdma_enable = 1; usbd_transfer_setup_sub(parm); @@ -3704,13 +3705,12 @@ nqtd = ((2 * xfer->nframes) + 1 /* STATUS */ + (xfer->max_data_length / xfer->max_usb_frame_size)); - xfer->flags_int.bdma_enable = 1; - } else if (parm->methods == &ehci_device_bulk_methods) { parm->hc_max_packet_size = 0x400; parm->hc_max_packet_count = 1; parm->hc_max_frame_size = EHCI_QTD_PAYLOAD_MAX; + xfer->flags_int.bdma_enable = 1; usbd_transfer_setup_sub(parm); @@ -3718,8 +3718,6 @@ nqtd = ((2 * xfer->nframes) + (xfer->max_data_length / xfer->max_usb_frame_size)); - xfer->flags_int.bdma_enable = 1; - } else if (parm->methods == &ehci_device_intr_methods) { if (parm->speed == USB_SPEED_HIGH) { @@ -3734,6 +3732,7 @@ } parm->hc_max_frame_size = EHCI_QTD_PAYLOAD_MAX; + xfer->flags_int.bdma_enable = 1; usbd_transfer_setup_sub(parm); @@ -3741,32 +3740,28 @@ nqtd = ((2 * xfer->nframes) + (xfer->max_data_length / xfer->max_usb_frame_size)); - xfer->flags_int.bdma_enable = 1; - } else if (parm->methods == &ehci_device_isoc_fs_methods) { parm->hc_max_packet_size = 0x3FF; parm->hc_max_packet_count = 1; parm->hc_max_frame_size = 0x3FF; + xfer->flags_int.bdma_enable = 1; usbd_transfer_setup_sub(parm); nsitd = xfer->nframes; - xfer->flags_int.bdma_enable = 1; - } else if (parm->methods == &ehci_device_isoc_hs_methods) { parm->hc_max_packet_size = 0x400; parm->hc_max_packet_count = 3; parm->hc_max_frame_size = 0xC00; + xfer->flags_int.bdma_enable = 1; usbd_transfer_setup_sub(parm); nitd = (xfer->nframes + 7) / 8; - xfer->flags_int.bdma_enable = 1; - } else { parm->hc_max_packet_size = 0x400; ==== //depot/projects/usb/src/sys/dev/usb/ohci.c#44 (text+ko) ==== @@ -2696,45 +2696,54 @@ parm->hc_max_packet_count = 1; parm->hc_max_frame_size = OHCI_PAGE_SIZE; - usbd_transfer_setup_sub(parm); - /* * calculate ntd and nqh */ if (parm->methods == &ohci_device_ctrl_methods) { + xfer->flags_int.bdma_enable = 1; + + usbd_transfer_setup_sub(parm); + nitd = 0; ntd = ((2 * xfer->nframes) + 1 /* STATUS */ + (xfer->max_data_length / xfer->max_usb_frame_size)); nqh = 1; + } else if (parm->methods == &ohci_device_bulk_methods) { xfer->flags_int.bdma_enable = 1; - } else if (parm->methods == &ohci_device_bulk_methods) { + usbd_transfer_setup_sub(parm); + nitd = 0; ntd = ((2 * xfer->nframes) + (xfer->max_data_length / xfer->max_usb_frame_size)); nqh = 1; + } else if (parm->methods == &ohci_device_intr_methods) { xfer->flags_int.bdma_enable = 1; - } else if (parm->methods == &ohci_device_intr_methods) { + usbd_transfer_setup_sub(parm); + nitd = 0; ntd = ((2 * xfer->nframes) + (xfer->max_data_length / xfer->max_usb_frame_size)); nqh = 1; + } else if (parm->methods == &ohci_device_isoc_methods) { xfer->flags_int.bdma_enable = 1; - } else if (parm->methods == &ohci_device_isoc_methods) { + usbd_transfer_setup_sub(parm); + nitd = ((xfer->max_data_length / OHCI_PAGE_SIZE) + ((xfer->nframes + OHCI_ITD_NOFFSET - 1) / OHCI_ITD_NOFFSET) + 1 /* EXTRA */ ); ntd = 0; nqh = 1; - xfer->flags_int.bdma_enable = 1; + } else { + + usbd_transfer_setup_sub(parm); - } else { nitd = 0; ntd = 0; nqh = 0; ==== //depot/projects/usb/src/sys/dev/usb/uhci.c#47 (text+ko) ==== @@ -3155,12 +3155,14 @@ parm->hc_max_packet_count = 1; parm->hc_max_frame_size = 0x500; - usbd_transfer_setup_sub(parm); - /* * compute ntd and nqh */ if (parm->methods == &uhci_device_ctrl_methods) { + xfer->flags_int.bdma_enable = 1; + xfer->flags_int.bdma_no_post_sync = 1; + + usbd_transfer_setup_sub(parm); /* see EHCI HC driver for proof of "ntd" formula */ @@ -3168,36 +3170,38 @@ ntd = ((2 * xfer->nframes) + 1 /* STATUS */ + (xfer->max_data_length / xfer->max_frame_size)); + } else if (parm->methods == &uhci_device_bulk_methods) { xfer->flags_int.bdma_enable = 1; xfer->flags_int.bdma_no_post_sync = 1; - } else if (parm->methods == &uhci_device_bulk_methods) { + usbd_transfer_setup_sub(parm); nqh = 1; ntd = ((2 * xfer->nframes) + (xfer->max_data_length / xfer->max_frame_size)); + } else if (parm->methods == &uhci_device_intr_methods) { xfer->flags_int.bdma_enable = 1; xfer->flags_int.bdma_no_post_sync = 1; - } else if (parm->methods == &uhci_device_intr_methods) { + usbd_transfer_setup_sub(parm); nqh = 1; ntd = ((2 * xfer->nframes) + (xfer->max_data_length / xfer->max_frame_size)); + } else if (parm->methods == &uhci_device_isoc_methods) { xfer->flags_int.bdma_enable = 1; xfer->flags_int.bdma_no_post_sync = 1; - } else if (parm->methods == &uhci_device_isoc_methods) { + usbd_transfer_setup_sub(parm); nqh = 0; ntd = xfer->nframes; - xfer->flags_int.bdma_enable = 1; - xfer->flags_int.bdma_no_post_sync = 1; + } else { - } else { + usbd_transfer_setup_sub(parm); nqh = 0; ntd = 0; From owner-p4-projects@FreeBSD.ORG Sun Dec 2 00:42:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1177A16A418; Sun, 2 Dec 2007 00:42: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 97E7C16A47C for ; Sun, 2 Dec 2007 00:42:22 +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 8067313C448 for ; Sun, 2 Dec 2007 00:42:22 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB20gMsd008404 for ; Sun, 2 Dec 2007 00:42:22 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB20gM1W008401 for perforce@freebsd.org; Sun, 2 Dec 2007 00:42:22 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 00:42:22 GMT Message-Id: <200712020042.lB20gM1W008401@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 129934 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 00:42:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=129934 Change 129934 by hselasky@hselasky_laptop001 on 2007/12/02 00:42:00 This commit finishes change 129799 with regard to "usb_transfer.c". The allocated data buffer for each USB transfer is now all in virtual memory. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#55 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#55 (text+ko) ==== @@ -52,12 +52,13 @@ /* prototypes */ static void usbd_pipe_enter_wrapper(struct usbd_xfer *xfer); -static void usbd_bdma_start_event(struct usbd_xfer *xfer); static void usbd_compute_max_frame_size(struct usbd_xfer *xfer); static void usbd_drop_refcount(struct usbd_memory_info *info); static uint8_t usbd_start_hardware_sub(struct usbd_xfer *xfer); static void usbd_premature_callback(struct usbd_xfer *xfer, usbd_status error); static void usbd_delayed_transfer_start(void *arg); +static void usbd_bdma_work_loop(struct usbd_memory_info *info); +static void usbd_bdma_cancel_event(struct usbd_xfer *xfer); #ifdef USB_DEBUG void @@ -549,22 +550,17 @@ } xfer->max_data_length -= REQ_SIZE; } - /* align data */ - parm->size[0] += ((-parm->size[0]) & (USB_HOST_ALIGN - 1)); + /* setup "frlengths" */ - xfer->frlengths = USBD_ADD_BYTES(parm->buf, parm->size[0]); + xfer->frlengths = parm->xfer_length_ptr; - parm->size[0] += (n_frlengths * sizeof(xfer->frlengths[0])); + parm->xfer_length_ptr += n_frlengths; - /* align data */ - parm->size[0] += ((-parm->size[0]) & (USB_HOST_ALIGN - 1)); + /* setup "frbuffers" */ - xfer->frbuffers = USBD_ADD_BYTES(parm->buf, parm->size[0]); + xfer->frbuffers = parm->xfer_page_cache_ptr; - parm->size[0] += (n_frbuffers * sizeof(xfer->frbuffers[0])); - - /* align data */ - parm->size[0] += ((-parm->size[0]) & (USB_HOST_ALIGN - 1)); + parm->xfer_page_cache_ptr += n_frbuffers; /* * check if we need to setup @@ -574,40 +570,32 @@ if (!xfer->flags.ext_buffer) { /* align data */ - parm->size[1] += ((-parm->size[1]) & (USB_HOST_ALIGN - 1)); + parm->size[0] += ((-parm->size[0]) & (USB_HOST_ALIGN - 1)); if (parm->buf) { - usbd_page_cache_init - (xfer->frbuffers + 0, parm->page_ptr, - parm->size[1], parm->bufsize); + xfer->local_buffer = + USBD_ADD_BYTES(parm->buf, parm->size[0]); + + usbd_set_frame_offset(xfer, 0, 0); if (type == UE_CONTROL) { - - usbd_page_cache_init - (xfer->frbuffers + 1, parm->page_ptr, - parm->size[1] + REQ_SIZE, - parm->bufsize - REQ_SIZE); + usbd_set_frame_offset(xfer, REQ_SIZE, 1); } - /* - * make a copy of the page cache that - * starts at offset zero: - */ - - xfer->buf_data = xfer->frbuffers[0]; } - parm->size[1] += parm->bufsize; + parm->size[0] += parm->bufsize; /* align data again */ - parm->size[1] += ((-parm->size[1]) & (USB_HOST_ALIGN - 1)); + parm->size[0] += ((-parm->size[0]) & (USB_HOST_ALIGN - 1)); } /* - * check if we need to allocate - * temporary usbd_page structure(s) - * for loading memory into DMA + * Compute maximum buffer size */ - if (xfer->flags.bdma_enable) { + if (parm->bufsize_max < parm->bufsize) { + parm->bufsize_max = parm->bufsize; + } + if (xfer->flags_int.bdma_enable) { /* * Setup "dma_page_ptr". * @@ -648,18 +636,32 @@ parm->err = USBD_INVAL; goto done; } - /* initialize transfer backpointer */ + /* initialize frame buffers */ if (parm->buf) { - for (x = 0; x < n_frbuffers; x++) { - xfer->frbuffers[x].p_xfer = xfer; + for (x = 0; x != n_frbuffers; x++) { + xfer->frbuffers[x].xfer = xfer; + + if (xfer->flags_int.bdma_enable && + (parm->bufsize_max > 0)) { + + if (usbd_pc_dmamap_create( + xfer->frbuffers + x, + parm->bufsize_max)) { + parm->err = USBD_NOMEM; + goto done; + } + } } } done: if (parm->err) { - xfer->max_usb_frame_size = 1; /* XXX avoid division by zero */ - xfer->max_frame_size = 1; /* XXX avoid division by zero */ - xfer->max_packet_size = 1; /* XXX avoid division by zero */ + /* + * Set some dummy values so that we avoid division by zero: + */ + xfer->max_usb_frame_size = 1; + xfer->max_frame_size = 1; + xfer->max_packet_size = 1; xfer->max_data_length = 0; xfer->nframes = 0; } @@ -736,31 +738,30 @@ while (1) { - parm.size[0] = 0; - parm.size[1] = 0; - parm.buf = buf; - - /* align data to 8 byte boundary */ - parm.size[0] += ((-parm.size[0]) & (USB_HOST_ALIGN - 1)); - if (buf) { - info = USBD_ADD_BYTES(buf, parm.size[0]); + info = USBD_ADD_BYTES(buf, 0); info->memory_base = buf; - info->memory_size = parm.total_size[0]; + info->memory_size = parm.size[0]; - info->page_base = parm.page_ptr; - info->page_size = parm.total_size[1]; + info->dma_page_cache_start = USBD_ADD_BYTES(buf, parm.size[4]); + info->dma_page_cache_end = USBD_ADD_BYTES(buf, parm.size[5]); + info->xfer_page_cache_start = USBD_ADD_BYTES(buf, parm.size[5]); + info->xfer_page_cache_end = USBD_ADD_BYTES(buf, parm.size[2]); info->usb_mtx = &(udev->bus->mtx); + info->dma_tag_p = parm.dma_tag_p; + info->dma_tag_max = parm.dma_tag_max; - usbd_page_cache_init(&(parm.pc), parm.page_ptr, - 0, parm.total_size[1] * USB_PAGE_SIZE); } else { info = NULL; } + /* reset sizes */ + + parm.size[0] = 0; + parm.buf = buf; parm.size[0] += sizeof(info[0]); for (setup = setup_start, n = 0; @@ -810,13 +811,6 @@ (udev->bus->methods->xfer_setup) (&parm); - if (xfer->flags.bdma_enable && - xfer->flags_int.bdma_enable) { - if (parm.err) { - goto done; - } - usbd_dma_load_setup(&parm); - } if (parm.err) { goto done; } @@ -825,18 +819,30 @@ if (buf || parm.err) { goto done; } - /* compute number of USB pages required */ - parm.total_size[1] = - (parm.size[1] + USB_PAGE_SIZE - 1) / USB_PAGE_SIZE; - /* align data to 8 byte boundary */ parm.size[0] += ((-parm.size[0]) & (USB_HOST_ALIGN - 1)); /* store offset temporarily */ - parm.size[2] = parm.size[0]; + parm.size[1] = parm.size[0]; + + /* + * UHCI need DMA tags for fixup buffers. There + * is a maximum of one tag for each endpoint. + */ + parm.dma_tag_max += MIN(n_setup, USB_MAX_ENDPOINTS); + + /* + * DMA tags for QH, TD, Data and more. + */ + parm.dma_tag_max += 8; + + parm.dma_tag_p += parm.dma_tag_max; + + parm.size[0] += ((uint8_t *)parm.dma_tag_p) - + ((uint8_t *)0); - parm.size[0] += (sizeof(parm.page_ptr[0]) * - parm.total_size[1]); + /* align data to 8 byte boundary */ + parm.size[0] += ((-parm.size[0]) & (USB_HOST_ALIGN - 1)); /* store offset temporarily */ parm.size[3] = parm.size[0]; @@ -844,31 +850,51 @@ parm.size[0] += ((uint8_t *)parm.dma_page_ptr) - ((uint8_t *)0); - /* store total buffer size */ - parm.total_size[0] = parm.size[0]; + /* align data to 8 byte boundary */ + parm.size[0] += ((-parm.size[0]) & (USB_HOST_ALIGN - 1)); + + /* store offset temporarily */ + parm.size[4] = parm.size[0]; + + parm.size[0] += ((uint8_t *)parm.dma_page_cache_ptr) - + ((uint8_t *)0); + + /* store end offset temporarily */ + parm.size[5] = parm.size[0]; + + parm.size[0] += ((uint8_t *)parm.xfer_page_cache_ptr) - + ((uint8_t *)0); + + /* store end offset temporarily */ + + parm.size[2] = parm.size[0]; + + /* align data to 8 byte boundary */ + parm.size[0] += ((-parm.size[0]) & (USB_HOST_ALIGN - 1)); + + parm.size[6] = parm.size[0]; + + parm.size[0] += ((uint8_t *)parm.xfer_length_ptr) - + ((uint8_t *)0); + + /* align data to 8 byte boundary */ + parm.size[0] += ((-parm.size[0]) & (USB_HOST_ALIGN - 1)); /* allocate zeroed memory */ - buf = malloc(parm.total_size[0], M_USB, M_WAITOK | M_ZERO); + buf = malloc(parm.size[0], M_USB, M_WAITOK | M_ZERO); if (buf == NULL) { parm.err = USBD_NOMEM; PRINTFN(-1, ("cannot allocate memory block for " "configuration (%d bytes)\n", - parm.total_size[0])); + parm.size[0])); goto done; } - parm.page_ptr = USBD_ADD_BYTES(buf, parm.size[2]); + parm.dma_tag_p = USBD_ADD_BYTES(buf, parm.size[1]); parm.dma_page_ptr = USBD_ADD_BYTES(buf, parm.size[3]); - - if (usbd_page_alloc(udev->bus->dma_tag_ps, - parm.page_ptr, parm.total_size[1])) { - free(buf, M_USB); - parm.err = USBD_NOMEM; - PRINTFN(-1, ("cannot allocate memory block for " - "configuration (%d USB pages)\n", - parm.total_size[1])); - goto done; - } + parm.dma_page_cache_ptr = USBD_ADD_BYTES(buf, parm.size[4]); + parm.xfer_page_cache_ptr = USBD_ADD_BYTES(buf, parm.size[5]); + parm.xfer_length_ptr = USBD_ADD_BYTES(buf, parm.size[6]); } done: @@ -912,6 +938,7 @@ { struct usbd_xfer *xfer; struct usbd_memory_info *info; + struct usbd_page_cache *pc; int error; WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, @@ -963,8 +990,6 @@ usb_callout_drain(&(xfer->timeout_handle)); - usbd_dma_load_unsetup(xfer); - if (xfer->usb_root) { info = xfer->usb_root; @@ -996,8 +1021,25 @@ mtx_unlock(info->usb_mtx); /* free DMA'able memory, if any */ + pc = info->dma_page_cache_start; + while (pc != info->dma_page_cache_end) { + usbd_pc_free_mem(pc); + pc++; + } + + /* + * free DMA maps in all + * "xfer->frbuffers" + */ + pc = info->xfer_page_cache_start; + while (pc != info->xfer_page_cache_end) { + usbd_pc_dmamap_destroy(pc); + pc++; + } - usbd_page_free(info->page_base, info->page_size); + /* free all DMA tags */ + usbd_dma_tag_unsetup(info->dma_tag_p, + info->dma_tag_max); /* * free the "memory_base" last, @@ -1282,6 +1324,7 @@ void usbd_start_hardware(struct usbd_xfer *xfer) { + struct usbd_memory_info *info; uint32_t x; PRINTFN(0, ("xfer=%p, pipe=%p, nframes=%d, dir=%s\n", @@ -1377,8 +1420,31 @@ * buffers into DMA, if any: */ - if (xfer->flags.bdma_enable) { - usbd_bdma_start_event(xfer); + if (xfer->flags_int.bdma_enable) { + + /* + * If the transfer is not inserted, insert + * the transfer into the DMA queue + */ + if (xfer->dma_list.le_prev == NULL) { + LIST_INSERT_HEAD(&(xfer->usb_root->dma_head), + xfer, dma_list); + } + info = xfer->usb_root; + + /* + * If there is no current transfer, set one + */ + if (info->dma_curr_xfer == NULL) { + info->dma_curr_xfer = xfer; + info->dma_no_callback = 1; + } + /* + * Only call the BUS-DMA work loop when it is not busy + */ + if (info->dma_refcount == 0) { + usbd_bdma_work_loop(info); + } return; } /* @@ -1414,84 +1480,158 @@ } /*------------------------------------------------------------------------* - * usbd_bdma_start_event + * usbd_bdma_cancel_event + * + * This function will cancel any BUS-DMA operations. + *------------------------------------------------------------------------*/ +static void +usbd_bdma_cancel_event(struct usbd_xfer *xfer) +{ + struct usbd_memory_info *info; + + mtx_assert(info->priv_mtx, MA_OWNED); + + info = xfer->usb_root; + + if (info->dma_curr_xfer == xfer) { + /* prepare next USB transfer to load, if any */ + info->dma_curr_xfer = + LIST_PREV(&(info->dma_head), xfer, dma_list); + info->dma_no_callback = 1; + } + if (xfer->dma_list.le_prev) { + LIST_REMOVE(xfer, dma_list); + xfer->dma_list.le_prev = NULL; + } + return; +} + +/*------------------------------------------------------------------------* + * usbd_bdma_work_loop + * + * This function handles loading of virtual buffers into DMA. *------------------------------------------------------------------------*/ static void -usbd_bdma_start_event(struct usbd_xfer *xfer) +usbd_bdma_work_loop(struct usbd_memory_info *info) { - struct usbd_dma_load_mem_info info; + struct usbd_xfer *xfer; + struct usbd_page *pg; uint32_t nframes; + uint32_t frlength_0; uint8_t isread; - uint8_t state; + + mtx_assert(info->priv_mtx, MA_OWNED); + + if (info->dma_draining) { + /* someone is waiting for us to drain */ + info->dma_draining = 0; + wakeup(&(info->dma_draining)); + } +repeat: + + xfer = info->dma_curr_xfer; + + if (xfer) { - mtx_assert(xfer->priv_mtx, MA_OWNED); + if (!info->dma_no_callback) { - state = xfer->flags_int.bdma_state; + /* prepare next USB transfer to load, if any */ + info->dma_curr_xfer = + LIST_PREV(&(info->dma_head), xfer, dma_list); + info->dma_no_callback = 1; + LIST_REMOVE(xfer, dma_list); + xfer->dma_list.le_prev = NULL; - if (state == USBD_BDMA_ST_IDLE) { + /* check for DMA error */ - /* we are about to load the buffers */ - xfer->flags_int.bdma_state = USBD_BDMA_ST_LOADING; + if (info->dma_error) { - isread = USBD_GET_DATA_ISREAD(xfer); + /* prevent recursion by increasing refcount */ - info.page_ptr = xfer->dma_page_ptr; + info->dma_refcount++; - if (xfer->flags_int.isochronous_xfr) { - /* only one frame buffer */ - nframes = 1; - } else { - /* can be multiple frame buffers */ - nframes = xfer->nframes; - } + /* report error */ - /* reset BUS-DMA load state */ + usbd_premature_callback(xfer, + USBD_DMA_LOAD_FAILED); - xfer->dma_refcount = 1; - xfer->flags_int.bdma_error = 0; + info->dma_refcount--; - while (nframes--) { - if (xfer->frbuffers[nframes].p_buffer == NULL) { - /* nothing to load */ - continue; + goto repeat; } - /* - * Set DMA direction first. This is needed to - * select the correct cache invalidate and cache - * flush operations. - */ - if ((nframes == 0) && - xfer->flags_int.control_xfr && - xfer->flags_int.control_hdr) { - /* special case */ + /* go ahead */ + usbd_bdma_pre_sync(xfer); + + /* finally start the hardware */ + usbd_pipe_enter_wrapper(xfer); - if (xfer->flags_int.is_dci) { - xfer->frbuffers[0].isread = 0; - } else { - xfer->frbuffers[0].isread = 1; - } - } else { + /* load next USB transfer, if any */ + goto repeat; + } + } else { + /* nothing more to do */ + return; + } - /* default case */ + /* reset BUS-DMA load state */ - xfer->frbuffers[nframes].isread = isread; - } + info->dma_refcount = 1; + info->dma_error = 0; + info->dma_no_callback = 0; - info.page_cache = xfer->frbuffers + nframes; - info.frame_length = xfer->frlengths[nframes]; + if (xfer->flags_int.isochronous_xfr) { + /* only one frame buffer */ + nframes = 1; + frlength_0 = xfer->sumlen; + } else { + /* can be multiple frame buffers */ + nframes = xfer->nframes; + frlength_0 = xfer->frlengths[0]; + } - /* check if the hardware supports DMA */ + /* + * Set DMA direction first. This is needed to + * select the correct cache invalidate and cache + * flush operations. + */ + isread = USBD_GET_DATA_ISREAD(xfer); + pg = xfer->dma_page_ptr; - if (xfer->flags_int.bdma_enable) - usbd_dma_load_mem(xfer, &info); - else - usbd_pio_load_mem(xfer, &info); + if (xfer->flags_int.control_xfr && + xfer->flags_int.control_hdr) { + /* special case */ + if (xfer->flags_int.is_dci) { + xfer->frbuffers[0].isread = 0; + } else { + xfer->frbuffers[0].isread = 1; } - usbd_bdma_done_event(xfer); + } else { + /* default case */ + xfer->frbuffers[0].isread = isread; + } + + xfer->frbuffers[0].page_start = pg; + + usbd_pc_load_mem(xfer->frbuffers + 0, frlength_0); + + pg += (frlength_0 / USB_PAGE_SIZE); + pg += 2; + + while (--nframes > 0) { + xfer->frbuffers[nframes].isread = isread; + + xfer->frbuffers[nframes].page_start = pg; + + usbd_pc_load_mem(xfer->frbuffers + nframes, + xfer->frlengths[nframes]); + + pg += (xfer->frlengths[nframes] / USB_PAGE_SIZE); + pg += 2; + } - } else if (state == USBD_BDMA_ST_CANCELLING) { - /* we have to postphone the load until later */ - xfer->flags_int.bdma_state = USBD_BDMA_ST_CANCEL_AND_LOAD; + if (--(info->dma_refcount) == 0) { + /* we are complete */ + goto repeat; } return; } @@ -1503,51 +1643,77 @@ * into DMA, if any *------------------------------------------------------------------------*/ void -usbd_bdma_done_event(struct usbd_xfer *xfer) +usbd_bdma_done_event(struct usbd_memory_info *info) { - uint8_t state; + mtx_assert(info->priv_mtx, MA_OWNED); - mtx_assert(xfer->priv_mtx, MA_OWNED); + if (--(info->dma_refcount) == 0) { + usbd_bdma_work_loop(info); + } + return; +} - xfer->dma_refcount--; +/*------------------------------------------------------------------------* + * usbd_bdma_pre_sync + *------------------------------------------------------------------------*/ +void +usbd_bdma_pre_sync(struct usbd_xfer *xfer) +{ + struct usbd_page_cache *pc; + uint32_t nframes; - if (xfer->dma_refcount != 0) { - return; + if (xfer->flags_int.isochronous_xfr) { + /* only one frame buffer */ + nframes = 1; + } else { + /* can be multiple frame buffers */ + nframes = xfer->nframes; } - /* get current BUS-DMA state */ - state = xfer->flags_int.bdma_state; - /* set new state first */ - xfer->flags_int.bdma_state = USBD_BDMA_ST_IDLE; + pc = xfer->frbuffers; - if (state == USBD_BDMA_ST_LOADING) { + while (nframes--) { - if (xfer->flags_int.bdma_error) { - /* report error */ - usbd_premature_callback(xfer, USBD_DMA_LOAD_FAILED); - } else { - if (xfer->flags_int.bdma_enable) { - usbd_dma_load_pre_sync(xfer); + if (pc->page_offset_buf != pc->page_offset_end) { + if (pc->isread) { + usbd_pc_cpu_invalidate(pc); + } else { + usbd_pc_cpu_flush(pc); } - /* finally start the hardware */ - usbd_pipe_enter_wrapper(xfer); } + pc++; + } + + return; +} + +/*------------------------------------------------------------------------* + * usbd_bdma_post_sync + *------------------------------------------------------------------------*/ +void +usbd_bdma_post_sync(struct usbd_xfer *xfer) +{ + struct usbd_page_cache *pc; + uint32_t nframes; - } else if (state == USBD_BDMA_ST_CANCEL_AND_LOAD) { + if (xfer->flags_int.isochronous_xfr) { + /* only one frame buffer */ + nframes = 1; + } else { + /* can be multiple frame buffers */ + nframes = xfer->nframes; + } - /* we are about to load new buffers */ - usbd_bdma_start_event(xfer); + pc = xfer->frbuffers; - } else if (state == USBD_BDMA_ST_CANCELLING) { + while (nframes--) { - /* - * Check if we need to wakeup someone - * that is waiting for DMA to cancel - */ - if (xfer->flags_int.bdma_draining) { - xfer->flags_int.bdma_draining = 0; - wakeup(&(xfer->dma_page_ptr)); + if (pc->page_offset_buf != pc->page_offset_end) { + if (pc->isread) { + usbd_pc_cpu_invalidate(pc); + } } + pc++; } return; } @@ -1624,8 +1790,6 @@ void usbd_transfer_stop(struct usbd_xfer *xfer) { - uint8_t state; - if (xfer == NULL) { /* transfer is gone */ return; @@ -1662,16 +1826,10 @@ /* always set error */ xfer->error = USBD_CANCELLED; - state = xfer->flags_int.bdma_state; + /* cancel loading of virtual buffers, if any */ + usbd_bdma_cancel_event(xfer); /* - * Update BUS-DMA state to cancelling, if needed - */ - if ((state == USBD_BDMA_ST_LOADING) || - (state == USBD_BDMA_ST_CANCEL_AND_LOAD)) { - xfer->flags_int.bdma_state = USBD_BDMA_ST_CANCELLING; - } - /* * Check if we are doing a transfer and if so * do a Cancel Callback */ @@ -1695,6 +1853,8 @@ void usbd_transfer_drain(struct usbd_xfer *xfer) { + struct usbd_memory_info *info; + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "usbd_transfer_drain can sleep!"); @@ -1708,16 +1868,23 @@ usbd_transfer_stop(xfer); - while (xfer->dma_refcount > 0) { + info = xfer->usb_root; + + if (info->dma_refcount > 0) { - xfer->flags_int.bdma_draining = 1; + /* + * Wait until the current outstanding DMA + * operation is complete before we return. + * That way we are sure that no DMA operation + * belonging to our USB transfer is pending! + */ + info->dma_draining = 1; - if (mtx_sleep(&(xfer->dma_page_ptr), xfer->priv_mtx, + if (mtx_sleep(&(info->dma_draining), xfer->priv_mtx, 0, "usbdrain", 0)) { /* should not happen */ } } - mtx_unlock(xfer->priv_mtx); return; @@ -1726,15 +1893,17 @@ /*------------------------------------------------------------------------* * usbd_set_frame_data * - * This function sets the pointer and length of data that should loaded - * directly into DMA for the given USB frame. + * This function sets the pointer and length of data that should + * loaded directly into DMA for the given USB frame. Passing "ptr" + * equal to NULL while "len" is greater than zero gives undefined + * results! *------------------------------------------------------------------------*/ void usbd_set_frame_data(struct usbd_xfer *xfer, void *ptr, uint32_t len, uint32_t frindex) { - xfer->frbuffers[frindex].p_buffer = ptr; /* enable loading of - * memory into DMA */ + /* set virtual address to load and length */ + xfer->frbuffers[frindex].buffer = ptr; xfer->frlengths[frindex] = len; return; } @@ -1749,19 +1918,12 @@ usbd_set_frame_offset(struct usbd_xfer *xfer, uint32_t offset, uint32_t frindex) { - struct usbd_page *page = xfer->buf_data.page_start; - struct usbd_page_cache *pc = xfer->frbuffers + frindex; - __KASSERT(!xfer->flags.ext_buffer, ("Cannot offset data frame " - " when the USB buffer is external!\n")); + "when the USB buffer is external!\n")); - pc->page_offset_end = xfer->buf_data.page_offset_end - offset; - - offset += xfer->buf_data.page_offset_buf; - page += (offset / USB_PAGE_SIZE); - pc->page_start = page; - pc->page_offset_buf = (offset % USB_PAGE_SIZE); - pc->p_buffer = NULL; /* disable loading of memory into DMA */ + /* set virtual address to load */ + xfer->frbuffers[frindex].buffer = + USBD_ADD_BYTES(xfer->local_buffer, offset); return; } @@ -1793,9 +1955,10 @@ } else { xfer->usb_state = USBD_ST_TRANSFERRED; - if (xfer->flags.bdma_enable && - xfer->flags_int.bdma_enable) { - usbd_dma_load_post_sync(xfer); + /* sync any DMA memory */ + if (xfer->flags_int.bdma_enable && + (!xfer->flags_int.bdma_no_post_sync)) { + usbd_bdma_post_sync(xfer); } } } @@ -1940,12 +2103,6 @@ * the pipe queue, but remain first. To enforce USB transfer removal call * this function passing the error code "USBD_CANCELLED". *------------------------------------------------------------------------*/ -#undef LIST_PREV -#define LIST_PREV(head,elm,field) \ - (((elm) == LIST_FIRST(head)) ? ((__typeof(elm))0) : \ - ((__typeof(elm))(((uint8_t *)((elm)->field.le_prev)) - \ - ((uint8_t *)&LIST_NEXT((__typeof(elm))0,field))))) - void usbd_transfer_dequeue(struct usbd_xfer *xfer, usbd_status error) { From owner-p4-projects@FreeBSD.ORG Sun Dec 2 00:47:28 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEA1416A41B; Sun, 2 Dec 2007 00:47: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 5E7D416A418 for ; Sun, 2 Dec 2007 00:47:28 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 48E7113C478 for ; Sun, 2 Dec 2007 00:47:28 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB20lSuK017832 for ; Sun, 2 Dec 2007 00:47:28 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB20lSuw017829 for perforce@freebsd.org; Sun, 2 Dec 2007 00:47:28 GMT (envelope-from peter@freebsd.org) Date: Sun, 2 Dec 2007 00:47:28 GMT Message-Id: <200712020047.lB20lSuw017829@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 129935 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 00:47:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=129935 Change 129935 by peter@peter_daintree on 2007/12/02 00:46:55 Undo more proc_linkup0() damage Affected files ... .. //depot/projects/bike_sched/sys/arm/at91/kb920x_machdep.c#6 edit .. //depot/projects/bike_sched/sys/arm/sa11x0/assabet_machdep.c#5 edit Differences ... ==== //depot/projects/bike_sched/sys/arm/at91/kb920x_machdep.c#6 (text) ==== @@ -449,7 +449,7 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); - proc_linkup(&proc0, &thread0); + proc_linkup0(&proc0, &thread0); thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/bike_sched/sys/arm/sa11x0/assabet_machdep.c#5 (text+ko) ==== @@ -422,7 +422,7 @@ /* Set stack for exception handlers */ - proc_linkup(&proc0, &thread0); + proc_linkup0(&proc0, &thread0); thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; From owner-p4-projects@FreeBSD.ORG Sun Dec 2 00:48:29 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8E1816A4C4; Sun, 2 Dec 2007 00:48: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 8DBAB16A4B3 for ; Sun, 2 Dec 2007 00:48:29 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 785E413C44B for ; Sun, 2 Dec 2007 00:48:29 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB20mTAX017851 for ; Sun, 2 Dec 2007 00:48:29 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB20mTJu017848 for perforce@freebsd.org; Sun, 2 Dec 2007 00:48:29 GMT (envelope-from peter@freebsd.org) Date: Sun, 2 Dec 2007 00:48:29 GMT Message-Id: <200712020048.lB20mTJu017848@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 129936 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 00:48:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=129936 Change 129936 by peter@peter_daintree on 2007/12/02 00:47:30 Clean up more bits. Narrow some function prototype scopes. Affected files ... .. //depot/projects/bike_sched/sys/kern/kern_thread.c#10 edit .. //depot/projects/bike_sched/sys/sys/proc.h#6 edit Differences ... ==== //depot/projects/bike_sched/sys/kern/kern_thread.c#10 (text+ko) ==== @@ -77,6 +77,7 @@ MTX_SYSINIT(zombie_lock, &zombie_lock, "zombie lock", MTX_SPIN); static void thread_zombie(struct thread *); +static void thread_reap(void); #endif struct mtx tid_lock; @@ -261,7 +262,7 @@ /* * Reap zombie threads. */ -void +static void thread_reap(void) { struct thread *td_first, *td_next; ==== //depot/projects/bike_sched/sys/sys/proc.h#6 (text+ko) ==== @@ -362,10 +362,6 @@ #define TDI_LOCK 0x0008 /* Stopped on a lock. */ #define TDI_IWAIT 0x0010 /* Awaiting interrupt. */ -#define TD_CAN_UNBIND(td) \ - (((td)->td_pflags & TDP_CAN_UNBIND) && \ - ((td)->td_upcall != NULL)) - #define TD_IS_SLEEPING(td) ((td)->td_inhibitors & TDI_SLEEPING) #define TD_ON_SLEEPQ(td) ((td)->td_wchan != NULL) #define TD_IS_SUSPENDED(td) ((td)->td_inhibitors & TDI_SUSPENDED) @@ -617,8 +613,6 @@ LIST_FOREACH((p), &allproc, p_list) #define FOREACH_THREAD_IN_PROC(p, td) \ TAILQ_FOREACH((td), &(p)->p_threads, td_plist) -#define FOREACH_UPCALL_IN_PROC(p, ku) \ - TAILQ_FOREACH((ku), &(p)->p_upcalls, ku_link) /* XXXKSE the following lines should probably only be used in 1:1 code: */ #define FIRST_THREAD_IN_PROC(p) TAILQ_FIRST(&(p)->p_threads) @@ -814,7 +808,6 @@ void cpu_fork(struct thread *, struct proc *, struct thread *, int); void cpu_set_fork_handler(struct thread *, void (*)(void *), void *); -/* New in KSE. */ void cpu_set_upcall(struct thread *td, struct thread *td0); void cpu_set_upcall_func(struct thread *, void (*)(void *), void *, stack_t *); int cpu_set_user_tls(struct thread *, void *tls_base); @@ -825,17 +818,13 @@ void cpu_thread_swapin(struct thread *); void cpu_thread_swapout(struct thread *); struct thread *thread_alloc(void); -void thread_continued(struct proc *p); void thread_exit(void) __dead2; -int thread_export_context(struct thread *td, int willexit); void thread_free(struct thread *td); void thread_link(struct thread *td, struct proc *p); -void thread_reap(void); void thread_signal_add(struct thread *td, ksiginfo_t *); int thread_single(int how); void thread_single_end(void); void thread_stash(struct thread *td); -int thread_statclock(int user); void thread_stopped(struct proc *p); void childproc_stopped(struct proc *child, int reason); void childproc_continued(struct proc *child); From owner-p4-projects@FreeBSD.ORG Sun Dec 2 00:54:37 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B040216A418; Sun, 2 Dec 2007 00:54: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 611D216A419 for ; Sun, 2 Dec 2007 00:54:37 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4B88413C4D9 for ; Sun, 2 Dec 2007 00:54:37 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB20sbQr019149 for ; Sun, 2 Dec 2007 00:54:37 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB20saii019146 for perforce@freebsd.org; Sun, 2 Dec 2007 00:54:36 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 00:54:36 GMT Message-Id: <200712020054.lB20saii019146@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 129938 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 00:54:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=129938 Change 129938 by hselasky@hselasky_laptop001 on 2007/12/02 00:53:55 The "buf_data" field of "struct usbd_xfer" does no longer exist. Replace it: [ -f src/$F ] && (cat src/$F | sed -e "s/[&][(]xfer-[>]buf_data[)]/xfer->frbuffers + 0/g" > temp ) && ((diff -u src/$F temp) || (cat temp > src/$F)) Affected files ... .. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#25 edit .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#23 edit .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#36 edit .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#37 edit .. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#29 edit .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#32 edit .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#34 edit .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#32 edit .. //depot/projects/usb/src/sys/dev/usb/if_rum.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#33 edit .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#40 edit .. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#22 edit .. //depot/projects/usb/src/sys/dev/usb/uark.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#29 edit .. //depot/projects/usb/src/sys/dev/usb/ubser.c#21 edit .. //depot/projects/usb/src/sys/dev/usb/ucycom.c#23 edit .. //depot/projects/usb/src/sys/dev/usb/udbp.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#29 edit .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#26 edit .. //depot/projects/usb/src/sys/dev/usb/ugen.c#28 edit .. //depot/projects/usb/src/sys/dev/usb/ugensa.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/uhid.c#23 edit .. //depot/projects/usb/src/sys/dev/usb/uipaq.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#29 edit .. //depot/projects/usb/src/sys/dev/usb/ulpt.c#32 edit .. //depot/projects/usb/src/sys/dev/usb/umass.c#33 edit .. //depot/projects/usb/src/sys/dev/usb/umct.c#23 edit .. //depot/projects/usb/src/sys/dev/usb/umodem.c#32 edit .. //depot/projects/usb/src/sys/dev/usb/umoscom.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#30 edit .. //depot/projects/usb/src/sys/dev/usb/urio.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/uscanner.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/uvisor.c#26 edit .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#29 edit Differences ... ==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#25 (text) ==== @@ -582,7 +582,7 @@ bzero(sc->cbw.cdb, 16); bcopy(request->u.atapi.ccb, sc->cbw.cdb, 12); /* XXX SOS */ - usbd_copy_in(&(xfer->buf_data), 0, &(sc->cbw), sizeof(sc->cbw)); + usbd_copy_in(xfer->frbuffers + 0, 0, &(sc->cbw), sizeof(sc->cbw)); xfer->frlengths[0] = sizeof(sc->cbw); usbd_start_hardware(xfer); @@ -605,7 +605,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - usbd_copy_out(&(xfer->buf_data), 0, + usbd_copy_out(xfer->frbuffers + 0, 0, sc->ata_data, xfer->actlen); sc->ata_bytecount -= xfer->actlen; @@ -683,7 +683,7 @@ xfer->timeout = sc->timeout; xfer->frlengths[0] = max_bulk; - usbd_copy_in(&(xfer->buf_data), 0, + usbd_copy_in(xfer->frbuffers + 0, 0, sc->ata_data, max_bulk); usbd_start_hardware(xfer); @@ -721,7 +721,7 @@ if (xfer->actlen < sizeof(sc->csw)) { bzero(&(sc->csw), sizeof(sc->csw)); } - usbd_copy_out(&(xfer->buf_data), 0, &(sc->csw), xfer->actlen); + usbd_copy_out(xfer->frbuffers + 0, 0, &(sc->csw), xfer->actlen); if (request->flags & (ATA_R_READ | ATA_R_WRITE)) { request->donecount = sc->ata_donecount; ==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#23 (text+ko) ==== @@ -3276,14 +3276,14 @@ while (xfer->actlen >= 4) { - usbd_copy_out(&(xfer->buf_data), pos, buf, 1); + usbd_copy_out(xfer->frbuffers + 0, pos, buf, 1); cmd_len = umidi_cmd_to_len[buf[0] & 0xF]; /* command length */ cn = buf[0] >> 4; /* cable number */ sub = &(chan->sub[cn]); if (cmd_len && (cn < chan->max_cable) && sub->read_open) { - usb_cdev_put_data(&(sub->cdev), &(xfer->buf_data), + usb_cdev_put_data(&(sub->cdev), xfer->frbuffers + 0, pos + 1, cmd_len, 1); } else { /* ignore the command */ @@ -3502,14 +3502,14 @@ sub = &(chan->sub[chan->curr_cable]); if (sub->write_open) { - usb_cdev_get_data(&(sub->cdev), &(xfer->buf_data), + usb_cdev_get_data(&(sub->cdev), xfer->frbuffers + 0, total_length, 1, &actlen, 0); } else { actlen = 0; } if (actlen) { - usbd_copy_out(&(xfer->buf_data), total_length, &buf, 1); + usbd_copy_out(xfer->frbuffers + 0, total_length, &buf, 1); tr_any = 1; @@ -3521,7 +3521,7 @@ sub->temp_cmd[0], sub->temp_cmd[1], sub->temp_cmd[2], sub->temp_cmd[3]); - usbd_copy_in(&(xfer->buf_data), total_length, + usbd_copy_in(xfer->frbuffers + 0, total_length, sub->temp_cmd, 4); total_length += 4; ==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#36 (text+ko) ==== @@ -1000,7 +1000,7 @@ if (ifp && (ifp->if_drv_flags & IFF_DRV_RUNNING) && (xfer->actlen >= sizeof(pkt))) { - usbd_copy_out(&(xfer->buf_data), 0, &pkt, sizeof(pkt)); + usbd_copy_out(xfer->frbuffers + 0, 0, &pkt, sizeof(pkt)); if (pkt.aue_txstat0) { ifp->if_oerrors++; @@ -1066,7 +1066,7 @@ ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), xfer->actlen - 4, &(sc->sc_rxpkt), + usbd_copy_out(xfer->frbuffers + 0, xfer->actlen - 4, &(sc->sc_rxpkt), sizeof(sc->sc_rxpkt)); /* @@ -1091,7 +1091,7 @@ } xfer->actlen = min(xfer->actlen, m->m_len); - usbd_copy_out(&(xfer->buf_data), 0, m->m_data, xfer->actlen); + usbd_copy_out(xfer->frbuffers + 0, 0, m->m_data, xfer->actlen); ifp->if_ipackets++; m->m_pkthdr.rcvif = ifp; @@ -1184,7 +1184,7 @@ xfer->frlengths[0] = m->m_pkthdr.len; - usbd_m_copy_in(&(xfer->buf_data), 0, + usbd_m_copy_in(xfer->frbuffers + 0, 0, m, 0, m->m_pkthdr.len); } else { @@ -1200,9 +1200,9 @@ buf[0] = (uint8_t)(m->m_pkthdr.len); buf[1] = (uint8_t)(m->m_pkthdr.len >> 8); - usbd_copy_in(&(xfer->buf_data), 0, buf, 2); + usbd_copy_in(xfer->frbuffers + 0, 0, buf, 2); - usbd_m_copy_in(&(xfer->buf_data), 2, + usbd_m_copy_in(xfer->frbuffers + 0, 2, m, 0, m->m_pkthdr.len); } ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#37 (text+ko) ==== @@ -1035,7 +1035,7 @@ /* too little data */ break; } - usbd_copy_out(&(xfer->buf_data), pos, &hdr, sizeof(hdr)); + usbd_copy_out(xfer->frbuffers + 0, pos, &hdr, sizeof(hdr)); if ((hdr.len ^ hdr.ilen) != 0xFFFF) { /* we lost sync */ @@ -1068,7 +1068,7 @@ if (m->m_len > len) { m->m_len = len; } - usbd_copy_out(&(xfer->buf_data), pos, m->m_data, m->m_len); + usbd_copy_out(xfer->frbuffers + 0, pos, m->m_data, m->m_len); ifp->if_ipackets++; m->m_pkthdr.rcvif = ifp; @@ -1204,7 +1204,7 @@ hdr.len = htole16(m->m_pkthdr.len); hdr.ilen = ~hdr.len; - usbd_copy_in(&(xfer->buf_data), pos, &hdr, sizeof(hdr)); + usbd_copy_in(xfer->frbuffers + 0, pos, &hdr, sizeof(hdr)); pos += sizeof(hdr); @@ -1216,7 +1216,7 @@ * USBD_FORCE_SHORT_XFER flag instead. */ } - usbd_m_copy_in(&(xfer->buf_data), pos, + usbd_m_copy_in(xfer->frbuffers + 0, pos, m, 0, m->m_pkthdr.len); pos += m->m_pkthdr.len; ==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#29 (text+ko) ==== @@ -509,7 +509,7 @@ } xfer->frlengths[0] = m->m_pkthdr.len; - usbd_m_copy_in(&(xfer->buf_data), 0, + usbd_m_copy_in(xfer->frbuffers + 0, 0, m, 0, m->m_pkthdr.len); if (sc->sc_flags & CDCE_FLAG_ZAURUS) { @@ -517,7 +517,7 @@ crc = htole32(cdce_m_crc32(m, 0, m->m_pkthdr.len)); - usbd_copy_in(&(xfer->buf_data), + usbd_copy_in(xfer->frbuffers + 0, m->m_pkthdr.len, &crc, 4); xfer->frlengths[0] += 4; @@ -718,7 +718,7 @@ } xfer->actlen = min(xfer->actlen, m->m_len); - usbd_copy_out(&(xfer->buf_data), 0, m->m_data, xfer->actlen); + usbd_copy_out(xfer->frbuffers + 0, 0, m->m_data, xfer->actlen); ifp->if_ipackets++; m->m_pkthdr.rcvif = ifp; ==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#32 (text+ko) ==== @@ -648,7 +648,7 @@ ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), 0, buf, 2); + usbd_copy_out(xfer->frbuffers + 0, 0, buf, 2); len = buf[0] | (buf[1] << 8); @@ -663,7 +663,7 @@ xfer->actlen = min(xfer->actlen, m->m_len); xfer->actlen = min(xfer->actlen, len); - usbd_copy_out(&(xfer->buf_data), 2, m->m_data, xfer->actlen); + usbd_copy_out(xfer->frbuffers + 0, 2, m->m_data, xfer->actlen); ifp->if_ipackets++; m->m_pkthdr.rcvif = ifp; @@ -806,9 +806,9 @@ buf[0] = (uint8_t)(m->m_pkthdr.len); buf[1] = (uint8_t)(m->m_pkthdr.len >> 8); - usbd_copy_in(&(xfer->buf_data), 0, buf, 2); + usbd_copy_in(xfer->frbuffers + 0, 0, buf, 2); - usbd_m_copy_in(&(xfer->buf_data), 2, + usbd_m_copy_in(xfer->frbuffers + 0, 2, m, 0, m->m_pkthdr.len); /* ==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#34 (text+ko) ==== @@ -686,7 +686,7 @@ ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), 0, buf, 2); + usbd_copy_out(xfer->frbuffers + 0, 0, buf, 2); len = buf[0] | (buf[1] << 8); @@ -701,7 +701,7 @@ xfer->actlen = min(xfer->actlen, m->m_len); xfer->actlen = min(xfer->actlen, len); - usbd_copy_out(&(xfer->buf_data), 2, m->m_data, xfer->actlen); + usbd_copy_out(xfer->frbuffers + 0, 2, m->m_data, xfer->actlen); ifp->if_ipackets++; m->m_pkthdr.rcvif = ifp; @@ -794,12 +794,12 @@ buf[0] = (uint8_t)(m->m_pkthdr.len); buf[1] = (uint8_t)(m->m_pkthdr.len >> 8); - usbd_copy_in(&(xfer->buf_data), 0, buf, 2); + usbd_copy_in(xfer->frbuffers + 0, 0, buf, 2); - usbd_m_copy_in(&(xfer->buf_data), 2, + usbd_m_copy_in(xfer->frbuffers + 0, 2, m, 0, m->m_pkthdr.len); - usbd_bzero(&(xfer->buf_data), temp_len, + usbd_bzero(xfer->frbuffers + 0, temp_len, total_len - temp_len); xfer->frlengths[0] = total_len; ==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#32 (text+ko) ==== @@ -896,7 +896,7 @@ if (ifp && (ifp->if_drv_flags & IFF_DRV_RUNNING) && (xfer->actlen >= sizeof(pkt))) { - usbd_copy_out(&(xfer->buf_data), 0, &pkt, sizeof(pkt)); + usbd_copy_out(xfer->frbuffers + 0, 0, &pkt, sizeof(pkt)); ifp->if_ierrors += pkt.rue_rxlost_cnt; ifp->if_ierrors += pkt.rue_crcerr_cnt; @@ -950,7 +950,7 @@ ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), xfer->actlen - 4, + usbd_copy_out(xfer->frbuffers + 0, xfer->actlen - 4, &status, sizeof(status)); status = le16toh(status); @@ -975,7 +975,7 @@ } xfer->actlen = min(xfer->actlen, m->m_len); - usbd_copy_out(&(xfer->buf_data), 0, m->m_data, xfer->actlen); + usbd_copy_out(xfer->frbuffers + 0, 0, m->m_data, xfer->actlen); ifp->if_ipackets++; m->m_pkthdr.rcvif = ifp; @@ -1066,7 +1066,7 @@ } temp_len = m->m_pkthdr.len; - usbd_m_copy_in(&(xfer->buf_data), 0, + usbd_m_copy_in(xfer->frbuffers + 0, 0, m, 0, m->m_pkthdr.len); /* @@ -1075,7 +1075,7 @@ * RUE_MIN_FRAMELEN (60) byte packet. */ if (temp_len < RUE_MIN_FRAMELEN) { - usbd_bzero(&(xfer->buf_data), temp_len, + usbd_bzero(xfer->frbuffers + 0, temp_len, RUE_MIN_FRAMELEN - temp_len); temp_len = RUE_MIN_FRAMELEN; } ==== //depot/projects/usb/src/sys/dev/usb/if_rum.c#16 (text+ko) ==== @@ -1044,7 +1044,7 @@ ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), 0, + usbd_copy_out(xfer->frbuffers + 0, 0, &(sc->sc_rx_desc), RT2573_RX_DESC_SIZE); flags = le32toh(sc->sc_rx_desc.flags); @@ -1068,7 +1068,7 @@ } max_len = (xfer->actlen - RT2573_RX_DESC_SIZE); - usbd_copy_out(&(xfer->buf_data), RT2573_RX_DESC_SIZE, + usbd_copy_out(xfer->frbuffers + 0, RT2573_RX_DESC_SIZE, m->m_data, max_len); /* finalize mbuf */ @@ -1338,10 +1338,10 @@ } rum_setup_tx_desc(sc, flags, 0, m->m_pkthdr.len, rate); - usbd_copy_in(&(xfer->buf_data), 0, &(sc->sc_tx_desc), + usbd_copy_in(xfer->frbuffers + 0, 0, &(sc->sc_tx_desc), RT2573_TX_DESC_SIZE); - usbd_m_copy_in(&(xfer->buf_data), RT2573_TX_DESC_SIZE, + usbd_m_copy_in(xfer->frbuffers + 0, RT2573_TX_DESC_SIZE, m, 0, m->m_pkthdr.len); /* compute transfer length */ @@ -1351,13 +1351,13 @@ if (temp_len & 3) { align = (-(temp_len)) & 3; /* zero the extra byte(s) */ - usbd_bzero(&(xfer->buf_data), temp_len, align); + usbd_bzero(xfer->frbuffers + 0, temp_len, align); temp_len += align; } /* check if we need to add four extra bytes */ if ((temp_len % 64) == 0) { /* zero the extra bytes */ - usbd_bzero(&(xfer->buf_data), temp_len, 4); + usbd_bzero(xfer->frbuffers + 0, temp_len, 4); temp_len += 4; } DPRINTF(sc, 10, "sending frame len=%u rate=%u xferlen=%u\n", ==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#33 (text+ko) ==== @@ -918,13 +918,13 @@ temp_len += 2; - usbd_copy_in(&(xfer->buf_data), 0, buf, 2); + usbd_copy_in(xfer->frbuffers + 0, 0, buf, 2); - usbd_m_copy_in(&(xfer->buf_data), 2, + usbd_m_copy_in(xfer->frbuffers + 0, 2, m, 0, m->m_pkthdr.len); if (extra_len) { - usbd_bzero(&(xfer->buf_data), temp_len - extra_len, + usbd_bzero(xfer->frbuffers + 0, temp_len - extra_len, extra_len); } /* @@ -988,7 +988,7 @@ } xfer->actlen -= 1; - usbd_copy_out(&(xfer->buf_data), 0, &status, 1); + usbd_copy_out(xfer->frbuffers + 0, 0, &status, 1); if (status & UDAV_RSR_LCS) { ifp->if_collisions++; @@ -998,7 +998,7 @@ ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), 1, &total_len, 2); + usbd_copy_out(xfer->frbuffers + 0, 1, &total_len, 2); total_len = le16toh(total_len); @@ -1020,7 +1020,7 @@ } xfer->actlen = min(xfer->actlen, m->m_len); - usbd_copy_out(&(xfer->buf_data), 3, m->m_data, xfer->actlen); + usbd_copy_out(xfer->frbuffers + 0, 3, m->m_data, xfer->actlen); ifp->if_ipackets++; m->m_pkthdr.rcvif = ifp; ==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#40 (text+ko) ==== @@ -1113,7 +1113,7 @@ } max_len = (xfer->actlen - RAL_RX_DESC_SIZE); - usbd_copy_out(&(xfer->buf_data), max_len, + usbd_copy_out(xfer->frbuffers + 0, max_len, &(sc->sc_rx_desc), RAL_RX_DESC_SIZE); flags = le32toh(sc->sc_rx_desc.flags); @@ -1149,7 +1149,7 @@ ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), 0, m->m_data, max_len); + usbd_copy_out(xfer->frbuffers + 0, 0, m->m_data, max_len); /* finalize mbuf */ m->m_pkthdr.rcvif = ifp; @@ -1422,10 +1422,10 @@ } ural_setup_tx_desc(sc, flags, m->m_pkthdr.len, rate); - usbd_copy_in(&(xfer->buf_data), 0, &(sc->sc_tx_desc), + usbd_copy_in(xfer->frbuffers + 0, 0, &(sc->sc_tx_desc), RAL_TX_DESC_SIZE); - usbd_m_copy_in(&(xfer->buf_data), RAL_TX_DESC_SIZE, + usbd_m_copy_in(xfer->frbuffers + 0, RAL_TX_DESC_SIZE, m, 0, m->m_pkthdr.len); /* compute transfer length */ @@ -1434,13 +1434,13 @@ /* make transfer length 16-bit aligned */ if (temp_len & 1) { /* zero the extra byte */ - usbd_bzero(&(xfer->buf_data), temp_len, 1); + usbd_bzero(xfer->frbuffers + 0, temp_len, 1); temp_len++; } /* check if we need to add two extra bytes */ if ((temp_len % 64) == 0) { /* zero the extra bytes */ - usbd_bzero(&(xfer->buf_data), temp_len, 2); + usbd_bzero(xfer->frbuffers + 0, temp_len, 2); temp_len += 2; } DPRINTF(sc, 10, "sending frame len=%u rate=%u xferlen=%u\n", @@ -1496,7 +1496,7 @@ if (sc->sc_flags & URAL_FLAG_SEND_BYTE_FRAME) { sc->sc_flags &= ~URAL_FLAG_SEND_BYTE_FRAME; - usbd_bzero(&(xfer->buf_data), 0, 1); + usbd_bzero(xfer->frbuffers + 0, 0, 1); xfer->frlengths[0] = 1; /* bytes */ ==== //depot/projects/usb/src/sys/dev/usb/if_zyd.c#22 (text+ko) ==== @@ -472,7 +472,7 @@ if (xfer->actlen > sizeof(sc->sc_intr_ibuf)) { xfer->actlen = sizeof(sc->sc_intr_ibuf); } - usbd_copy_out(&(xfer->buf_data), 0, &(sc->sc_intr_ibuf), + usbd_copy_out(xfer->frbuffers + 0, 0, &(sc->sc_intr_ibuf), xfer->actlen); goto wakeup; @@ -569,7 +569,7 @@ goto wakeup; } if (sc->sc_intr_owakeup) { - usbd_copy_in(&(xfer->buf_data), 0, &(sc->sc_intr_obuf), + usbd_copy_in(xfer->frbuffers + 0, 0, &(sc->sc_intr_obuf), sc->sc_intr_olen); xfer->frlengths[0] = sc->sc_intr_olen; @@ -959,10 +959,10 @@ goto done; } /* copy out data */ - usbd_copy_out(&(xfer->buf_data), offset, m->m_data, len); + usbd_copy_out(xfer->frbuffers + 0, offset, m->m_data, len); /* copy out status report */ - usbd_copy_out(&(xfer->buf_data), offset + len, &desc, sizeof(desc)); + usbd_copy_out(xfer->frbuffers + 0, offset + len, &desc, sizeof(desc)); /* * TODO: Signal strength and quality have to be calculated in @@ -1055,7 +1055,7 @@ ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), xfer->actlen - sizeof(info), + usbd_copy_out(xfer->frbuffers + 0, xfer->actlen - sizeof(info), &info, sizeof(info)); /* See whether this is a multi-frame tansmission */ @@ -2599,7 +2599,7 @@ desc.packetlength, desc.currentlength, desc.service, desc.nextframelen); - usbd_copy_in(&(xfer->buf_data), 0, &desc, sizeof(desc)); + usbd_copy_in(xfer->frbuffers + 0, 0, &desc, sizeof(desc)); return; } @@ -2651,14 +2651,14 @@ } zyd_setup_tx_desc(xfer, m0, rate); - usbd_m_copy_in(&(xfer->buf_data), sizeof(struct zyd_controlsetformat), + usbd_m_copy_in(xfer->frbuffers + 0, sizeof(struct zyd_controlsetformat), m0, 0, m0->m_pkthdr.len); temp_len = (sizeof(struct zyd_controlsetformat) + m0->m_pkthdr.len); /* xfer length needs to be a multiple of two! */ if (temp_len & 1) { - usbd_bzero(&(xfer->buf_data), temp_len, 1); + usbd_bzero(xfer->frbuffers + 0, temp_len, 1); temp_len++; } DPRINTF(sc, 0, "len=%u rate=%u xfer len=%u\n", ==== //depot/projects/usb/src/sys/dev/usb/uark.c#12 (text+ko) ==== @@ -265,7 +265,7 @@ usbd_transfer_start(sc->sc_xfer[2]); return; } - if (ucom_get_data(&(sc->sc_ucom), &(xfer->buf_data), 0, + if (ucom_get_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, UARK_BUF_SIZE, &actlen)) { xfer->frlengths[0] = actlen; usbd_start_hardware(xfer); @@ -303,7 +303,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - ucom_put_data(&(sc->sc_ucom), &(xfer->buf_data), 0, + ucom_put_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, xfer->actlen); case USBD_ST_SETUP: ==== //depot/projects/usb/src/sys/dev/usb/ubsa.c#29 (text+ko) ==== @@ -641,7 +641,7 @@ usbd_transfer_start(sc->sc_xfer[2]); return; } - if (ucom_get_data(&(sc->sc_ucom), &(xfer->buf_data), 0, + if (ucom_get_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, UBSA_BSIZE, &actlen)) { xfer->frlengths[0] = actlen; @@ -680,7 +680,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - ucom_put_data(&(sc->sc_ucom), &(xfer->buf_data), 0, xfer->actlen); + ucom_put_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, xfer->actlen); case USBD_ST_SETUP: if (sc->sc_flag & UBSA_FLAG_READ_STALL) { @@ -726,7 +726,7 @@ if (xfer->actlen >= sizeof(buf)) { - usbd_copy_out(&(xfer->buf_data), 0, buf, sizeof(buf)); + usbd_copy_out(xfer->frbuffers + 0, 0, buf, sizeof(buf)); /* * incidentally, Belkin adapter status bits match ==== //depot/projects/usb/src/sys/dev/usb/ubser.c#21 (text+ko) ==== @@ -452,12 +452,12 @@ } do { if (ucom_get_data(sc->sc_ucom + sc->sc_curr_tx_unit, - &(xfer->buf_data), 1, sc->sc_tx_size - 1, + xfer->frbuffers + 0, 1, sc->sc_tx_size - 1, &actlen)) { buf[0] = sc->sc_curr_tx_unit; - usbd_copy_in(&(xfer->buf_data), 0, buf, 1); + usbd_copy_in(xfer->frbuffers + 0, 0, buf, 1); xfer->frlengths[0] = actlen + 1; usbd_start_hardware(xfer); @@ -508,14 +508,14 @@ DPRINTF(sc, 0, "invalid actlen=0!\n"); goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), 0, buf, 1); + usbd_copy_out(xfer->frbuffers + 0, 0, buf, 1); if (buf[0] >= sc->sc_numser) { DPRINTF(sc, 0, "invalid serial number!\n"); goto tr_setup; } ucom_put_data(sc->sc_ucom + buf[0], - &(xfer->buf_data), 1, xfer->actlen - 1); + xfer->frbuffers + 0, 1, xfer->actlen - 1); case USBD_ST_SETUP: tr_setup: ==== //depot/projects/usb/src/sys/dev/usb/ucycom.c#23 (text+ko) ==== @@ -580,7 +580,7 @@ if (xfer->actlen < 1) { goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), 0, buf, 1); + usbd_copy_out(xfer->frbuffers + 0, 0, buf, 1); sc->sc_ist = buf[0] & ~0x07; len = buf[0] & 0x07; @@ -595,7 +595,7 @@ if (xfer->actlen < 2) { goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), 0, buf, 2); + usbd_copy_out(xfer->frbuffers + 0, 0, buf, 2); sc->sc_ist = buf[0] & ~0x07; len = buf[1]; @@ -615,7 +615,7 @@ len = xfer->actlen; } if (len) { - ucom_put_data(&(sc->sc_ucom), &(xfer->buf_data), + ucom_put_data(&(sc->sc_ucom), xfer->frbuffers + 0, offset, len); } case USBD_ST_SETUP: ==== //depot/projects/usb/src/sys/dev/usb/udbp.c#18 (text+ko) ==== @@ -430,7 +430,7 @@ } m->m_pkthdr.len = m->m_len = xfer->actlen; - usbd_copy_out(&(xfer->buf_data), 0, m->m_data, xfer->actlen); + usbd_copy_out(xfer->frbuffers + 0, 0, m->m_data, xfer->actlen); sc->sc_bulk_in_buffer = m; @@ -550,7 +550,7 @@ MCLBYTES); m->m_pkthdr.len = MCLBYTES; } - usbd_m_copy_in(&(xfer->buf_data), 0, m, 0, m->m_pkthdr.len); + usbd_m_copy_in(xfer->frbuffers + 0, 0, m, 0, m->m_pkthdr.len); xfer->frlengths[0] = m->m_pkthdr.len; ==== //depot/projects/usb/src/sys/dev/usb/ufoma.c#29 (text+ko) ==== @@ -692,7 +692,7 @@ DPRINTF(sc, 0, "truncating message\n"); xfer->actlen = sizeof(pkt); } - usbd_copy_out(&(xfer->buf_data), 0, &pkt, xfer->actlen); + usbd_copy_out(xfer->frbuffers + 0, 0, &pkt, xfer->actlen); xfer->actlen -= 8; @@ -797,7 +797,7 @@ usbd_transfer_start(sc->sc_bulk_xfer[2]); return; } - if (ucom_get_data(&(sc->sc_ucom), &(xfer->buf_data), 0, + if (ucom_get_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, UFOMA_BULK_BUF_SIZE, &actlen)) { xfer->frlengths[0] = actlen; usbd_start_hardware(xfer); @@ -835,7 +835,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - ucom_put_data(&(sc->sc_ucom), &(xfer->buf_data), 0, + ucom_put_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, xfer->actlen); case USBD_ST_SETUP: ==== //depot/projects/usb/src/sys/dev/usb/uftdi.c#26 (text+ko) ==== @@ -541,14 +541,14 @@ usbd_transfer_start(sc->sc_xfer[2]); return; } - if (ucom_get_data(&(sc->sc_ucom), &(xfer->buf_data), + if (ucom_get_data(&(sc->sc_ucom), xfer->frbuffers + 0, sc->sc_hdrlen, UFTDI_OBUFSIZE - sc->sc_hdrlen, &actlen)) { if (sc->sc_hdrlen > 0) { buf[0] = FTDI_OUT_TAG(actlen, sc->sc_ucom.sc_portno); - usbd_copy_in(&(xfer->buf_data), 0, buf, 1); + usbd_copy_in(xfer->frbuffers + 0, 0, buf, 1); } xfer->frlengths[0] = actlen + sc->sc_hdrlen; usbd_start_hardware(xfer); @@ -593,7 +593,7 @@ if (xfer->actlen < 2) { goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), 0, buf, 2); + usbd_copy_out(xfer->frbuffers + 0, 0, buf, 2); msr = FTDI_GET_MSR(buf); lsr = FTDI_GET_LSR(buf); @@ -612,7 +612,7 @@ xfer->actlen -= 2; if (xfer->actlen > 0) { - ucom_put_data(&(sc->sc_ucom), &(xfer->buf_data), 2, + ucom_put_data(&(sc->sc_ucom), xfer->frbuffers + 0, 2, xfer->actlen); } case USBD_ST_SETUP: ==== //depot/projects/usb/src/sys/dev/usb/ugen.c#28 (text+ko) ==== @@ -1301,7 +1301,7 @@ if (ptr == NULL) { PRINTFN(5, ("dropping one packet, sce=%p\n", sce)); } else { - usbd_copy_out(&(xfer->buf_data), 0, ptr, xfer->actlen); + usbd_copy_out(xfer->frbuffers + 0, 0, ptr, xfer->actlen); if (xfer->actlen > *plen) { xfer->actlen = *plen; ==== //depot/projects/usb/src/sys/dev/usb/ugensa.c#14 (text+ko) ==== @@ -295,7 +295,7 @@ usbd_transfer_start(ssc->sc_xfer[2]); return; } - if (ucom_get_data(ssc->sc_ucom_ptr, &(xfer->buf_data), 0, + if (ucom_get_data(ssc->sc_ucom_ptr, xfer->frbuffers + 0, 0, UGENSA_BUF_SIZE, &actlen)) { xfer->frlengths[0] = actlen; usbd_start_hardware(xfer); @@ -333,7 +333,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - ucom_put_data(ssc->sc_ucom_ptr, &(xfer->buf_data), 0, + ucom_put_data(ssc->sc_ucom_ptr, xfer->frbuffers + 0, 0, xfer->actlen); case USBD_ST_SETUP: ==== //depot/projects/usb/src/sys/dev/usb/uhid.c#23 (text+ko) ==== @@ -147,7 +147,7 @@ DPRINTF(0, "transferred!\n"); if (xfer->actlen >= sc->sc_isize) { - usb_cdev_put_data(&(sc->sc_cdev), &(xfer->buf_data), + usb_cdev_put_data(&(sc->sc_cdev), xfer->frbuffers + 0, 0, sc->sc_isize, 1); } else { /* ignore it */ @@ -207,12 +207,12 @@ /* try to extract the ID byte */ if (sc->sc_oid) { - if (usb_cdev_get_data(&(sc->sc_cdev), &(xfer->buf_data), + if (usb_cdev_get_data(&(sc->sc_cdev), xfer->frbuffers + 0, 0, 1, &actlen, 0)) { if (actlen != 1) { goto tr_error; } - usbd_copy_out(&(xfer->buf_data), 0, &id, 1); + usbd_copy_out(xfer->frbuffers + 0, 0, &id, 1); } else { return; @@ -258,7 +258,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - usb_cdev_put_data(&(sc->sc_cdev), &(xfer->buf_data), + usb_cdev_put_data(&(sc->sc_cdev), xfer->frbuffers + 0, sizeof(req), sc->sc_isize, 1); return; ==== //depot/projects/usb/src/sys/dev/usb/uipaq.c#12 (text+ko) ==== @@ -409,7 +409,7 @@ usbd_transfer_start(sc->sc_xfer_data[2]); return; } - if (ucom_get_data(&(sc->sc_ucom), &(xfer->buf_data), 0, + if (ucom_get_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, UIPAQ_BUF_SIZE, &actlen)) { xfer->frlengths[0] = actlen; @@ -448,7 +448,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - ucom_put_data(&(sc->sc_ucom), &(xfer->buf_data), 0, + ucom_put_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, xfer->actlen); case USBD_ST_SETUP: ==== //depot/projects/usb/src/sys/dev/usb/ukbd.c#29 (text+ko) ==== @@ -465,7 +465,7 @@ } if (len) { bzero(&(sc->sc_ndata), sizeof(sc->sc_ndata)); - usbd_copy_out(&(xfer->buf_data), 0, &(sc->sc_ndata), len); + usbd_copy_out(xfer->frbuffers + 0, 0, &(sc->sc_ndata), len); #ifdef USB_DEBUG if (sc->sc_ndata.modifiers) { DPRINTF(0, "mod: 0x%04x\n", sc->sc_ndata.modifiers); ==== //depot/projects/usb/src/sys/dev/usb/ulpt.c#32 (text+ko) ==== @@ -128,7 +128,7 @@ usbd_transfer_start(sc->sc_xfer[4]); return; } - if (usb_cdev_get_data(&(sc->sc_cdev), &(xfer->buf_data), 0, + if (usb_cdev_get_data(&(sc->sc_cdev), xfer->frbuffers + 0, 0, xfer->max_data_length, &actlen, 0)) { xfer->frlengths[0] = actlen; @@ -184,7 +184,7 @@ sc->sc_zlps = 0; } - usb_cdev_put_data(&(sc->sc_cdev), &(xfer->buf_data), 0, + usb_cdev_put_data(&(sc->sc_cdev), xfer->frbuffers + 0, 0, xfer->actlen, 1); case USBD_ST_SETUP: ==== //depot/projects/usb/src/sys/dev/usb/umass.c#33 (text+ko) ==== @@ -1878,7 +1878,7 @@ DIF(UDMASS_BBB, umass_bbb_dump_cbw(sc, &sc->cbw)); - usbd_copy_in(&(xfer->buf_data), 0, &(sc->cbw), sizeof(sc->cbw)); + usbd_copy_in(xfer->frbuffers + 0, 0, &(sc->cbw), sizeof(sc->cbw)); xfer->frlengths[0] = sizeof(sc->cbw); usbd_start_hardware(xfer); @@ -1901,7 +1901,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: if (!xfer->flags.bdma_enable) { - usbd_copy_out(&(xfer->buf_data), 0, + usbd_copy_out(xfer->frbuffers + 0, 0, sc->sc_transfer.data_ptr, xfer->actlen); } sc->sc_transfer.data_rem -= xfer->actlen; @@ -1986,7 +1986,7 @@ usbd_set_frame_data(xfer, sc->sc_transfer.data_ptr, max_bulk, 0); } else { - usbd_copy_in(&(xfer->buf_data), 0, + usbd_copy_in(xfer->frbuffers + 0, 0, sc->sc_transfer.data_ptr, max_bulk); } @@ -2032,7 +2032,7 @@ if (xfer->actlen < sizeof(sc->csw)) { bzero(&(sc->csw), sizeof(sc->csw)); } - usbd_copy_out(&(xfer->buf_data), 0, &(sc->csw), xfer->actlen); + usbd_copy_out(xfer->frbuffers + 0, 0, &(sc->csw), xfer->actlen); DIF(UDMASS_BBB, umass_bbb_dump_csw(sc, &(sc->csw))); @@ -2404,7 +2404,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: if (!xfer->flags.bdma_enable) { - usbd_copy_out(&(xfer->buf_data), 0, + usbd_copy_out(xfer->frbuffers + 0, 0, sc->sc_transfer.data_ptr, xfer->actlen); } sc->sc_transfer.data_rem -= xfer->actlen; @@ -2485,7 +2485,7 @@ usbd_set_frame_data(xfer, sc->sc_transfer.data_ptr, max_bulk, 0); } else { - usbd_copy_in(&(xfer->buf_data), 0, + usbd_copy_in(xfer->frbuffers + 0, 0, sc->sc_transfer.data_ptr, max_bulk); } @@ -2527,7 +2527,7 @@ if (xfer->actlen < sizeof(sc->sbl)) { goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), 0, &(sc->sbl), sizeof(sc->sbl)); + usbd_copy_out(xfer->frbuffers + 0, 0, &(sc->sbl), sizeof(sc->sbl)); residue = (sc->sc_transfer.data_len - sc->sc_transfer.actlen); ==== //depot/projects/usb/src/sys/dev/usb/umct.c#23 (text+ko) ==== @@ -411,7 +411,7 @@ DPRINTF(sc, 0, "too short message\n"); goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), 0, buf, sizeof(buf)); + usbd_copy_out(xfer->frbuffers + 0, 0, buf, sizeof(buf)); sc->sc_msr = buf[0]; sc->sc_lsr = buf[1]; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 2 01:02:46 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 921BE16A41A; Sun, 2 Dec 2007 01:02: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 3321A16A418 for ; Sun, 2 Dec 2007 01:02: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 08BAA13C45A for ; Sun, 2 Dec 2007 01:02:46 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB212jp1020314 for ; Sun, 2 Dec 2007 01:02:45 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB212jhI020310 for perforce@freebsd.org; Sun, 2 Dec 2007 01:02:45 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 01:02:45 GMT Message-Id: <200712020102.lB212jhI020310@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 129939 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 01:02:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=129939 Change 129939 by hselasky@hselasky_laptop001 on 2007/12/02 01:02:00 Update UMASS driver; 1) "flags.bdma_enable" was removed. Use "flags.ext_buffer" instead. 2) "usbd_set_frame_data()" does no longer take a length argument. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/umass.c#34 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/umass.c#34 (text+ko) ==== @@ -123,7 +123,7 @@ #if 0 /* this enables loading of virtual buffers into DMA */ -#define UMASS_USB_FLAGS .bdma_enable=1,.ext_buffer=1, +#define UMASS_USB_FLAGS .ext_buffer=1, #else #define UMASS_USB_FLAGS #endif @@ -1900,7 +1900,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - if (!xfer->flags.bdma_enable) { + if (!xfer->flags.ext_buffer) { usbd_copy_out(xfer->frbuffers + 0, 0, sc->sc_transfer.data_ptr, xfer->actlen); } @@ -1926,9 +1926,8 @@ xfer->timeout = sc->sc_transfer.data_timeout; xfer->frlengths[0] = max_bulk; - if (xfer->flags.bdma_enable) { - usbd_set_frame_data(xfer, sc->sc_transfer.data_ptr, - max_bulk, 0); + if (xfer->flags.ext_buffer) { + usbd_set_frame_data(xfer, sc->sc_transfer.data_ptr, 0); } usbd_start_hardware(xfer); return; @@ -1982,9 +1981,8 @@ xfer->timeout = sc->sc_transfer.data_timeout; xfer->frlengths[0] = max_bulk; - if (xfer->flags.bdma_enable) { - usbd_set_frame_data(xfer, sc->sc_transfer.data_ptr, - max_bulk, 0); + if (xfer->flags.ext_buffer) { + usbd_set_frame_data(xfer, sc->sc_transfer.data_ptr, 0); } else { usbd_copy_in(xfer->frbuffers + 0, 0, sc->sc_transfer.data_ptr, max_bulk); @@ -2403,7 +2401,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - if (!xfer->flags.bdma_enable) { + if (!xfer->flags.ext_buffer) { usbd_copy_out(xfer->frbuffers + 0, 0, sc->sc_transfer.data_ptr, xfer->actlen); } @@ -2481,9 +2479,8 @@ } xfer->timeout = sc->sc_transfer.data_timeout; - if (xfer->flags.bdma_enable) { - usbd_set_frame_data(xfer, sc->sc_transfer.data_ptr, - max_bulk, 0); + if (xfer->flags.ext_buffer) { + usbd_set_frame_data(xfer, sc->sc_transfer.data_ptr, 0); } else { usbd_copy_in(xfer->frbuffers + 0, 0, sc->sc_transfer.data_ptr, max_bulk); From owner-p4-projects@FreeBSD.ORG Sun Dec 2 01:04:48 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AB0F16A41B; Sun, 2 Dec 2007 01:04: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 50B7B16A419 for ; Sun, 2 Dec 2007 01:04:48 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3FAA913C447 for ; Sun, 2 Dec 2007 01:04:48 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB214mpp021754 for ; Sun, 2 Dec 2007 01:04:48 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB214mCb021751 for perforce@freebsd.org; Sun, 2 Dec 2007 01:04:48 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 01:04:48 GMT Message-Id: <200712020104.lB214mCb021751@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 129940 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 01:04:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=129940 Change 129940 by hselasky@hselasky_laptop001 on 2007/12/02 01:04:07 "usbd_set_frame_data()" does no longer set the length, only the buffer pointer. The USB P4 project should compile again after this. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#63 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#56 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#63 (text+ko) ==== @@ -764,7 +764,7 @@ void usbd_transfer_start(struct usbd_xfer *xfer); void usbd_transfer_stop(struct usbd_xfer *xfer); void usbd_transfer_drain(struct usbd_xfer *xfer); -void usbd_set_frame_data(struct usbd_xfer *xfer, void *ptr, uint32_t len, uint32_t frindex); +void usbd_set_frame_data(struct usbd_xfer *xfer, void *ptr, uint32_t frindex); void usbd_set_frame_offset(struct usbd_xfer *xfer, uint32_t offset, uint32_t frindex); void usbd_callback_wrapper(struct usbd_xfer *xfer); void usbd_do_callback(struct usbd_xfer **pp_xfer, struct thread *td); ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#56 (text+ko) ==== @@ -1893,18 +1893,16 @@ /*------------------------------------------------------------------------* * usbd_set_frame_data * - * This function sets the pointer and length of data that should + * This function sets the pointer of the buffer that should * loaded directly into DMA for the given USB frame. Passing "ptr" - * equal to NULL while "len" is greater than zero gives undefined - * results! + * equal to NULL while the corresponding "frlength" is greater + * than zero gives undefined results! *------------------------------------------------------------------------*/ void -usbd_set_frame_data(struct usbd_xfer *xfer, void *ptr, uint32_t len, - uint32_t frindex) +usbd_set_frame_data(struct usbd_xfer *xfer, void *ptr, uint32_t frindex) { /* set virtual address to load and length */ xfer->frbuffers[frindex].buffer = ptr; - xfer->frlengths[frindex] = len; return; } From owner-p4-projects@FreeBSD.ORG Sun Dec 2 01:06:51 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05AA916A41A; Sun, 2 Dec 2007 01:06:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B406A16A418 for ; Sun, 2 Dec 2007 01:06:50 +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 A3C5C13C43E for ; Sun, 2 Dec 2007 01:06:50 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB216oxt021893 for ; Sun, 2 Dec 2007 01:06:50 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB216oQG021890 for perforce@freebsd.org; Sun, 2 Dec 2007 01:06:50 GMT (envelope-from gonzo@FreeBSD.org) Date: Sun, 2 Dec 2007 01:06:50 GMT Message-Id: <200712020106.lB216oQG021890@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 129941 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 01:06:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=129941 Change 129941 by gonzo@gonzo_jeeves on 2007/12/02 01:06:35 o Make libthread_db build conditional Affected files ... .. //depot/projects/mips2/src/lib/Makefile#7 edit Differences ... ==== //depot/projects/mips2/src/lib/Makefile#7 (text+ko) ==== @@ -36,7 +36,7 @@ ${_libncp} ${_libngatm} libopie libpam libpcap \ libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ - ${_libsmutil} libstand libtelnet ${_libthr} libthread_db libufs \ + ${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) From owner-p4-projects@FreeBSD.ORG Sun Dec 2 01:10:55 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FD9F16A420; Sun, 2 Dec 2007 01:10:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 22D6916A418 for ; Sun, 2 Dec 2007 01:10:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 12DF013C45D for ; Sun, 2 Dec 2007 01:10:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB21AsP4022276 for ; Sun, 2 Dec 2007 01:10:54 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB21AsSn022273 for perforce@freebsd.org; Sun, 2 Dec 2007 01:10:54 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 01:10:54 GMT Message-Id: <200712020110.lB21AsSn022273@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 129942 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 01:10:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=129942 Change 129942 by hselasky@hselasky_laptop001 on 2007/12/02 01:10:15 Handle the case where "page_start == NULL". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#58 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#58 (text+ko) ==== @@ -1801,12 +1801,22 @@ page = pc->page_start; - page += (offset / USB_PAGE_SIZE); + if (page) { + + page += (offset / USB_PAGE_SIZE); + + offset %= USB_PAGE_SIZE; + + res->length = USB_PAGE_SIZE - offset; + res->physaddr = page->physaddr + offset; + + } else { - offset %= USB_PAGE_SIZE; + offset %= USB_PAGE_SIZE; - res->length = USB_PAGE_SIZE - offset; - res->physaddr = page->physaddr + offset; + res->length = USB_PAGE_SIZE - offset; + res->physaddr = 0; + } return; } From owner-p4-projects@FreeBSD.ORG Sun Dec 2 01:13:59 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D7D8916A41B; Sun, 2 Dec 2007 01:13: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 8821F16A419 for ; Sun, 2 Dec 2007 01:13:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 790DC13C45A for ; Sun, 2 Dec 2007 01:13:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB21DwPa023213 for ; Sun, 2 Dec 2007 01:13:58 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB21Dwtm023210 for perforce@freebsd.org; Sun, 2 Dec 2007 01:13:58 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 01:13:58 GMT Message-Id: <200712020113.lB21Dwtm023210@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 129943 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 01:13:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=129943 Change 129943 by hselasky@hselasky_laptop001 on 2007/12/02 01:13:50 Remove some alignment requirements. We assume that all USB DMA hardware supports byte aligment. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#57 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#57 (text+ko) ==== @@ -403,28 +403,6 @@ } else { /* - * BSD specific requirement: - * - * In case we are transferring more than one USB frame - * consisting of up to 3 USB packets, make sure that the USB - * frame size is divisible by 8. This is supposed to - * optimize the USB Host Controller by avoiding unaligned - * data accesses! - */ - - if (parm->bufsize > xfer->max_frame_size) { - - while (xfer->max_frame_size & 7) { - if (xfer->max_packet_size == parm->hc_max_packet_size) { - /* should not happen */ - parm->err = USBD_INVAL; - goto done; - } - (xfer->max_packet_size)++; - usbd_compute_max_frame_size(xfer); - } - } - /* * if a value is specified use that else check the endpoint * descriptor */ From owner-p4-projects@FreeBSD.ORG Sun Dec 2 01:18:06 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1326216A420; Sun, 2 Dec 2007 01:18: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 44F9516A418 for ; Sun, 2 Dec 2007 01:18:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3464113C448 for ; Sun, 2 Dec 2007 01:18:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB21I5a7023360 for ; Sun, 2 Dec 2007 01:18:05 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB21I491023357 for perforce@freebsd.org; Sun, 2 Dec 2007 01:18:04 GMT (envelope-from jb@freebsd.org) Date: Sun, 2 Dec 2007 01:18:04 GMT Message-Id: <200712020118.lB21I491023357@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129944 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 01:18:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=129944 Change 129944 by jb@jb_freebsd1 on 2007/12/02 01:17:32 IFC Affected files ... .. //depot/projects/binutils/src/ObsoleteFiles.inc#5 integrate .. //depot/projects/binutils/src/include/assert.h#2 integrate .. //depot/projects/binutils/src/lib/libkse/Makefile#2 integrate .. //depot/projects/binutils/src/lib/libkse/arch/amd64/include/atomic_ops.h#2 integrate .. //depot/projects/binutils/src/lib/libkse/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/binutils/src/lib/libkse/arch/arm/include/atomic_ops.h#2 integrate .. //depot/projects/binutils/src/lib/libkse/arch/i386/include/atomic_ops.h#2 integrate .. //depot/projects/binutils/src/lib/libkse/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/binutils/src/lib/libkse/arch/ia64/include/atomic_ops.h#2 integrate .. //depot/projects/binutils/src/lib/libkse/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/binutils/src/lib/libkse/arch/powerpc/include/atomic_ops.h#2 integrate .. //depot/projects/binutils/src/lib/libkse/arch/powerpc/include/pthread_md.h#2 integrate .. //depot/projects/binutils/src/lib/libkse/arch/sparc64/include/atomic_ops.h#2 integrate .. //depot/projects/binutils/src/lib/libkse/arch/sparc64/include/pthread_md.h#2 integrate .. //depot/projects/binutils/src/lib/libkse/sys/lock.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/sys/thr_error.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_accept.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_aio_suspend.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_atfork.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_attr_destroy.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_attr_get_np.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_attr_getdetachstate.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_attr_getguardsize.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_attr_getinheritsched.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_attr_getschedparam.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_attr_getschedpolicy.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_attr_getscope.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_attr_getstack.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_attr_getstackaddr.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_attr_getstacksize.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_attr_init.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_attr_setdetachstate.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_attr_setguardsize.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_attr_setinheritsched.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_attr_setschedparam.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_attr_setschedpolicy.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_attr_setscope.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_attr_setstack.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_attr_setstackaddr.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_attr_setstacksize.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_barrier.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_barrierattr.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_cancel.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_clean.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_close.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_concurrency.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_cond.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_condattr_destroy.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_condattr_init.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_condattr_pshared.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_connect.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_creat.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_create.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_detach.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_equal.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_execve.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_exit.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_fcntl.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_find_thread.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_fork.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_fsync.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_getschedparam.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_info.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_init.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_join.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_kern.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_kill.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_main_np.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_mattr_init.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_mattr_kind_np.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_mattr_pshared.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_msync.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_multi_np.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_mutex.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_mutex_prioceiling.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_mutex_protocol.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_mutexattr_destroy.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_nanosleep.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_once.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_open.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_pause.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_poll.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_priority_queue.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_private.h#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_pselect.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_pspinlock.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_raise.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_read.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_readv.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_resume_np.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_rtld.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_rwlock.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_rwlockattr.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_select.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_self.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_seterrno.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_setprio.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_setschedparam.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_sig.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_sigaction.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_sigaltstack.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_sigmask.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_sigpending.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_sigprocmask.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_sigsuspend.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_sigwait.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_single_np.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_sleep.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_spec.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_spinlock.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_stack.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_suspend_np.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_switch_np.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_symbols.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_system.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_tcdrain.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_vfork.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_wait.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_wait4.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_waitpid.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_write.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_writev.c#2 integrate .. //depot/projects/binutils/src/lib/libkse/thread/thr_yield.c#2 integrate .. //depot/projects/binutils/src/libexec/rtld-elf/sparc64/rtld_machdep.h#2 integrate .. //depot/projects/binutils/src/release/doc/share/sgml/release.ent#3 integrate .. //depot/projects/binutils/src/share/man/man9/Makefile#4 integrate .. //depot/projects/binutils/src/share/man/man9/stack.9#2 integrate .. //depot/projects/binutils/src/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/binutils/src/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/binutils/src/sys/conf/files#4 integrate .. //depot/projects/binutils/src/sys/conf/options.amd64#3 integrate .. //depot/projects/binutils/src/sys/conf/options.i386#3 integrate .. //depot/projects/binutils/src/sys/dev/si/si_pci.c#3 integrate .. //depot/projects/binutils/src/sys/dev/sio/sio_isa.c#2 integrate .. //depot/projects/binutils/src/sys/dev/sio/sio_puc.c#2 integrate .. //depot/projects/binutils/src/sys/dev/usb/if_zyd.c#2 integrate .. //depot/projects/binutils/src/sys/i386/conf/NOTES#3 integrate .. //depot/projects/binutils/src/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/binutils/src/sys/kern/kern_linker.c#4 integrate .. //depot/projects/binutils/src/sys/kern/kern_lock.c#3 integrate .. //depot/projects/binutils/src/sys/kern/kern_sysctl.c#4 integrate .. //depot/projects/binutils/src/sys/kern/subr_bus.c#3 integrate .. //depot/projects/binutils/src/sys/kern/subr_stack.c#2 integrate .. //depot/projects/binutils/src/sys/netgraph/ng_cisco.c#2 integrate .. //depot/projects/binutils/src/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/binutils/src/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/binutils/src/sys/pci/xrpu.c#2 delete .. //depot/projects/binutils/src/sys/sparc64/pci/ofw_pcibus.c#3 integrate .. //depot/projects/binutils/src/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/binutils/src/sys/sparc64/pci/psychovar.h#3 integrate .. //depot/projects/binutils/src/sys/sys/elf_common.h#3 integrate .. //depot/projects/binutils/src/sys/sys/linker.h#3 integrate .. //depot/projects/binutils/src/sys/sys/stack.h#2 integrate .. //depot/projects/binutils/src/sys/sys/sysctl.h#3 integrate .. //depot/projects/binutils/src/sys/sys/xrpuio.h#2 delete .. //depot/projects/binutils/src/sys/ufs/ffs/ffs_alloc.c#4 integrate .. //depot/projects/binutils/src/sys/vm/redzone.c#2 integrate .. //depot/projects/binutils/src/usr.bin/login/login.1#2 integrate Differences ... ==== //depot/projects/binutils/src/ObsoleteFiles.inc#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.122 2007/11/28 23:21:55 jb Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.123 2007/11/29 21:49:08 brooks 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,12 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071129: Disabled static versions of libkse by default +.if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no" +OLD_FILES+=usr/lib/libkse.a +OLD_FILES+=usr/lib/libkse_p.a +OLD_FILES+=usr/lib/libkse_pic.a +.endif # 20071129: Removed a Solaris compatibility header OLD_FILES+=usr/include/sys/_elf_solaris.h # 20071108: Removed very crunch OLDCARD support file ==== //depot/projects/binutils/src/include/assert.h#2 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)assert.h 8.2 (Berkeley) 1/21/94 - * $FreeBSD: src/include/assert.h,v 1.4 2002/03/23 17:24:53 imp Exp $ + * $FreeBSD: src/include/assert.h,v 1.6 2007/12/01 19:28:13 phk Exp $ */ #include @@ -59,6 +59,9 @@ __LINE__, #e)) #endif /* NDEBUG */ +#ifndef _ASSERT_H_ +#define _ASSERT_H_ __BEGIN_DECLS void __assert(const char *, const char *, int, const char *); __END_DECLS +#endif /* !_ASSERT_H_ */ ==== //depot/projects/binutils/src/lib/libkse/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libkse/Makefile,v 1.67 2007/11/20 02:07:28 jb Exp $ +# $FreeBSD: src/lib/libkse/Makefile,v 1.69 2007/11/30 17:20:24 deischen Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -10,12 +10,15 @@ .include -.if (${DEFAULT_THREAD_LIB} == "libkse" || ${MK_LIBTHR} == "no") && \ - ${SHLIBDIR} == "/usr/lib" +.if ${DEFAULT_THREAD_LIB} == "libkse" || ${MK_LIBTHR} == "no" +LIB=kse +.if ${SHLIBDIR} == "/usr/lib" SHLIBDIR= /lib .endif +.else +SHLIB=kse +.endif -LIB=kse SHLIB_MAJOR= 3 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ @@ -25,12 +28,11 @@ CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_ARCH} CFLAGS+=-fno-builtin -CFLAGS+=-fno-strict-aliasing # Uncomment this if you want libkse to contain debug information for # thread locking. CFLAGS+=-D_LOCK_DEBUG -WARNS?=2 +WARNS?=3 # Uncomment this if you want to build a 1:1 threading mode library # however it is no longer strictly conformed to POSIX ==== //depot/projects/binutils/src/lib/libkse/arch/amd64/include/atomic_ops.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/arch/amd64/include/atomic_ops.h,v 1.3 2007/10/09 13:42:22 obrien Exp $ + * $FreeBSD: src/lib/libkse/arch/amd64/include/atomic_ops.h,v 1.4 2007/11/30 17:20:25 deischen Exp $ */ #ifndef _ATOMIC_OPS_H_ @@ -36,7 +36,7 @@ * void atomic_swap64(intptr_t *dst, intptr_t val, intptr_t *res); */ static inline void -atomic_swap64(intptr_t *dst, intptr_t val, intptr_t *res) +atomic_swap64(volatile intptr_t *dst, intptr_t val, intptr_t *res) { __asm __volatile( "xchgq %2, %1; movq %2, %0" @@ -44,7 +44,7 @@ } static inline void -atomic_swap_int(int *dst, int val, int *res) +atomic_swap_int(volatile int *dst, int val, int *res) { __asm __volatile( "xchgl %2, %1; movl %2, %0" @@ -52,6 +52,6 @@ } #define atomic_swap_ptr(d, v, r) \ - atomic_swap64((intptr_t *)(d), (intptr_t)(v), (intptr_t *)(r)) + atomic_swap64((volatile intptr_t *)(d), (intptr_t)(v), (intptr_t *)(r)) #endif ==== //depot/projects/binutils/src/lib/libkse/arch/amd64/include/pthread_md.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/arch/amd64/include/pthread_md.h,v 1.11 2007/10/09 13:42:22 obrien Exp $ + * $FreeBSD: src/lib/libkse/arch/amd64/include/pthread_md.h,v 1.12 2007/11/30 17:20:25 deischen Exp $ */ /* * Machine-dependent thread prototypes/definitions for the thread kernel. @@ -250,7 +250,7 @@ _amd64_restore_context( &tcb->tcb_tmbx.tm_context.uc_mcontext, (intptr_t)&tcb->tcb_tmbx, - (intptr_t *)&kcb->kcb_kmbx.km_curthread); + (intptr_t *)(void *)&kcb->kcb_kmbx.km_curthread); else _amd64_restore_context( &tcb->tcb_tmbx.tm_context.uc_mcontext, ==== //depot/projects/binutils/src/lib/libkse/arch/arm/include/atomic_ops.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/arch/arm/include/atomic_ops.h,v 1.4 2007/10/09 13:42:23 obrien Exp $ + * $FreeBSD: src/lib/libkse/arch/arm/include/atomic_ops.h,v 1.5 2007/11/30 17:20:25 deischen Exp $ */ #ifndef _ATOMIC_OPS_H_ @@ -39,15 +39,15 @@ * void atomic_swap32(intptr_t *dst, intptr_t val, intptr_t *res); */ static inline void -atomic_swap32(intptr_t *dst, intptr_t val, intptr_t *res) +atomic_swap32(volatile intptr_t *dst, intptr_t val, intptr_t *res) { *res = __swp(val, dst); } #define atomic_swap_ptr(d, v, r) \ - atomic_swap32((intptr_t *)d, (intptr_t)v, (intptr_t *)r) + atomic_swap32((volatile intptr_t *)d, (intptr_t)v, (intptr_t *)r) #define atomic_swap_int(d, v, r) \ - atomic_swap32((intptr_t *)d, (intptr_t)v, (intptr_t *)r) + atomic_swap32((volatile intptr_t *)d, (intptr_t)v, (intptr_t *)r) #endif ==== //depot/projects/binutils/src/lib/libkse/arch/i386/include/atomic_ops.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/arch/i386/include/atomic_ops.h,v 1.4 2007/10/09 13:42:23 obrien Exp $ + * $FreeBSD: src/lib/libkse/arch/i386/include/atomic_ops.h,v 1.5 2007/11/30 17:20:25 deischen Exp $ */ #ifndef _ATOMIC_OPS_H_ @@ -36,7 +36,7 @@ * void atomic_swap32(intptr_t *dst, intptr_t val, intptr_t *res); */ static inline void -atomic_swap32(intptr_t *dst, intptr_t val, intptr_t *res) +atomic_swap32(volatile intptr_t *dst, intptr_t val, intptr_t *res) { __asm __volatile( "xchgl %2, %1; movl %2, %0" @@ -44,8 +44,8 @@ } #define atomic_swap_ptr(d, v, r) \ - atomic_swap32((intptr_t *)d, (intptr_t)v, (intptr_t *)r) + atomic_swap32((volatile intptr_t *)d, (intptr_t)v, (intptr_t *)r) #define atomic_swap_int(d, v, r) \ - atomic_swap32((intptr_t *)d, (intptr_t)v, (intptr_t *)r) + atomic_swap32((volatile intptr_t *)d, (intptr_t)v, (intptr_t *)r) #endif ==== //depot/projects/binutils/src/lib/libkse/arch/i386/include/pthread_md.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/arch/i386/include/pthread_md.h,v 1.17 2007/10/09 13:42:23 obrien Exp $ + * $FreeBSD: src/lib/libkse/arch/i386/include/pthread_md.h,v 1.18 2007/11/30 17:20:25 deischen Exp $ */ /* * Machine-dependent thread prototypes/definitions for the thread kernel. @@ -246,7 +246,7 @@ if (setmbox != 0) _thr_setcontext(&tcb->tcb_tmbx.tm_context.uc_mcontext, (intptr_t)&tcb->tcb_tmbx, - (intptr_t *)&kcb->kcb_kmbx.km_curthread); + (intptr_t *)(void *)&kcb->kcb_kmbx.km_curthread); else _thr_setcontext(&tcb->tcb_tmbx.tm_context.uc_mcontext, 0, NULL); ==== //depot/projects/binutils/src/lib/libkse/arch/ia64/include/atomic_ops.h#2 (text+ko) ==== @@ -23,25 +23,25 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/arch/ia64/include/atomic_ops.h,v 1.2 2007/10/09 13:42:24 obrien Exp $ + * $FreeBSD: src/lib/libkse/arch/ia64/include/atomic_ops.h,v 1.3 2007/11/30 17:20:25 deischen Exp $ */ #ifndef _ATOMIC_OPS_H_ #define _ATOMIC_OPS_H_ static inline void -atomic_swap_int(int *dst, int val, int *res) +atomic_swap_int(volatile int *dst, int val, int *res) { __asm("xchg4 %0=[%2],%1" : "=r"(*res) : "r"(val), "r"(dst)); } static inline void -atomic_swap_long(long *dst, long val, long *res) +atomic_swap_long(volatile long *dst, long val, long *res) { __asm("xchg8 %0=[%2],%1" : "=r"(*res) : "r"(val), "r"(dst)); } #define atomic_swap_ptr(d,v,r) \ - atomic_swap_long((long*)d, (long)v, (long*)r) + atomic_swap_long((volatile long *)d, (long)v, (long *)r) #endif /* _ATOMIC_OPS_H_ */ ==== //depot/projects/binutils/src/lib/libkse/arch/ia64/include/pthread_md.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/arch/ia64/include/pthread_md.h,v 1.19 2007/10/09 13:42:24 obrien Exp $ + * $FreeBSD: src/lib/libkse/arch/ia64/include/pthread_md.h,v 1.20 2007/12/01 14:23:29 rwatson Exp $ */ #ifndef _PTHREAD_MD_H_ @@ -73,7 +73,7 @@ }; static __inline struct tcb * -ia64_get_tcb() +ia64_get_tcb(void) { register char *tp __asm("%r13"); ==== //depot/projects/binutils/src/lib/libkse/arch/powerpc/include/atomic_ops.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/arch/powerpc/include/atomic_ops.h,v 1.2 2007/10/09 13:42:24 obrien Exp $ + * $FreeBSD: src/lib/libkse/arch/powerpc/include/atomic_ops.h,v 1.3 2007/11/30 17:20:25 deischen Exp $ */ #ifndef _ATOMIC_OPS_H_ @@ -37,7 +37,7 @@ * void atomic_swap32(intptr_t *dst, intptr_t val, intptr_t *res); */ static inline void -atomic_swap32(intptr_t *dst, intptr_t val, intptr_t *res) +atomic_swap32(volatile intptr_t *dst, intptr_t val, intptr_t *res) { int tmp; @@ -55,8 +55,8 @@ } #define atomic_swap_ptr(d, v, r) \ - atomic_swap32((intptr_t *)d, (intptr_t)v, (intptr_t *)r) + atomic_swap32((volatile intptr_t *)d, (intptr_t)v, (intptr_t *)r) #define atomic_swap_int(d, v, r) \ - atomic_swap32((intptr_t *)d, (intptr_t)v, (intptr_t *)r) + atomic_swap32((volatile intptr_t *)d, (intptr_t)v, (intptr_t *)r) #endif ==== //depot/projects/binutils/src/lib/libkse/arch/powerpc/include/pthread_md.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/arch/powerpc/include/pthread_md.h,v 1.7 2007/10/09 13:42:24 obrien Exp $ + * $FreeBSD: src/lib/libkse/arch/powerpc/include/pthread_md.h,v 1.9 2007/12/01 14:23:29 rwatson Exp $ */ /* @@ -90,7 +90,7 @@ #define TP_OFFSET 0x7008 static __inline char * -ppc_get_tp() +ppc_get_tp(void) { register char *r2 __asm__("%r2"); @@ -105,7 +105,7 @@ } static __inline struct tcb * -ppc_get_tcb() +ppc_get_tcb(void) { return ((struct tcb *)(ppc_get_tp() - offsetof(struct tcb, tcb_tp))); } @@ -280,7 +280,7 @@ tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp; if (setmbox) _ppc32_setcontext(mc, (intptr_t)&tcb->tcb_tmbx, - (intptr_t *)&kcb->kcb_kmbx.km_curthread); + (intptr_t *)(void *)&kcb->kcb_kmbx.km_curthread); else _ppc32_setcontext(mc, 0, NULL); } ==== //depot/projects/binutils/src/lib/libkse/arch/sparc64/include/atomic_ops.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/arch/sparc64/include/atomic_ops.h,v 1.2 2007/10/09 13:42:25 obrien Exp $ + * $FreeBSD: src/lib/libkse/arch/sparc64/include/atomic_ops.h,v 1.3 2007/11/30 17:20:26 deischen Exp $ */ #ifndef _ATOMIC_OPS_H_ @@ -38,7 +38,7 @@ * void atomic_swap_long(long *dst, long val, long *res); */ static __inline void -atomic_swap_long(long *dst, long val, long *res) +atomic_swap_long(volatile long *dst, long val, long *res) { long tmp; long r; @@ -54,7 +54,7 @@ } static __inline void -atomic_swap_int(int *dst, int val, int *res) +atomic_swap_int(volatile int *dst, int val, int *res) { int tmp; int r; @@ -70,6 +70,6 @@ } #define atomic_swap_ptr(dst, val, res) \ - atomic_swap_long((long *)dst, (long)val, (long *)res) + atomic_swap_long((volatile long *)dst, (long)val, (long *)res) #endif ==== //depot/projects/binutils/src/lib/libkse/arch/sparc64/include/pthread_md.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/arch/sparc64/include/pthread_md.h,v 1.6 2007/10/09 13:42:25 obrien Exp $ + * $FreeBSD: src/lib/libkse/arch/sparc64/include/pthread_md.h,v 1.7 2007/11/30 17:20:26 deischen Exp $ */ /* @@ -237,7 +237,7 @@ tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp; if (setmbox) _thr_setcontext(mc, (intptr_t)&tcb->tcb_tmbx, - (intptr_t *)&kcb->kcb_kmbx.km_curthread); + (intptr_t *)(void *)&kcb->kcb_kmbx.km_curthread); else _thr_setcontext(mc, 0, NULL); } else { ==== //depot/projects/binutils/src/lib/libkse/sys/lock.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/sys/lock.c,v 1.12 2007/11/27 03:16:43 jasone Exp $ + * $FreeBSD: src/lib/libkse/sys/lock.c,v 1.13 2007/11/30 17:20:26 deischen Exp $ */ #include @@ -178,11 +178,12 @@ * Atomically swap the head of the lock request with * this request. */ - atomic_swap_ptr(&lck->l_head, lu->lu_myreq, &lu->lu_watchreq); + atomic_swap_ptr((void *)&lck->l_head, lu->lu_myreq, + (void *)&lu->lu_watchreq); if (lu->lu_watchreq->lr_locked != 0) { atomic_store_rel_ptr - ((volatile uintptr_t *)&lu->lu_watchreq->lr_watcher, + ((volatile uintptr_t *)(void *)&lu->lu_watchreq->lr_watcher, (uintptr_t)lu); if ((lck->l_wait == NULL) || ((lck->l_type & LCK_ADAPTIVE) == 0)) { @@ -214,7 +215,7 @@ if (lu->lu_watchreq->lr_active == 0) break; } - atomic_swap_int((int *)&lu->lu_watchreq->lr_locked, + atomic_swap_int(&lu->lu_watchreq->lr_locked, 2, &lval); if (lval == 0) lu->lu_watchreq->lr_locked = 0; @@ -253,18 +254,19 @@ /* Update tail if our request is last. */ if (lu->lu_watchreq->lr_owner == NULL) { - atomic_store_rel_ptr((volatile uintptr_t *)&lck->l_tail, + atomic_store_rel_ptr((volatile uintptr_t *) + (void *)&lck->l_tail, (uintptr_t)lu->lu_myreq); - atomic_store_rel_ptr - ((volatile uintptr_t *)&lu->lu_myreq->lr_owner, + atomic_store_rel_ptr((volatile uintptr_t *) + (void *)&lu->lu_myreq->lr_owner, (uintptr_t)NULL); } else { /* Remove ourselves from the list. */ atomic_store_rel_ptr((volatile uintptr_t *) - &lu->lu_myreq->lr_owner, + (void *)&lu->lu_myreq->lr_owner, (uintptr_t)lu->lu_watchreq->lr_owner); atomic_store_rel_ptr((volatile uintptr_t *) - &lu->lu_watchreq->lr_owner->lu_myreq, + (void *)&lu->lu_watchreq->lr_owner->lu_myreq, (uintptr_t)lu->lu_myreq); } /* @@ -293,7 +295,7 @@ /* Give the lock to the highest priority user. */ if (lck->l_wakeup != NULL) { atomic_swap_int( - (int *)&lu_h->lu_watchreq->lr_locked, + &lu_h->lu_watchreq->lr_locked, 0, &lval); if (lval == 2) /* Notify the sleeper */ @@ -305,7 +307,7 @@ &lu_h->lu_watchreq->lr_locked, 0); } else { if (lck->l_wakeup != NULL) { - atomic_swap_int((int *)&myreq->lr_locked, + atomic_swap_int(&myreq->lr_locked, 0, &lval); if (lval == 2) /* Notify the sleeper */ @@ -326,7 +328,7 @@ lu->lu_watchreq = NULL; lu->lu_myreq->lr_locked = 1; if (lck->l_wakeup) { - atomic_swap_int((int *)&myreq->lr_locked, 0, &lval); + atomic_swap_int(&myreq->lr_locked, 0, &lval); if (lval == 2) /* Notify the sleeper */ lck->l_wakeup(lck, myreq->lr_watcher); @@ -339,7 +341,7 @@ } void -_lock_grant(struct lock *lck /* unused */, struct lockuser *lu) +_lock_grant(struct lock *lck __unused /* unused */, struct lockuser *lu) { atomic_store_rel_int(&lu->lu_watchreq->lr_locked, 3); } ==== //depot/projects/binutils/src/lib/libkse/sys/thr_error.c#2 (text+ko) ==== @@ -31,8 +31,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/sys/thr_error.c,v 1.10 2007/10/09 13:42:26 obrien Exp $ + * $FreeBSD: src/lib/libkse/sys/thr_error.c,v 1.11 2007/11/30 17:20:26 deischen Exp $ */ +#include #include #include "libc_private.h" #include "thr_private.h" ==== //depot/projects/binutils/src/lib/libkse/thread/thr_accept.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libkse/thread/thr_accept.c,v 1.4 2007/10/09 13:42:27 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libkse/thread/thr_accept.c,v 1.5 2007/11/30 17:20:26 deischen Exp $"); #include #include @@ -35,6 +35,9 @@ LT10_COMPAT_PRIVATE(__accept); LT10_COMPAT_DEFAULT(accept); +int __accept(int s, struct sockaddr *addr, socklen_t *addrlen); + + __weak_reference(__accept, accept); int ==== //depot/projects/binutils/src/lib/libkse/thread/thr_aio_suspend.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_aio_suspend.c,v 1.10 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_aio_suspend.c,v 1.11 2007/11/30 17:20:26 deischen Exp $ */ #include @@ -36,6 +36,11 @@ LT10_COMPAT_PRIVATE(_aio_suspend); LT10_COMPAT_DEFAULT(aio_suspend); + +int +_aio_suspend(const struct aiocb * const iocbs[], int niocb, const struct + timespec *timeout); + __weak_reference(_aio_suspend, aio_suspend); int ==== //depot/projects/binutils/src/lib/libkse/thread/thr_atfork.c#2 (text+ko) ==== @@ -23,12 +23,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_atfork.c,v 1.3 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_atfork.c,v 1.4 2007/11/30 17:20:26 deischen Exp $ */ +#include "namespace.h" #include #include #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_atfork); ==== //depot/projects/binutils/src/lib/libkse/thread/thr_attr_destroy.c#2 (text+ko) ==== @@ -26,11 +26,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_attr_destroy.c,v 1.10 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_attr_destroy.c,v 1.11 2007/11/30 17:20:26 deischen Exp $ */ +#include "namespace.h" #include #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_destroy); ==== //depot/projects/binutils/src/lib/libkse/thread/thr_attr_get_np.c#2 (text+ko) ==== @@ -23,12 +23,15 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_attr_get_np.c,v 1.6 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_attr_get_np.c,v 1.7 2007/11/30 17:20:26 deischen Exp $ */ + +#include "namespace.h" #include #include #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_get_np); ==== //depot/projects/binutils/src/lib/libkse/thread/thr_attr_getdetachstate.c#2 (text+ko) ==== @@ -26,10 +26,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_attr_getdetachstate.c,v 1.10 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_attr_getdetachstate.c,v 1.11 2007/11/30 17:20:26 deischen Exp $ */ +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_getdetachstate); ==== //depot/projects/binutils/src/lib/libkse/thread/thr_attr_getguardsize.c#2 (text+ko) ==== @@ -26,11 +26,13 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_attr_getguardsize.c,v 1.4 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_attr_getguardsize.c,v 1.5 2007/11/30 17:20:26 deischen Exp $ */ +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_getguardsize); ==== //depot/projects/binutils/src/lib/libkse/thread/thr_attr_getinheritsched.c#2 (text+ko) ==== @@ -29,10 +29,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_attr_getinheritsched.c,v 1.9 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_attr_getinheritsched.c,v 1.10 2007/11/30 17:20:26 deischen Exp $ */ + +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_getinheritsched); ==== //depot/projects/binutils/src/lib/libkse/thread/thr_attr_getschedparam.c#2 (text+ko) ==== @@ -29,10 +29,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_attr_getschedparam.c,v 1.9 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_attr_getschedparam.c,v 1.10 2007/11/30 17:20:26 deischen Exp $ */ + +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_getschedparam); ==== //depot/projects/binutils/src/lib/libkse/thread/thr_attr_getschedpolicy.c#2 (text+ko) ==== @@ -29,10 +29,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_attr_getschedpolicy.c,v 1.9 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_attr_getschedpolicy.c,v 1.10 2007/11/30 17:20:26 deischen Exp $ */ + +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_getschedpolicy); ==== //depot/projects/binutils/src/lib/libkse/thread/thr_attr_getscope.c#2 (text+ko) ==== @@ -29,10 +29,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_attr_getscope.c,v 1.9 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_attr_getscope.c,v 1.10 2007/11/30 17:20:26 deischen Exp $ */ + +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_getscope); ==== //depot/projects/binutils/src/lib/libkse/thread/thr_attr_getstack.c#2 (text+ko) ==== @@ -29,10 +29,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_attr_getstack.c,v 1.3 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_attr_getstack.c,v 1.4 2007/11/30 17:20:26 deischen Exp $ */ + +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_getstack); ==== //depot/projects/binutils/src/lib/libkse/thread/thr_attr_getstackaddr.c#2 (text+ko) ==== @@ -26,10 +26,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_attr_getstackaddr.c,v 1.10 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_attr_getstackaddr.c,v 1.11 2007/11/30 17:20:26 deischen Exp $ */ + +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_getstackaddr); ==== //depot/projects/binutils/src/lib/libkse/thread/thr_attr_getstacksize.c#2 (text+ko) ==== @@ -26,10 +26,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_attr_getstacksize.c,v 1.10 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_attr_getstacksize.c,v 1.11 2007/11/30 17:20:26 deischen Exp $ */ + +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_getstacksize); ==== //depot/projects/binutils/src/lib/libkse/thread/thr_attr_init.c#2 (text+ko) ==== @@ -26,12 +26,15 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_attr_init.c,v 1.13 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_attr_init.c,v 1.14 2007/11/30 17:20:26 deischen Exp $ */ + +#include "namespace.h" #include #include #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_init); ==== //depot/projects/binutils/src/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#2 (text+ko) ==== @@ -26,15 +26,20 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_attr_setcreatesuspend_np.c,v 1.11 2007/10/09 13:42:27 obrien Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_attr_setcreatesuspend_np.c,v 1.12 2007/11/30 17:20:26 deischen Exp $ */ + +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_setcreatesuspend_np); LT10_COMPAT_DEFAULT(pthread_attr_setcreatesuspend_np); +int _pthread_attr_setcreatesuspend_np(pthread_attr_t *attr); + __weak_reference(_pthread_attr_setcreatesuspend_np, pthread_attr_setcreatesuspend_np); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 2 01:20:08 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83CE316A41A; Sun, 2 Dec 2007 01:20: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 3385A16A418 for ; Sun, 2 Dec 2007 01:20:08 +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 246AA13C44B for ; Sun, 2 Dec 2007 01:20:08 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB21K841023495 for ; Sun, 2 Dec 2007 01:20:08 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB21K7NT023487 for perforce@freebsd.org; Sun, 2 Dec 2007 01:20:07 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 2 Dec 2007 01:20:07 GMT Message-Id: <200712020120.lB21K7NT023487@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 129945 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 01:20:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=129945 Change 129945 by pgj@disznohal on 2007/12/02 01:19:06 Add initial Hungarian translation of Chapter 2: Installing FreeBSD. Raw translation of Part I is completed. Affected files ... .. //depot/projects/docproj_hu/books/handbook/install/chapter.sgml#3 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/install/chapter.sgml#3 (text+ko) ==== @@ -4,14 +4,18 @@ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.384 2007/11/02 15:48:54 keramida Exp $ --> - + + + Jim Mock - Restructured, reorganized, and parts - rewritten by + Átszervezte, átrendezte és egyes + részeit újraírta: @@ -19,102 +23,128 @@ Randy Pratt - The sysinstall walkthrough, screenshots, and general - copy by + A sysinstall bemutatása, ábrái + és bemásolása: - - Installing FreeBSD + A &os; telepítése - Synopsis + Áttekintés - installation + telepítés - FreeBSD is provided with a text-based, easy to use installation - program called sysinstall. This is the - default installation program for FreeBSD, although vendors are free to - provide their own installation suite if they wish. This chapter - describes how to use sysinstall to install - FreeBSD. + A &os; telepítéséhez egy könnyen + használható szöveges telepítõprogram, + a sysinstall használható. + Ez a &os; alapértelmezett telepítõprogramja, + habár ezt a különféle + gyártók kedvük szerint lecserélhetik. + Ebben a fejezetben bemutatjuk a &os; + sysinstall + segítségével történõ + telepítését. - After reading this chapter, you will know: + A fejezet elolvasása során + megismerjük: - How to create the FreeBSD installation disks. + Hogyan készítsünk + telepítõlemezeket a &os;-hez - + - How FreeBSD refers to, and subdivides, your hard disks. + A &os; miként hivatkozza és osztja fel a + merevlemezeinket - How to start sysinstall. + Hogyan indítsuk el a + sysinstallt - The questions sysinstall will ask - you, what they mean, and how to answer them. + Milyen kérdéseket tesz fel nekünk a + sysinstall, mire gondol, hogyan is + kell azokat megválaszolni - Before reading this chapter, you should: + A fejezet elolvasásához ajánlott: - Read the supported hardware list that shipped with the version - of FreeBSD you are installing, and verify that your hardware is - supported. + A telepítõ &os; verzióhoz + tartozó támogatott hardvereket felsoroló + lista átolvasása és benne a saját + hardvereszközeink ellenõrzése - In general, these installation instructions are written - for &i386; (PC compatible) architecture - computers. Where applicable, instructions specific to other - platforms (for example, Alpha) will be listed. Although this - guide is kept as up to date as possible, you may find minor - differences between the installer and what is shown here. It is - suggested that you use this chapter as a general guide rather - than a literal installation manual. + Általánosan elmondható, hogy a most + következõ telepítési + utasítások az &i386; (PC + kompatibilis) architektúrájú + számítógépekre vonatkoznak. + Helyenként más platformokra (például + Alpha) vonatkozó utasítások is szerepelnek, + amennyiben erre szükség lenne. Habár ezt a + leírás igyekszünk a lehetõ legjobban + naprakészen tartani, elképzelhetõ, hogy + felfedezünk kisebb eltérésket a + telepítõben és az itt leírtak + közt. Ezért ezt a fejezetet inkább egy + általános útmutatóként + javasoljuk, nem pedig egy szószerint + értelmezendõ kézikönyvnek. - Hardware Requirements + Hardverkövetelmények - Minimal Configuration + Minimális konfiguráció - The minimal configuration to install &os; varies with the - &os; version and the hardware architecture. + A &os; telepítéséhez + szükséges minimális konfiguráció + &os; verziónként és + architektúránként + eltérõ. - Information about the minimal configuration is - available in the Installation Notes on the Release - Information page of the &os; web site. A summary of - this information is given in the following sections. - Depending on the method you choose to install &os;, you may - also need a floppy drive, a supported CDROM drive, and in some - case a network adapter. This will be covered by the . + A minimális konfigurációt a &os; + honlapján a kiadásokról + szóló oldalon, az Installation + Notes részben találhatjuk meg. Ezt a + következõ szakaszokban foglaljuk össze. A &os; + telepítésének + módszerétõl függõen + szükségünk lehet egy hajlékonylemezes + (floppy) vagy CD-ROM meghajtóra, esetleg egy + hálózati kártyára. Ezt a ban tárgyaljuk. - &os;/&arch.i386; and &os;/&arch.pc98; + &os;/&arch.i386; és &os;/&arch.pc98; - Both &os;/&arch.i386; and &os;/&arch.pc98; require a 486 or - better processor and at least 24 MB of RAM. You will - need at least 150 MB of free hard drive space for the - most minimal installation. + A &os;/&arch.i386; és &os;/&arch.pc98; + egyaránt egy 486 vagy jobb processzort és + legalább 24 MB memóriát + igényel. A legkisebb telepítéshez + legalább 150 MB szabad lemezterület + szükséges. - In case of old configurations, most of time, getting - more RAM and more hard drive space is more important than - getting a faster processor. + Régebbi konfigurációk esetén + többnyire inkább a több memória ill. + lemezterület beszerzése sokkal fontosabb, mint + egy gyorsabb processzor. @@ -123,196 +153,201 @@ Alpha - To install &os;/&arch.alpha;, you will need a supported - platform (see ) - and a dedicated disk for &os;. It is not possible to share - a disk with another operating system at this time. This - disk will need to be attached to a SCSI controller which is - supported by the SRM firmware or an IDE disk assuming the - SRM in your machine supports booting from IDE disks. + A &os;/&arch.alpha; telepítéséhez egy + ismert platformra (ld. ), valamint a &os;-nek + szánt külön lemezre van + szükségünk. Pillanatnyilag nem + lehetséges más operációs + rendszerekkel megosztani a lemezeket. A lemezt egy olyan + SCSI-vezérlõre kell csatlakoztatnunk, amelyet + támogat az SRM firmware-je, vagy használhatunk + IDE-lemezeket is, feltéve, hogy az SRM tud róluk + rendszert indítani. ARC Alpha BIOS SRM - You will need the SRM console firmware for your - platform. In some cases, it is possible to switch between - AlphaBIOS (or ARC) firmware and SRM. In others it will be - necessary to download new firmware from the vendor's Web - site. + Szükségünk lesz a platformunkon az SRM + konzol firmware-jére. Sok esetben tudunk váltani + az AlphaBIOS (vagy ARC) és az SRM firmware-je + között. Minden más helyzetben le kell + töltenünk egy új firmware-t a + gyártó honlapjáról. - Support for the Alpha was removed beginning with - &os; 7.0. The - &os; 6.X series of - releases is the last containing support for this - architecture. + Az Alpha támogatás a &os; 7.0 + beindulásával eltávolításra + került. A &os; 6.X + sorozat az utolsó, amely valamilyen + támogatást ajánl ehhez az + architektúrához. - &os;/&arch.amd64; Architecture + A &os;/&arch.amd64; architektúra - There are two classes of processors capable of running - &os;/&arch.amd64;. The first are AMD64 processors, - including the &amd.athlon;64, - &amd.athlon;64-FX, &amd.opteron; or better - processors. + Két típusú processzor képes + futtatni a &os;/&arch.amd64; verzióját. Az + elsõ ezek közül az AMD64 processzorok, + beleértve az &amd.athlon;64, &amd.athlon;64-FX, + &amd.opteron; vagy újabb processzorokat. - The second class of processors that can use - &os;/&arch.amd64; includes those using the &intel; EM64T - architecture. Examples of these processors include the - &intel; &core; 2 Duo, Quad, and Extreme processor - families and the &intel; &xeon; 3000, 5000, and 7000 - sequences of processors. + A &os;/&arch.amd64; verzióját + kihasználni képes processzorok másik + csoportja az &intel; EM64T + architektúrájára épülõ + processzorok. Ilyen processzor például az + &intel; &core; 2 Dua, Quad és Extreme + processzorcsaládok, valamint az &intel; &xeon; + 3000, 5000 és 7000 sorozatszámú + processzorai. - If you have a machine based on an nVidia nForce3 - Pro-150, you must use the BIOS setup to - disable the IO APIC. If you do not have an option to do - this, you will likely have to disable ACPI instead. There - are bugs in the Pro-150 chipset that we have not found a - workaround for yet. + Ha nVidia nForce3 Pro-150 alapú géppel + rendelkezük, ki kell kapcsolnunk a + BIOS-ban az IO APIC használatát. Ha nem + találnánk ilyen beállítást, + akkor helyette az ACPI-t kell kikapcsolnunk. A Pro-150 + chipsetnek vannak bizonyos hibái, amire eddig + még nem találtunk megfelelõ + megoldást. &os;/&arch.sparc64; - To install &os;/&arch.sparc64;, you will need a supported - platform (see ). + A &os;/&arch.sparc64; telepítéséhez + egy támogatott platformra van szükségünk + (ld. ). - You will need a dedicated disk for &os;/&arch.sparc64;. It - is not possible to share a disk with another operating - system at this time. + A &os;/&arch.sparc64; telepítéséhez + egy egész lemezre lesz szükségünk, mivel + a rendszer jelenleg nem képes megosztani azt más + operációs rendszerekkel. - Supported Hardware + Támogatott hardverek - A list of supported hardware is provided with each &os; - release in the &os; Hardware Notes. This document can usually - be found in a file named HARDWARE.TXT, in - the top-level directory of a CDROM or FTP distribution or in - sysinstall's documentation menu. - It lists, for a given architecture, what hardware devices are - known to be supported by each release of &os;. Copies of the - supported hardware list for various releases and architectures - can also be found on the Release - Information page of the &os; Web site. + A &os; minden kiadásához mellékelik a + támogatott hardverek listáját &os; + Hardware Notes címmel. Ezt a dokumentum + többnyire egy HARDWARE.TXT nevû + állomány, amelyet a rendszer CD-n vagy FTP-n + keresztül elérhetõ változatának + gyökerében vagy a + sysinstall + dokumentációkat tartalmazó + menüjében találhatunk meg. - Pre-installation Tasks + A telepítés elõtt elvégzendõ + feladatok - Inventory Your Computer + Készítsünk leltárt a + számítógépünkrõl - Before installing FreeBSD you should attempt to inventory the - components in your computer. The FreeBSD installation routines will - show you the components (hard disks, network cards, CDROM drives, and - so forth) with their model number and manufacturer. FreeBSD will also - attempt to determine the correct configuration for these devices, - which includes information about IRQ and IO port usage. Due to the - vagaries of PC hardware this process is not always completely - successful, and you may need to correct FreeBSD's determination of - your configuration. + A &os; telepítése elõtt érdemes + összeszedni, pontosan mi minden is található + a számítógépünkben. A &os; + telepítõrutinjai mutatni fogják a + különbözõ komponensek (merevlemezek, + hálózati kártyák, + CD-meghajtók és a többi) modelljét + és gyártóját. A &os; + ezenkívü megpróbálja kideríteni + a megjelenõ eszközök pontos + konfigurációját is, beleértve a + használt IRQ és IO portok + kiosztását. A PC-s hardverek + különféle szeszélyei miatt azonban ez az + iménti folyamat nem minden esetben + megbízható, ezért elõfordulhat, hogy + helyesbíteni kell a &os; által + megállapított értékeket. - If you already have another operating system installed, such as - &windows; or Linux, it is a good idea to use the facilities provided - by those operating systems to see how your hardware is already - configured. If you are not sure what settings an expansion - card is using, you may find it printed on the card itself. Popular IRQ - numbers are 3, 5, and 7, and IO port addresses are normally written as - hexadecimal numbers, such as 0x330. + Ha már van gépünkön egy másik + operációs rendszer, mondjuk &windows; vagy + &linux;, akkor mindenképpen hasznos lehet az + általa felkínált eszközökkel + lekérdezni a hardvereink + beállításait. Ha nem lennénk + biztosak benne, hogy az adott + bõvítõkártyákat pontosan milyen + beállításokkal is használjuk, + nézzük meg magán a kártyán. A + népszerû IRQ értékék + általában a 3, 5 és 7, valamint az IO + portok számát általában tizenhatos + számrendszerben szerepeltetik, pl. 0x330. - We recommend you print or write down this information before - installing FreeBSD. It may help to use a table, like this: + Javasoljuk, hogy nyomtassuk ki vagy írjuk le ezeket a + paramétereket a &os; telepítése elõtt. + Ehhez rendezzük õket egy táblázatban, + valahogy így: - Sample Device Inventory + Példa egy eszközleltárra - - - - + + + + - Device Name - + Eszköz neve IRQ - - IO port(s) - - Notes + IO port(ok) + Megjegyzés - - First hard disk - - N/A - - N/A - - 40 GB, made by Seagate, first IDE master + Elsõ merevlemez + - + - + Mérete 40 GB, gyártmánya + Seagate, elsõdleges IDE master - - CDROM - - N/A - - N/A - - First IDE slave + CD-ROM meghajtó + - + - + Elsõdleges IDE slave - - Second hard disk - - N/A - - N/A - - 20 GB, made by IBM, second IDE master + Második merevlemez + - + - + Mérete 20 GB, gyártmánya + IBM, másodlagos IDE master - - First IDE controller - + Elsõ IDE vezérlõ 14 - 0x1f0 - - - Network card - - N/A - - N/A - + Hálózati kártya + - + - &intel; 10/100 - Modem - - N/A - - N/A - - &tm.3com; 56K faxmodem, on COM1 + - + - + &tm.3com; 56K faxmodem, COM1 - … @@ -320,154 +355,246 @@
- Once the inventory of the components in your computer is - done, you have to check if they match the hardware - requirements of the &os; release you want to install. + Ahogy elkészítettük a + számítógépünk alkatrészeit + tartalmazó listát, vessük õket + össze a telepítendõ &os; kiadás + által megkövetelt eszközökkel. - Backup Your Data - - If the computer you will be installing FreeBSD on contains - valuable data, then ensure you have it backed up, and that you have - tested the backups before installing FreeBSD. The FreeBSD - installation routine will prompt you before writing any - data to your disk, but once that process has started it cannot be - undone. + Mentsük le az adatainkat + + Amennyiben a &os; telepítéséhez + használt számítógép + számunkra értékes adatokat tárol, + igyekezzünk lementeni õket, és a &os; + tényleges telepítése elõtt + gyõzõdjünk is meg róla, hogy a + mentés sikeres volt. A &os; telepítõrutinjai + természetesen megerõsítést fognak + kérni bármilyen adat lemezre írása + elõtt, azonban ha egyszer már elindítottuk a + folyamatot, már semmit sem lehet + visszafordítani. - Decide Where to Install FreeBSD + Döntsük el a &os; + telepítésének helyét - If you want FreeBSD to use your entire hard disk, then there is nothing - more to concern yourself with at this point — you can skip this - section. + Ha a &os; telepítéséhez az egész + merevlemezünket fel akarjuk használni, akkor + még nincs miért izgatnunk magunkat — + nyugodtan átléphetjük ezt a szakaszt. - However, if you need FreeBSD to co-exist with other operating - systems then you need to have a rough understanding of how data is - laid out on the disk, and how this affects you. + Azonban ha a &os;-t más operációs + rendszerek mellé szeretnénk telepíteni, + ismernünk kell, miként is helyezkednek el az adatok + a lemezeken és ez miként is érint + bennünket. - Disk Layouts for &os;/&arch.i386; + A lemezek kiosztása a &os;/&arch.i386; + esetén - A PC disk can be divided into discrete chunks. These chunks are - called partitions. Since - &os; internally also has partitions, the naming - can become confusing very quickly, therefore these - disk chunks are referred to as disk slices or simply slices - in &os; itself. For example, the FreeBSD utility - fdisk which operates on the PC disk partitions, - refers to slices instead of partitions. By design, the PC only - supports four partitions per disk. These partitions are called - primary partitions. To work around this - limitation and allow more than four partitions, a new partition type - was created, the extended partition. A disk - may contain only one extended partition. Special partitions, called - logical partitions, can be created inside this - extended partition. + A PC-k által használt lemezek + különálló darabokra tagolhatóak. + Ezeket a darabokat + partícióknak nevezzük. + Mivel azonban &os; saját maga szintén tárol + partíciókat, ezért ez az elnevezés + pillanatok alatt megtévesztõvé válhat, + ezért ezeket a lemezdarabokat a &os; maga + lemezslice-oknak vagy egyszerûen csak slice-oknak + hívja. Például a PC-s + lemezpartíciókkal dolgozó + fdisk nevû &os;-s segédprogram + partíciók helyette is slice-okra hivatkozik. A PC + lemezenként alapvetõen csak négy + partíciót enged meg. Ezeket a + partíciókat nevezik elsõdleges + partícióknak. Ettõl a + korlátozástól egy új típus, a + kiterjesztett partíció + létrehozásával szabadultak meg, amivel + négynél több partíció is + készíthetõ. Lemezenként egyetlen + ilyen kiterjesztett partíció + található, de ezen belül speciális, + ún. logikai + partíciók hozhatóak + létre. - Each partition has a partition ID, which is - a number used to identify the type of data on the partition. FreeBSD - partitions have the partition ID of 165. + Minden partíciónak van egy + partícióazonosítója, + melyet a partíción található adatok + típusának + megállapítására használnak. + A &os; partícióinak azonosítója + 165. - In general, each operating system that you use will identify - partitions in a particular way. For example, DOS, and its - descendants, like &windows;, assign each primary and logical partition a - drive letter, starting with - C:. + Általánosságban véve minden + operációs rendszer így azonosítja a + partíciókat. Például a DOS + és annak leszármazottai, mint mondjuk a &windows;, + minden elsõdleges és logikai + partícióhoz egy + C:-tõl induló + meghajtóbetûjelet + társít. - FreeBSD must be installed into a primary partition. FreeBSD can - keep all its data, including any files that you create, on this one - partition. However, if you have multiple disks, then you can create a - FreeBSD partition on all, or some, of them. When you install FreeBSD, - you must have one partition available. This might be a blank - partition that you have prepared, or it might be an existing partition - that contains data that you no longer care about. + A &os;-t egy elsõdleges partícióra kell + telepíteni. A &os; az összes adatát, + beleértve minden általunk létrehozott + állományt is, ezen az egyetlen + partíción fogja elhelyezni. Ha viszont több + lemezünk van, többen is, vagy akár mindegyiken + létrehozhatunk &os;-s partíciókat. A &os; + telepítésekor azonban legalább egy ilyen + partíciónak használhatónak kell + lennie. Ez lehet elõre megtisztított üres + partíciói is, vagy akár egy olyan + partíció, amelyen már nem használt + adatok vannak. - If you are already using all the partitions on all your disks, then - you will have to free one of them for FreeBSD using the tools - provided by the other operating systems you use (e.g., - fdisk on DOS or &windows;). + Ha már mindegyik partíciónkat + lefoglalja valami, akkor a többi operációs + rendszer által felkínált eszközök + (pl. &ms-dos;-ban vagy &windows;-ban az + fdisk) valamelyikével + elõször fel kell közülük + szabadítanunk egyet a &os; számára. - If you have a spare partition then you can use that. However, you - may need to shrink one or more of your existing partitions - first. + Amennyiben akadna egy használható + partíció, akkor használjuk azt. Ekkor + azonban elõfordulhat, hogy ehhez elõször a + meglévõk közül valamelyiket össze + kell majd zsugorítanunk. - A minimal installation of FreeBSD takes as little as 100 MB of disk - space. However, that is a very minimal install, - leaving almost no space for your own files. A more realistic minimum - is 250 MB without a graphical environment, and 350 MB or more if you - want a graphical user interface. If you intend to install a lot of - third-party software as well, then you will need more space. + A &os; legkisebb telepíthetõ változata + nagyjából 100 MB lemezterületet + igényel. Azonban ez egy nagyon + kicsi változat, és szinte semmi helyet nem hagy a + saját állományainknak. Sokkalta hûbb + a valósághoz, ha grafikus felület + nélkül nagyjából 250 MB-ot + mondunk, és legalább 350 MB-ot grafikus + felület használata esetén. Ha ezeken + felül még további szoftvereket is + telepíteni kívánunk, még több + helyre lesz szükségünk. - You can use a commercial tool such as &partitionmagic;, or a free tool such as GParted, - to resize your partitions and make space for - FreeBSD. The tools directory on the CDROM - contains two free software tools which can carry out this task, namely - FIPS and - PResizer. Documentation for both - of these is available in the same directory. - FIPS, - PResizer, and - &partitionmagic; can resize - FAT16 and FAT32 - partitions — used in &ms-dos; through &windows; ME. Both - &partitionmagic; and - GParted are known to work on - NTFS. GParted - is available on a number of Live CD Linux distributions, such as - SystemRescueCD. + A &os; számára helyet csinálni + és a partíciók + átméretezéséhez használhatjuk + mondjuk a &partitionmagic; nevû + kereskedelmi szoftvert, vagy esetleg olyan szabad + eszközöket is, mint mondjuk + GParted. A telepítõ CD-n + megtalálható tools + könyvtárban találhatunk erre a feladatra + két szabad szoftvert, név szerint a + FIPS és + PResizer programokat. A + hozzájuk tartozó dokumentáció + ugyanitt megtalálható. A + FIPS, a + PResizer és a + &partitionmagic; egyaránt + képes az &ms-dos; és a &windows; ME által + használt FAT16 és + FAT32 partíciókat + átméretezni. Ismereteink szerint + &partitionmagic; és a + GParted is használható + az NTFS partíciók + esetén. A GParted + számos Live CD-s &linux;-os disztribúción + megtalálható, ilyen többek közt a SystemRescueCD. - Problems have been reported resizing µsoft; Vista - partitions. Having a Vista installation CDROM handy when - attempting such an operation is recommended. As with all - such disk maintenance tasks, a current set of backups is - also strongly advised. + Gondok lehetnek azonban a µsoft; Vistája + által használt partíciókkal. Nem + árt, ha az átméretezéskor a + kezünk ügyében van a Vista telepítõ + CD-je. Mint minden lemezkarbantási mûvelet + esetén, ilyenkor is határozottan ajánlott + biztonsági mentéseket + készíteni. - Incorrect use of these tools can delete the data on your disk. - Be sure that you have recent, working backups before using - them. + Az említett eszközök helytelen + használata megsemmisítheti a lemezeinket + tárolt adatokat, ezért a használatuk + elõtt gondoskodjunk a friss, mûködõ + biztonsági mentések + készítésérõl. - Using an Existing Partition Unchanged + Meglevõ partíció használata a + méret megváltoztatása + nélkül - Suppose that you have a computer with a single 4 GB disk that - already has a version of &windows; installed, and you have split the - disk into two drive letters, C: and - D:, each of which is 2 GB in size. You have - 1 GB of data on C:, and 0.5 GB of data on - D:. + Tegyük fel, hogy a + számítógépünkben egyetlen + 4 GB méretû lemez van, amelyen + megtalálható a &windows; valamelyik + verziója, és ezt a lemezt korábban + két, egyaránt 2 GB méretû + meghajtóra osztottuk, a C:-re + és D:-re. 1 GB adatunk + van a C: meghajtón és + fél GB a D:-n. - This means that your disk has two partitions on it, one per - drive letter. You can copy all your existing data from - D: to C:, which - will free up the second partition, ready for FreeBSD. + Mindez azt jelenti, hogy a lemezünkön két + partíció található, tehát + betûjelenként egy. Ha átmásoljuk a + D: meghajtón levõ + adatainkat a C: meghajtóra, + akkor ezzel felszabadíthatjuk a &os; + számára a második + partíciót. - Shrinking an Existing Partition + Meglevõ partíció + zsugorítása - Suppose that you have a computer with a single 4 GB disk that - already has a version of &windows; installed. When you installed - &windows; you created one large partition, giving you a - C: drive that is 4 GB in size. You are - currently using 1.5 GB of space, and want FreeBSD to have 2 GB of - space. + Tegyük fel, hogy a + számítógépünkben egyetlen + 4 GB méretû lemez van, amelyet teljes + egészében a &windows; valamelyik + példánya foglal el. A &windows; + telepítése során ezért minden + bizonnyal egyetlen nagy partíciót hoztunk + létre, ami a C: betûjelet + kapta és a mérete 4 GB. Jelen pillanatban + másfél GB helyet használunk a + lemezen, és szeretnénk a &os; + számára 2 GB helyet + felszabadítani./para> - In order to install FreeBSD you will need to either: + A &os; telepítéséhez a + következõk valamelyikét kell + tennünk: - Backup your &windows; data, and then reinstall &windows;, - asking for a 2 GB partition at install time. + Mentsük le a &windows;-os adatainkat, + telepítsük újra a &windows;-t úgy, + hogy egy 2 GB méretû + partíciót választunk neki a + telepítése során. - Use one of the tools such as &partitionmagic;, - described above, to shrink your &windows; - partition. + A partíció + összezsugorítására + használjuk az elõbb említett + alkalmazásokat, például a + &partitionmagic;-et. @@ -475,24 +602,29 @@ - Disk Layouts for the Alpha + A lemezek kiosztása Alphán Alpha - You will need a dedicated disk for FreeBSD on the - Alpha. It is not possible to share a disk with another - operating system at this time. Depending on the specific - Alpha machine you have, this disk can either be a SCSI disk - or an IDE disk, as long as your machine is capable of - booting from it. + Alphán egy egész lemezre lesz + szükségünk a &os; + telepítéséhez, mivel jelen pillanatban + nem tud más rendszerekkel osztozni a lemezeken. A + gépünkben található lemez + rendelkezhet IDE vagy SCSI csatolóval is, egyedül + az a fontos, hogy el tudjuk róla indítani a + rendszert. - Following the conventions of the Digital / Compaq - manuals all SRM input is shown in uppercase. SRM is case - insensitive. + A Digital / Compaq leírásainak + megfelelõen az SRM összes parancsát + nagybetûkkel írjuk, habár az SRM nem + különbözteti meg a kis- és + nagybetûket. - To find the names and types of disks in your machine, use - the SHOW DEVICE command from the SRM - console prompt: + A gépünkben található lemezek + neveit és típusát a az SRM konzolban + kiadott SHOW DEVICE paranccsal + kérdezhetjük le: >>>SHOW DEVICE dka0.0.0.4.0 DKA0 TOSHIBA CD-ROM XM-57 3476 @@ -504,311 +636,437 @@ pqa0.0.0.4.0 PQA0 PCI EIDE pqb0.0.1.4.0 PQB0 PCI EIDE - This example is from a Digital Personal Workstation - 433au and shows three disks attached to the machine. The - first is a CDROM drive called DKA0 and - the other two are disks and are called - DKC0 and - DKC100 respectively. + Ebben a példában egy Digital Personal + Workstation 433au szerepel, és láthatjuk, hogy + három meghajtót csatlakoztattunk hozzá. + Ezek közül az elsõ a + DKA0 nevet viselõ CD-ROM + meghajtó, valamint van még további + lemezünk, DKC0 és + DKC100 néven. - Disks with names of the form DKx - are SCSI disks. For example DKA100 - refers to a SCSI disk with SCSI target ID 1 on the first SCSI bus (A), - whereas DKC300 refers to a SCSI disk - with SCSI ID 3 on the third SCSI bus (C). Devicename - PKx refers to the SCSI host bus adapter. As - seen in the SHOW DEVICE output SCSI - CDROM drives are treated as any other SCSI hard disk drive. + A DKx alakú névvel + rendelkezõ eszközök a SCSI-lemezek. Ennek + megfelelõen például a + DKA100 név az elsõ (A) + SCSI-buszon található 1 + célazonosítóval (target ID) + ellátott SCSI-lemezre, miközben a + DKC300 a harmadik (C) SCSI-buszon + levõ 3 célazonosítóval + ellátott SCSI-lemezre hivatkozik. A + PKx alakú + eszköznév magára a + SCSI-vezérlõre vonatkozik. Ahogy az a + SHOW DEVICE kimenetében is + látszik, ha SCSI csatolón keresztül + csatlakoztatott CD-ROM meghajtókat a többi + SCSI-merevlemezhez hasonlónak tekinti. - IDE disks have names similar to DQx, - while PQx is the associated IDE - controller. + Az IDE-lemezek nevei ehhez hasonlóan + DQx alakúak, ahol a + PQx a hozzájuk tartozó + IDE-vezérlõt jelöli. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 2 01:20:09 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E7E5D16A50D; Sun, 2 Dec 2007 01:20: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 57FB416A419 for ; Sun, 2 Dec 2007 01:20:08 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4A0F613C455 for ; Sun, 2 Dec 2007 01:20:08 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB21K8JD023501 for ; Sun, 2 Dec 2007 01:20:08 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB21K8a7023498 for perforce@freebsd.org; Sun, 2 Dec 2007 01:20:08 GMT (envelope-from peter@freebsd.org) Date: Sun, 2 Dec 2007 01:20:08 GMT Message-Id: <200712020120.lB21K8a7023498@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 129946 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 01:20:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=129946 Change 129946 by peter@peter_daintree on 2007/12/02 01:19:41 diff reduction Affected files ... .. //depot/projects/bike_sched/sys/kern/kern_switch.c#7 edit Differences ... ==== //depot/projects/bike_sched/sys/kern/kern_switch.c#7 (text+ko) ==== @@ -134,14 +134,6 @@ retry: td = sched_choose(); - if (td) { - CTR2(KTR_RUNQ, "choosethread: td=%p pri=%d", - td, td->td_priority); - } else { - /* Simulate runq_choose() having returned the idle thread */ - td = PCPU_GET(idlethread); - } - /* * If we are in panic, only allow system threads, * plus the one we are running in, to be run. From owner-p4-projects@FreeBSD.ORG Sun Dec 2 01:21:09 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C516116A468; Sun, 2 Dec 2007 01:21: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 8A68516A41A for ; Sun, 2 Dec 2007 01:21:09 +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 7C42213C457 for ; Sun, 2 Dec 2007 01:21:09 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB21L9DX023911 for ; Sun, 2 Dec 2007 01:21:09 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB21L9nm023907 for perforce@freebsd.org; Sun, 2 Dec 2007 01:21:09 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 2 Dec 2007 01:21:09 GMT Message-Id: <200712020121.lB21L9nm023907@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 129947 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 01:21:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=129947 Change 129947 by pgj@disznohal on 2007/12/02 01:20:14 Add some minor lingual fixes. Affected files ... .. //depot/projects/docproj_hu/books/handbook/book.sgml#4 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/book.sgml#4 (text+ko) ==== @@ -132,30 +132,31 @@ &os; &rel.current;-RELEASE telepítését és használatát a mindennapokban. A - kézikönyv tartalma folyamatos - fejlesztés alatt áll számos - független fejlesztõ által. Emiatt - elképzelhetõ, hogy bizonyos fejezetek már - elévültek és aktualizálásra - szorulnak. Amennyiben úgy érzi, hogy - segíteni tudna a projekt munkájában, - értesítsen minket a &a.doc; címen! Ezen + kézikönyv tartalmán számos + független fejlesztõ folyamatosan + dolgozik. Emiatt elképzelhetõ, hogy + bizonyos fejezetek már elévültek és + aktualizálásra szorulnak. Amennyiben úgy + érezzük, hogy segíteni tudnánk a + projekt munkájában, értesítsük + a fejlesztõket a &a.doc; címén! Ezen dokumentum legfrissebb változata mindig elérhetõ a &os; - weboldaláról (a korábbi + honlapjáról (a korábbi változatok pedig megtalálhatóak a címen). - Ezenkívül rengeteg formátumban és - tömörítve is letölthetõ a &os; FTP + Ezenkívül még rengeteg formátumban + és tömörítve is letölthetõ a + &os; FTP szerverérõl vagy a tüköroldalak - egyikérõl. Ha viszont a kézikönyv - nyomtatott változatára lenne szüksége, - megvásárolhatja a &os; Mall-ban is. Ha - pedig keresni szeretnénk benne, azt a funkciót - itt + egyikérõl. Amennyiben a kézikönyv + nyomtatott változatára lenne + szükségünk, megvásárolhatjuk a + &os; + Mall-ból. Ha pedig keresni szeretnénk + benne, azt a funkciót itt érhetjük el. From owner-p4-projects@FreeBSD.ORG Sun Dec 2 01:23:12 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8112A16A420; Sun, 2 Dec 2007 01:23: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 311EF16A418 for ; Sun, 2 Dec 2007 01:23: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 235E213C43E for ; Sun, 2 Dec 2007 01:23:12 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB21NCSH024651 for ; Sun, 2 Dec 2007 01:23:12 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB21NCuP024644 for perforce@freebsd.org; Sun, 2 Dec 2007 01:23:12 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 01:23:12 GMT Message-Id: <200712020123.lB21NCuP024644@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 129949 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 01:23:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=129949 Change 129949 by hselasky@hselasky_laptop001 on 2007/12/02 01:22:37 Make sure that the alignment is correct when allocating DMA memory. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#59 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#59 (text+ko) ==== @@ -2082,6 +2082,16 @@ bus_dmamap_t map; void *ptr; + if (align != 1) { + /* + * The alignment must be greater or equal to the "size" else the + * object can be split between two memory pages and we get a + * problem! + */ + while (align < size) { + align *= 2; + } + } /* get the correct DMA tag */ tag = usbd_dma_tag_setup(parent_tag, utag, size, align, utag_max); if (tag == NULL) { From owner-p4-projects@FreeBSD.ORG Sun Dec 2 01:25:15 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D677A16A41B; Sun, 2 Dec 2007 01:25: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 9126A16A418 for ; Sun, 2 Dec 2007 01:25:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6A91313C448 for ; Sun, 2 Dec 2007 01:25:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB21PEWG024858 for ; Sun, 2 Dec 2007 01:25:14 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB21PEIB024855 for perforce@freebsd.org; Sun, 2 Dec 2007 01:25:14 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 01:25:14 GMT Message-Id: <200712020125.lB21PEIB024855@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 129950 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 01:25:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=129950 Change 129950 by hselasky@hselasky_laptop001 on 2007/12/02 01:24:57 Avoid infinite loop in case of failure. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#60 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#60 (text+ko) ==== @@ -2090,6 +2090,9 @@ */ while (align < size) { align *= 2; + if (align == 0) { + goto error; + } } } /* get the correct DMA tag */ From owner-p4-projects@FreeBSD.ORG Sun Dec 2 01:28:18 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F59F16A421; Sun, 2 Dec 2007 01:28: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 0FF9D16A41B for ; Sun, 2 Dec 2007 01:28:18 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 028BE13C459 for ; Sun, 2 Dec 2007 01:28:18 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB21SHW9024939 for ; Sun, 2 Dec 2007 01:28:17 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB21SH3M024936 for perforce@freebsd.org; Sun, 2 Dec 2007 01:28:17 GMT (envelope-from peter@freebsd.org) Date: Sun, 2 Dec 2007 01:28:17 GMT Message-Id: <200712020128.lB21SH3M024936@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 129951 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 01:28:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=129951 Change 129951 by peter@peter_daintree on 2007/12/02 01:27:46 nuke P_SA Affected files ... .. //depot/projects/bike_sched/sys/amd64/linux32/linux32_sysvec.c#3 edit .. //depot/projects/bike_sched/sys/compat/svr4/svr4_sysvec.c#3 edit .. //depot/projects/bike_sched/sys/fs/procfs/procfs_status.c#3 edit .. //depot/projects/bike_sched/sys/i386/linux/linux_sysvec.c#3 edit .. //depot/projects/bike_sched/sys/sys/proc.h#7 edit Differences ... ==== //depot/projects/bike_sched/sys/amd64/linux32/linux32_sysvec.c#3 (text+ko) ==== @@ -247,8 +247,7 @@ Elf32_Addr *base; Elf32_Addr *pos; - KASSERT(curthread->td_proc == imgp->proc && - (curthread->td_proc->p_flag & P_SA) == 0, + KASSERT(curthread->td_proc == imgp->proc, ("unsafe elf_linux_fixup(), should be curproc")); base = (Elf32_Addr *)*stack_base; args = (Elf32_Auxargs *)imgp->auxargs; ==== //depot/projects/bike_sched/sys/compat/svr4/svr4_sysvec.c#3 (text+ko) ==== @@ -213,8 +213,7 @@ Elf32_Auxargs *args; register_t *pos; - KASSERT(curthread->td_proc == imgp->proc && - (curthread->td_proc->p_flag & P_SA) == 0, + KASSERT(curthread->td_proc == imgp->proc, ("unsafe svr4_fixup(), should be curproc")); args = (Elf32_Auxargs *)imgp->auxargs; pos = *stack_base + (imgp->args->argc + imgp->args->envc + 2); ==== //depot/projects/bike_sched/sys/fs/procfs/procfs_status.c#3 (text+ko) ==== @@ -112,20 +112,13 @@ sbuf_printf(sb, "noflags"); } -#ifdef KSE - if (p->p_flag & P_SA) - wmesg = "-kse- "; - else -#endif - { - tdfirst = FIRST_THREAD_IN_PROC(p); - if (tdfirst->td_wchan != NULL) { - KASSERT(tdfirst->td_wmesg != NULL, - ("wchan %p has no wmesg", tdfirst->td_wchan)); - wmesg = tdfirst->td_wmesg; - } else - wmesg = "nochan"; - } + tdfirst = FIRST_THREAD_IN_PROC(p); + if (tdfirst->td_wchan != NULL) { + KASSERT(tdfirst->td_wmesg != NULL, + ("wchan %p has no wmesg", tdfirst->td_wchan)); + wmesg = tdfirst->td_wmesg; + } else + wmesg = "nochan"; if (p->p_flag & P_INMEM) { struct timeval start, ut, st; ==== //depot/projects/bike_sched/sys/i386/linux/linux_sysvec.c#3 (text+ko) ==== @@ -239,8 +239,7 @@ Elf32_Auxargs *args; register_t *pos; - KASSERT(curthread->td_proc == imgp->proc && - (curthread->td_proc->p_flag & P_SA) == 0, + KASSERT(curthread->td_proc == imgp->proc, ("unsafe elf_linux_fixup(), should be curproc")); args = (Elf32_Auxargs *)imgp->auxargs; pos = *stack_base + (imgp->args->argc + imgp->args->envc + 2); ==== //depot/projects/bike_sched/sys/sys/proc.h#7 (text+ko) ==== @@ -553,7 +553,6 @@ #define P_WAITED 0x01000 /* Someone is waiting for us. */ #define P_WEXIT 0x02000 /* Working on exiting. */ #define P_EXEC 0x04000 /* Process called exec. */ -#define P_SA 0x08000 /* Using scheduler activations. */ #define P_CONTINUED 0x10000 /* Proc has continued from a stopped state. */ #define P_STOPPED_SIG 0x20000 /* Stopped due to SIGSTOP/SIGTSTP. */ #define P_STOPPED_TRACE 0x40000 /* Stopped because of tracing. */ From owner-p4-projects@FreeBSD.ORG Sun Dec 2 01:36:28 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DAA216A419; Sun, 2 Dec 2007 01:36: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 EAA8916A417 for ; Sun, 2 Dec 2007 01:36:27 +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 DE17A13C469 for ; Sun, 2 Dec 2007 01:36:27 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB21aRRq026720 for ; Sun, 2 Dec 2007 01:36:27 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB21aRwT026717 for perforce@freebsd.org; Sun, 2 Dec 2007 01:36:27 GMT (envelope-from gonzo@FreeBSD.org) Date: Sun, 2 Dec 2007 01:36:27 GMT Message-Id: <200712020136.lB21aRwT026717@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 129953 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 01:36:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=129953 Change 129953 by gonzo@gonzo_jeeves on 2007/12/02 01:36:11 o Do not override CFLAGS, otherwise all platform-specific stuff (like endianess) would be lost. Affected files ... .. //depot/projects/mips2/src/usr.bin/fstat/zfs/Makefile#2 edit Differences ... ==== //depot/projects/mips2/src/usr.bin/fstat/zfs/Makefile#2 (text+ko) ==== @@ -6,7 +6,7 @@ OBJS= zfs.o WARNS?= 1 -CFLAGS=-D_SOLARIS_C_SOURCE +CFLAGS+=-D_SOLARIS_C_SOURCE CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem From owner-p4-projects@FreeBSD.ORG Sun Dec 2 02:27:24 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE0CE16A41A; Sun, 2 Dec 2007 02:27: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 5456116A419 for ; Sun, 2 Dec 2007 02:27: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 474C213C455 for ; Sun, 2 Dec 2007 02:27:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB22RNWq034966 for ; Sun, 2 Dec 2007 02:27:23 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB22RN8e034963 for perforce@freebsd.org; Sun, 2 Dec 2007 02:27:23 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 02:27:23 GMT Message-Id: <200712020227.lB22RN8e034963@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 129954 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 02:27:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=129954 Change 129954 by hselasky@hselasky_laptop001 on 2007/12/02 02:26:59 Bugfixes: 1) The "usbd_get_page()" function should only be used after that a virtual buffer has been loaded into DMA. 2) Recursive locking in BUS-DMA callback. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#61 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#61 (text+ko) ==== @@ -1776,6 +1776,9 @@ /*------------------------------------------------------------------------* * usbd_get_page - lookup DMA-able memory for the given offset + * + * NOTE: Only call this function when the "page_cache" structure has + * been properly initialized ! *------------------------------------------------------------------------*/ void usbd_get_page(struct usbd_page_cache *pc, uint32_t offset, @@ -1787,6 +1790,8 @@ offset += pc->page_offset_buf; + /* range check */ + if ((offset >= pc->page_offset_end) || (offset < pc->page_offset_buf)) { @@ -1801,22 +1806,13 @@ page = pc->page_start; - if (page) { + page += (offset / USB_PAGE_SIZE); - page += (offset / USB_PAGE_SIZE); + offset %= USB_PAGE_SIZE; - offset %= USB_PAGE_SIZE; + res->length = USB_PAGE_SIZE - offset; + res->physaddr = page->physaddr + offset; - res->length = USB_PAGE_SIZE - offset; - res->physaddr = page->physaddr + offset; - - } else { - - offset %= USB_PAGE_SIZE; - - res->length = USB_PAGE_SIZE - offset; - res->physaddr = 0; - } return; } @@ -1827,25 +1823,10 @@ usbd_copy_in(struct usbd_page_cache *cache, uint32_t offset, const void *ptr, uint32_t len) { - struct usbd_page_search res; + void *dst; - while (len) { - - usbd_get_page(cache, offset, &res); - - if (res.length == 0) { - panic("%s:%d invalid offset!\n", - __FUNCTION__, __LINE__); - } - if (res.length > len) { - res.length = len; - } - bcopy(ptr, res.buffer, res.length); - - offset += res.length; - len -= res.length; - ptr = USBD_ADD_BYTES(ptr, res.length); - } + dst = USBD_ADD_BYTES(cache->buffer, offset); + bcopy(ptr, dst, len); return; } @@ -1889,33 +1870,10 @@ usbd_uiomove(struct usbd_page_cache *pc, struct uio *uio, uint32_t pc_offset, uint32_t len) { - struct usbd_page_search res; - int error = 0; + void *ptr; - while (len > 0) { - - usbd_get_page(pc, pc_offset, &res); - - if (res.length == 0) { - panic("%s:%d invalid offset!\n", - __FUNCTION__, __LINE__); - } - if (res.length > len) { - res.length = len; - } - /* - * "uiomove()" can sleep so one needs to make a wrapper, - * exiting the mutex and checking things - */ - error = uiomove(res.buffer, len, uio); - - if (error) { - break; - } - pc_offset += res.length; - len -= res.length; - } - return (error); + ptr = USBD_ADD_BYTES(pc->buffer, pc_offset); + return (uiomove(ptr, len, uio)); } /*------------------------------------------------------------------------* @@ -1925,25 +1883,10 @@ usbd_copy_out(struct usbd_page_cache *cache, uint32_t offset, void *ptr, uint32_t len) { - struct usbd_page_search res; + void *src; - while (len) { - - usbd_get_page(cache, offset, &res); - - if (res.length == 0) { - panic("%s:%d invalid offset!\n", - __FUNCTION__, __LINE__); - } - if (res.length > len) { - res.length = len; - } - bcopy(res.buffer, ptr, res.length); - - offset += res.length; - len -= res.length; - ptr = USBD_ADD_BYTES(ptr, res.length); - } + src = USBD_ADD_BYTES(cache->buffer, offset); + bcopy(src, ptr, len); return; } @@ -1953,24 +1896,10 @@ void usbd_bzero(struct usbd_page_cache *cache, uint32_t offset, uint32_t len) { - struct usbd_page_search res; + void *ptr; - while (len) { - - usbd_get_page(cache, offset, &res); - - if (res.length == 0) { - panic("%s:%d invalid offset!\n", - __FUNCTION__, __LINE__); - } - if (res.length > len) { - res.length = len; - } - bzero(res.buffer, res.length); - - offset += res.length; - len -= res.length; - } + ptr = USBD_ADD_BYTES(cache->buffer, offset); + bzero(ptr, len); return; } @@ -2029,21 +1958,30 @@ struct usbd_page_cache *pc; struct usbd_page *pg; uint32_t rem; + uint8_t owned; + pc = arg; xfer = pc->xfer; - /* XXX sometimes recursive locking here */ + /* + * XXX There is sometimes recursive locking here. + * XXX We should try to find a better solution. + * XXX Until further the "owned" variable does + * XXX the trick. + */ if (error) { if (xfer) { - mtx_lock(xfer->priv_mtx); + owned = mtx_owned(xfer->priv_mtx); + if (!owned) + mtx_lock(xfer->priv_mtx); xfer->usb_root->dma_error = 1; usbd_bdma_done_event(xfer->usb_root); - mtx_unlock(xfer->priv_mtx); + if (!owned) + mtx_unlock(xfer->priv_mtx); } return; } - pc = arg; pg = pc->page_start; pg->physaddr = segs->ds_addr & ~(USB_PAGE_SIZE - 1); rem = segs->ds_addr & (USB_PAGE_SIZE - 1); @@ -2059,9 +1997,12 @@ } if (xfer) { - mtx_lock(xfer->priv_mtx); + owned = mtx_owned(xfer->priv_mtx); + if (!owned) + mtx_lock(xfer->priv_mtx); usbd_bdma_done_event(xfer->usb_root); - mtx_unlock(xfer->priv_mtx); + if (!owned) + mtx_unlock(xfer->priv_mtx); } return; } From owner-p4-projects@FreeBSD.ORG Sun Dec 2 02:38:36 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35B6B16A468; Sun, 2 Dec 2007 02:38: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 B28E816A419 for ; Sun, 2 Dec 2007 02:38:35 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9A8F313C455 for ; Sun, 2 Dec 2007 02:38:35 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB22cZoC036416 for ; Sun, 2 Dec 2007 02:38:35 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB22cZLH036413 for perforce@freebsd.org; Sun, 2 Dec 2007 02:38:35 GMT (envelope-from peter@freebsd.org) Date: Sun, 2 Dec 2007 02:38:35 GMT Message-Id: <200712020238.lB22cZLH036413@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 129955 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 02:38:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=129955 Change 129955 by peter@peter_melody on 2007/12/02 02:38:29 Compile! Affected files ... .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_syscall.h#4 edit .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_syscalls.c#4 edit .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_sysent.c#4 edit .. //depot/projects/bike_sched/sys/compat/freebsd32/syscalls.master#5 edit Differences ... ==== //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_syscall.h#4 (text+ko) ==== @@ -284,11 +284,6 @@ #define FREEBSD32_SYS___setugid 374 #define FREEBSD32_SYS_eaccess 376 #define FREEBSD32_SYS_nmount 378 -#define FREEBSD32_SYS_kse_exit 379 -#define FREEBSD32_SYS_kse_wakeup 380 -#define FREEBSD32_SYS_kse_create 381 -#define FREEBSD32_SYS_kse_thr_interrupt 382 -#define FREEBSD32_SYS_kse_release 383 #define FREEBSD32_SYS_kenv 390 #define FREEBSD32_SYS_lchflags 391 #define FREEBSD32_SYS_uuidgen 392 ==== //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_syscalls.c#4 (text+ko) ==== @@ -386,11 +386,11 @@ "eaccess", /* 376 = eaccess */ "#377", /* 377 = afs_syscall */ "nmount", /* 378 = nmount */ - "kse_exit", /* 379 = kse_exit */ - "kse_wakeup", /* 380 = kse_wakeup */ - "kse_create", /* 381 = kse_create */ - "kse_thr_interrupt", /* 382 = kse_thr_interrupt */ - "kse_release", /* 383 = kse_release */ + "#379", /* 379 = kse_exit */ + "#380", /* 380 = kse_wakeup */ + "#381", /* 381 = kse_create */ + "#382", /* 382 = kse_thr_interrupt */ + "#383", /* 383 = kse_release */ "#384", /* 384 = __mac_get_proc */ "#385", /* 385 = __mac_set_proc */ "#386", /* 386 = __mac_get_fd */ ==== //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_sysent.c#4 (text+ko) ==== @@ -417,11 +417,11 @@ { 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 *)kse_exit, AUE_NULL, NULL, 0, 0 }, /* 379 = kse_exit */ - { AS(kse_wakeup_args), (sy_call_t *)kse_wakeup, AUE_NULL, NULL, 0, 0 }, /* 380 = kse_wakeup */ - { AS(kse_create_args), (sy_call_t *)kse_create, AUE_NULL, NULL, 0, 0 }, /* 381 = kse_create */ - { AS(kse_thr_interrupt_args), (sy_call_t *)kse_thr_interrupt, AUE_NULL, NULL, 0, 0 }, /* 382 = kse_thr_interrupt */ - { 0, (sy_call_t *)kse_release, AUE_NULL, NULL, 0, 0 }, /* 383 = kse_release */ + { 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 */ ==== //depot/projects/bike_sched/sys/compat/freebsd32/syscalls.master#5 (text+ko) ==== @@ -644,13 +644,11 @@ 377 AUE_NULL UNIMPL afs_syscall 378 AUE_NMOUNT NOPROTO { int nmount(struct iovec *iovp, \ unsigned int iovcnt, int flags); } -379 AUE_NULL NOPROTO { int kse_exit(void); } -380 AUE_NULL NOPROTO { int kse_wakeup(struct kse_mailbox *mbx); } -381 AUE_NULL NOPROTO { int kse_create(struct kse_mailbox *mbx, \ - int newgroup); } -382 AUE_NULL NOPROTO { int kse_thr_interrupt( \ - struct kse_thr_mailbox *tmbx); } -383 AUE_NULL NOPROTO { int kse_release(void); } +379 AUE_NULL UNIMPL kse_exit +380 AUE_NULL UNIMPL kse_wakeup +381 AUE_NULL UNIMPL kse_create +382 AUE_NULL UNIMPL kse_thr_interrupt +383 AUE_NULL UNIMPL kse_release 384 AUE_NULL UNIMPL __mac_get_proc 385 AUE_NULL UNIMPL __mac_set_proc 386 AUE_NULL UNIMPL __mac_get_fd From owner-p4-projects@FreeBSD.ORG Sun Dec 2 04:17:22 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B581D16A41B; Sun, 2 Dec 2007 04:17:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4114916A417 for ; Sun, 2 Dec 2007 04:17:21 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3019D13C43E for ; Sun, 2 Dec 2007 04:17:21 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB24HLpU053898 for ; Sun, 2 Dec 2007 04:17:21 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB24HKB3053895 for perforce@freebsd.org; Sun, 2 Dec 2007 04:17:20 GMT (envelope-from peter@freebsd.org) Date: Sun, 2 Dec 2007 04:17:20 GMT Message-Id: <200712020417.lB24HKB3053895@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 129957 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 04:17:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=129957 Change 129957 by peter@peter_daintree on 2007/12/02 04:16:30 Eliminate the cross-pointers between the thread and the scheduler-specific data area. Use pointer arithmetic (since it's essentially free, maybe even evaluateable at compile time!) rather than pointer dereferences (expensive, always evaluated at runtime) to get from one to the other. The trick is handling thread0, which is statically allocated rather than coming from a uma zone with the adjacent td_sched. I've hacked it so that thread0 is dereferenced via a pointer. Fortunately, references to thread0 are very rare, so the tradeoff should be very positive. Affected files ... .. //depot/projects/bike_sched/sys/amd64/amd64/machdep.c#6 edit .. //depot/projects/bike_sched/sys/arm/at91/kb920x_machdep.c#7 edit .. //depot/projects/bike_sched/sys/arm/sa11x0/assabet_machdep.c#6 edit .. //depot/projects/bike_sched/sys/i386/i386/machdep.c#6 edit .. //depot/projects/bike_sched/sys/ia64/ia64/machdep.c#6 edit .. //depot/projects/bike_sched/sys/kern/init_main.c#4 edit .. //depot/projects/bike_sched/sys/kern/kern_switch.c#8 edit .. //depot/projects/bike_sched/sys/kern/sched_4bsd.c#14 edit .. //depot/projects/bike_sched/sys/kern/sched_ule.c#14 edit .. //depot/projects/bike_sched/sys/pc98/pc98/machdep.c#7 edit .. //depot/projects/bike_sched/sys/powerpc/powerpc/machdep.c#5 edit .. //depot/projects/bike_sched/sys/sparc64/sparc64/machdep.c#5 edit .. //depot/projects/bike_sched/sys/sun4v/sun4v/machdep.c#2 edit .. //depot/projects/bike_sched/sys/sys/proc.h#8 edit .. //depot/projects/bike_sched/sys/sys/sched.h#7 edit Differences ... ==== //depot/projects/bike_sched/sys/amd64/amd64/machdep.c#6 (text+ko) ==== @@ -1126,6 +1126,7 @@ u_int64_t msr; char *env; + sched_init_thread0(); thread0.td_kstack = physfree + KERNBASE; bzero((void *)thread0.td_kstack, KSTACK_PAGES * PAGE_SIZE); physfree += KSTACK_PAGES * PAGE_SIZE; ==== //depot/projects/bike_sched/sys/arm/at91/kb920x_machdep.c#7 (text) ==== @@ -449,6 +449,7 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); + sched_init_thread0(); proc_linkup0(&proc0, &thread0); thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) ==== //depot/projects/bike_sched/sys/arm/sa11x0/assabet_machdep.c#6 (text+ko) ==== @@ -422,6 +422,7 @@ /* Set stack for exception handlers */ + sched_init_thread0(); proc_linkup0(&proc0, &thread0); thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) ==== //depot/projects/bike_sched/sys/i386/i386/machdep.c#6 (text+ko) ==== @@ -2077,6 +2077,7 @@ int gsel_tss, metadata_missing, x; struct pcpu *pc; + sched_init_thread0(); thread0.td_kstack = proc0kstack; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/bike_sched/sys/ia64/ia64/machdep.c#6 (text+ko) ==== @@ -628,6 +628,7 @@ if (boothowto & RB_VERBOSE) bootverbose = 1; + sched_init_thread0(); /* * Setup the PCPU data for the bootstrap processor. It is needed * by printf(). Also, since printf() has critical sections, we ==== //depot/projects/bike_sched/sys/kern/init_main.c#4 (text+ko) ==== @@ -94,7 +94,7 @@ static struct session session0; static struct pgrp pgrp0; struct proc proc0; -struct thread thread0 __aligned(16); +struct thread *thread0p; struct vmspace vmspace0; struct proc *initproc; ==== //depot/projects/bike_sched/sys/kern/kern_switch.c#8 (text+ko) ==== @@ -231,8 +231,6 @@ */ ctd = curthread; THREAD_LOCK_ASSERT(td, MA_OWNED); - KASSERT ((ctd->td_sched != NULL && ctd->td_sched->ts_thread == ctd), - ("thread has no (or wrong) sched-private part.")); KASSERT((td->td_inhibitors == 0), ("maybe_preempt: trying to run inhibited thread")); pri = td->td_priority; @@ -405,12 +403,12 @@ struct rqhead *rqh; int pri; - pri = ts->ts_thread->td_priority / RQ_PPQ; + pri = TS_TO_TD(ts)->td_priority / RQ_PPQ; ts->ts_rqindex = pri; runq_setbit(rq, pri); rqh = &rq->rq_queues[pri]; CTR5(KTR_RUNQ, "runq_add: td=%p ts=%p pri=%d %d rqh=%p", - ts->ts_thread, ts, ts->ts_thread->td_priority, pri, rqh); + TS_TO_TD(ts), ts, TS_TO_TD(ts)->td_priority, pri, rqh); if (flags & SRQ_PREEMPTED) TAILQ_INSERT_HEAD(rqh, ts, ts_procq); else @@ -427,7 +425,7 @@ runq_setbit(rq, pri); rqh = &rq->rq_queues[pri]; CTR5(KTR_RUNQ, "runq_add_pri: td=%p ke=%p pri=%d idx=%d rqh=%p", - ts->ts_thread, ts, ts->ts_thread->td_priority, pri, rqh); + TS_TO_TD(ts), ts, TS_TO_TD(ts)->td_priority, pri, rqh); if (flags & SRQ_PREEMPTED) { TAILQ_INSERT_HEAD(rqh, ts, ts_procq); } else { @@ -487,7 +485,7 @@ ts2 = ts = TAILQ_FIRST(rqh); while (count-- && ts2) { - if (ts->ts_thread->td_lastcpu == cpu) { + if (TS_TO_TD(ts)->td_lastcpu == cpu) { ts = ts2; break; } @@ -544,13 +542,13 @@ struct rqhead *rqh; u_char pri; - KASSERT(ts->ts_thread->td_flags & TDF_INMEM, + KASSERT(TS_TO_TD(ts)->td_flags & TDF_INMEM, ("runq_remove_idx: thread swapped out")); pri = ts->ts_rqindex; KASSERT(pri < RQ_NQS, ("runq_remove_idx: Invalid index %d\n", pri)); rqh = &rq->rq_queues[pri]; CTR5(KTR_RUNQ, "runq_remove_idx: td=%p, ts=%p pri=%d %d rqh=%p", - ts->ts_thread, ts, ts->ts_thread->td_priority, pri, rqh); + TS_TO_TD(ts), ts, TS_TO_TD(ts)->td_priority, pri, rqh); { struct td_sched *nts; @@ -586,10 +584,8 @@ { struct td_sched *ts; - ts = (struct td_sched *) (td + 1); + ts = TD_TO_TS(td); bzero(ts, sizeof(*ts)); - td->td_sched = ts; - ts->ts_thread = td; } #endif /* KERN_SWITCH_INCLUDE */ ==== //depot/projects/bike_sched/sys/kern/sched_4bsd.c#14 (text+ko) ==== @@ -80,28 +80,30 @@ */ struct td_sched { TAILQ_ENTRY(td_sched) ts_procq; /* (j/z) Run queue. */ - struct thread *ts_thread; /* (*) Active associated thread. */ fixpt_t ts_pctcpu; /* (j) %cpu during p_swtime. */ u_char ts_rqindex; /* (j) Run queue index. */ + u_char ts_flags; /* (t) Flags */ int ts_cpticks; /* (j) Ticks of cpu time. */ int ts_slptime; /* (j) Seconds !RUNNING. */ struct runq *ts_runq; /* runq the thread is currently on */ }; -/* flags kept in td_flags */ -#define TDF_DIDRUN TDF_SCHED0 /* thread actually ran. */ -#define TDF_EXIT TDF_SCHED1 /* thread is being killed. */ -#define TDF_BOUND TDF_SCHED2 +#define TSF_DIDRUN 0x01 /* thread actually ran. */ +#define TSF_EXIT 0x02 /* thread is being killed. */ +#define TSF_BOUND 0x04 /* stuck to one CPU */ -#define ts_flags ts_thread->td_flags -#define TSF_DIDRUN TDF_DIDRUN /* thread actually ran. */ -#define TSF_EXIT TDF_EXIT /* thread is being killed. */ -#define TSF_BOUND TDF_BOUND /* stuck to one CPU */ - #define SKE_RUNQ_PCPU(ts) \ ((ts)->ts_runq != 0 && (ts)->ts_runq != &runq) -static struct td_sched td_sched0; +#define TD_TO_TS(td) ((struct td_sched *)(&(td)[1])) +#define TS_TO_TD(ts) (&((struct thread *)(ts))[-1]) + +/* Packed structure to match the layout of the uma thread zone */ +static struct { + struct thread initial_thread; + struct td_sched initial_sched; +} sched0 __aligned(16); + struct mtx sched_lock; static int sched_tdcnt; /* Total runnable threads in the system. */ @@ -359,7 +361,7 @@ FOREACH_THREAD_IN_PROC(p, td) { awake = 0; thread_lock(td); - ts = td->td_sched; + ts = TD_TO_TS(td); /* * Increment sleep time (if sleeping). We * ignore overflow, as above. @@ -465,7 +467,7 @@ fixpt_t loadfac; unsigned int newcpu; - ts = td->td_sched; + ts = TD_TO_TS(td); loadfac = loadfactor(averunnable.ldavg[0]); if (ts->ts_slptime > 5 * loadfac) td->td_estcpu = 0; @@ -544,9 +546,7 @@ * Set up the scheduler specific parts of proc0. */ proc0.p_sched = NULL; /* XXX */ - thread0.td_sched = &td_sched0; thread0.td_lock = &sched_lock; - td_sched0.ts_thread = &thread0; mtx_init(&sched_lock, "sched lock", NULL, MTX_SPIN | MTX_RECURSE); } @@ -588,7 +588,7 @@ struct td_sched *ts; THREAD_LOCK_ASSERT(td, MA_OWNED); - ts = td->td_sched; + ts = TD_TO_TS(td); ts->ts_cpticks++; td->td_estcpu = ESTCPULIM(td->td_estcpu + 1); @@ -672,7 +672,7 @@ return; td->td_priority = prio; if (TD_ON_RUNQ(td) && - td->td_sched->ts_rqindex != (prio / RQ_PPQ)) { + TD_TO_TS(td)->ts_rqindex != (prio / RQ_PPQ)) { sched_rem(td); sched_add(td, SRQ_BORING); } @@ -790,7 +790,7 @@ THREAD_LOCK_ASSERT(td, MA_OWNED); td->td_slptick = ticks; - td->td_sched->ts_slptime = 0; + TD_TO_TS(td)->ts_slptime = 0; } void @@ -799,7 +799,7 @@ struct td_sched *ts; struct proc *p; - ts = td->td_sched; + ts = TD_TO_TS(td); p = td->td_proc; THREAD_LOCK_ASSERT(td, MA_OWNED); @@ -852,7 +852,7 @@ */ KASSERT((newtd->td_inhibitors == 0), ("trying to run inhibited thread")); - newtd->td_sched->ts_flags |= TSF_DIDRUN; + TD_TO_TS(newtd)->ts_flags |= TSF_DIDRUN; TD_SET_RUNNING(newtd); if ((newtd->td_proc->p_flag & P_NOLOAD) == 0) sched_load_add(); @@ -905,7 +905,7 @@ struct td_sched *ts; THREAD_LOCK_ASSERT(td, MA_OWNED); - ts = td->td_sched; + ts = TD_TO_TS(td); if (ts->ts_slptime > 1) { updatepri(td); resetpriority(td); @@ -1047,7 +1047,7 @@ int cpu; int single_cpu = 0; - ts = td->td_sched; + ts = TD_TO_TS(td); THREAD_LOCK_ASSERT(td, MA_OWNED); KASSERT((td->td_inhibitors == 0), ("sched_add: trying to run inhibited thread")); @@ -1116,7 +1116,7 @@ #else /* SMP */ { struct td_sched *ts; - ts = td->td_sched; + ts = TD_TO_TS(td); THREAD_LOCK_ASSERT(td, MA_OWNED); KASSERT((td->td_inhibitors == 0), ("sched_add: trying to run inhibited thread")); @@ -1172,7 +1172,7 @@ { struct td_sched *ts; - ts = td->td_sched; + ts = TD_TO_TS(td); KASSERT(td->td_flags & TDF_INMEM, ("sched_rem: thread swapped out")); KASSERT(TD_ON_RUNQ(td), @@ -1208,7 +1208,7 @@ if (ts == NULL || (kecpu != NULL && - kecpu->ts_thread->td_priority < ts->ts_thread->td_priority)) { + TS_TO_TD(kecpu)->td_priority < TS_TO_TD(ts)->td_priority)) { CTR2(KTR_RUNQ, "choosing td_sched %p from pcpu runq %d", kecpu, PCPU_GET(cpuid)); ts = kecpu; @@ -1226,9 +1226,9 @@ runq_remove(rq, ts); ts->ts_flags |= TSF_DIDRUN; - KASSERT(ts->ts_thread->td_flags & TDF_INMEM, + KASSERT(TS_TO_TD(ts)->td_flags & TDF_INMEM, ("sched_choose: thread swapped out")); - return (ts->ts_thread); + return (TS_TO_TD(ts)); } return (PCPU_GET(idlethread)); } @@ -1242,7 +1242,7 @@ KASSERT(TD_IS_RUNNING(td), ("sched_bind: cannot bind non-running thread")); - ts = td->td_sched; + ts = TD_TO_TS(td); ts->ts_flags |= TSF_BOUND; #ifdef SMP @@ -1258,14 +1258,14 @@ sched_unbind(struct thread* td) { THREAD_LOCK_ASSERT(td, MA_OWNED); - td->td_sched->ts_flags &= ~TSF_BOUND; + TD_TO_TS(td)->ts_flags &= ~TSF_BOUND; } int sched_is_bound(struct thread *td) { THREAD_LOCK_ASSERT(td, MA_OWNED); - return (td->td_sched->ts_flags & TSF_BOUND); + return (TD_TO_TS(td)->ts_flags & TSF_BOUND); } void @@ -1295,13 +1295,20 @@ return (sizeof(struct thread) + sizeof(struct td_sched)); } +/* + * Early boot support. Make thread0 a viable entity. + */ +void +sched_init_thread0(void) +{ + + thread0p = &sched0.initial_thread; +} + fixpt_t sched_pctcpu(struct thread *td) { - struct td_sched *ts; - - ts = td->td_sched; - return (ts->ts_pctcpu); + return (TD_TO_TS(td)->ts_pctcpu); } void ==== //depot/projects/bike_sched/sys/kern/sched_ule.c#14 (text+ko) ==== @@ -83,7 +83,6 @@ */ struct td_sched { TAILQ_ENTRY(td_sched) ts_procq; /* Run queue. */ - struct thread *ts_thread; /* Active associated thread. */ struct runq *ts_runq; /* Run-queue we're queued on. */ short ts_flags; /* TSF_* flags. */ u_char ts_rqindex; /* Run queue index. */ @@ -103,7 +102,13 @@ #define TSF_BOUND 0x0001 /* Thread can not migrate. */ #define TSF_XFERABLE 0x0002 /* Thread was added as transferable. */ -static struct td_sched td_sched0; +#define TD_TO_TS(td) ((struct td_sched *)(&(td)[1])) +#define TS_TO_TD(ts) (&((struct thread *)(ts))[-1]) + +static struct { + struct thread initial_thread; + struct td_sched initial_sched; +} sched0 __aligned(16); /* * Cpu percentage computation macros and defines. @@ -326,6 +331,7 @@ { struct rqhead *rqh; struct td_sched *ts; + struct thread *td; int pri; int j; int i; @@ -338,8 +344,9 @@ pri = j + (i << RQB_L2BPW); rqh = &rq->rq_queues[pri]; TAILQ_FOREACH(ts, rqh, ts_procq) { + td = TS_TO_TD(ts); printf("\t\t\ttd %p(%s) priority %d rqindex %d pri %d\n", - ts->ts_thread, ts->ts_thread->td_name, ts->ts_thread->td_priority, ts->ts_rqindex, pri); + td, td->td_name, td->td_priority, ts->ts_rqindex, pri); } } } @@ -384,9 +391,9 @@ tdq_runq_add(struct tdq *tdq, struct td_sched *ts, int flags) { TDQ_LOCK_ASSERT(tdq, MA_OWNED); - THREAD_LOCK_ASSERT(ts->ts_thread, MA_OWNED); + THREAD_LOCK_ASSERT(TS_TO_TD(ts), MA_OWNED); #ifdef SMP - if (THREAD_CAN_MIGRATE(ts->ts_thread)) { + if (THREAD_CAN_MIGRATE(TS_TO_TD(ts))) { tdq->tdq_transferable++; tdq->tdq_group->tdg_transferable++; ts->ts_flags |= TSF_XFERABLE; @@ -395,7 +402,7 @@ if (ts->ts_runq == &tdq->tdq_timeshare) { u_char pri; - pri = ts->ts_thread->td_priority; + pri = TS_TO_TD(ts)->td_priority; KASSERT(pri <= PRI_MAX_TIMESHARE && pri >= PRI_MIN_TIMESHARE, ("Invalid priority %d on timeshare runq", pri)); /* @@ -430,7 +437,7 @@ { TDQ_LOCK_ASSERT(tdq, MA_OWNED); KASSERT(ts->ts_runq != NULL, - ("tdq_runq_remove: thread %p null ts_runq", ts->ts_thread)); + ("tdq_runq_remove: thread %p null ts_runq", TS_TO_TD(ts))); #ifdef SMP if (ts->ts_flags & TSF_XFERABLE) { tdq->tdq_transferable--; @@ -449,7 +456,7 @@ */ ts->ts_ltick = ticks; sched_pctcpu_update(ts); - sched_priority(ts->ts_thread); + sched_priority(TS_TO_TD(ts)); } else runq_remove(ts->ts_runq, ts); } @@ -464,12 +471,12 @@ int class; TDQ_LOCK_ASSERT(tdq, MA_OWNED); - THREAD_LOCK_ASSERT(ts->ts_thread, MA_OWNED); - class = PRI_BASE(ts->ts_thread->td_pri_class); + THREAD_LOCK_ASSERT(TS_TO_TD(ts), MA_OWNED); + class = PRI_BASE(TS_TO_TD(ts)->td_pri_class); tdq->tdq_load++; CTR2(KTR_SCHED, "cpu %d load: %d", TDQ_ID(tdq), tdq->tdq_load); if (class != PRI_ITHD && - (ts->ts_thread->td_proc->p_flag & P_NOLOAD) == 0) + (TS_TO_TD(ts)->td_proc->p_flag & P_NOLOAD) == 0) #ifdef SMP tdq->tdq_group->tdg_load++; #else @@ -486,11 +493,11 @@ { int class; - THREAD_LOCK_ASSERT(ts->ts_thread, MA_OWNED); + THREAD_LOCK_ASSERT(TS_TO_TD(ts), MA_OWNED); TDQ_LOCK_ASSERT(tdq, MA_OWNED); - class = PRI_BASE(ts->ts_thread->td_pri_class); + class = PRI_BASE(TS_TO_TD(ts)->td_pri_class); if (class != PRI_ITHD && - (ts->ts_thread->td_proc->p_flag & P_NOLOAD) == 0) + (TS_TO_TD(ts)->td_proc->p_flag & P_NOLOAD) == 0) #ifdef SMP tdq->tdq_group->tdg_load--; #else @@ -715,7 +722,7 @@ } if (tdq == to) return; - td = ts->ts_thread; + td = TS_TO_TD(ts); /* * Although the run queue is locked the thread may be blocked. Lock * it to clear this and acquire the run-queue lock. @@ -817,7 +824,7 @@ int cpu; cpu = ts->ts_cpu; - pri = ts->ts_thread->td_priority; + pri = TS_TO_TD(ts)->td_priority; pcpu = pcpu_find(cpu); ctd = pcpu->pc_curthread; cpri = ctd->td_priority; @@ -883,7 +890,7 @@ pri += (i << RQB_L2BPW); rqh = &rq->rq_queues[pri]; TAILQ_FOREACH(ts, rqh, ts_procq) { - if (first && THREAD_CAN_MIGRATE(ts->ts_thread)) + if (first && THREAD_CAN_MIGRATE(TS_TO_TD(ts))) return (ts); first = 1; } @@ -917,7 +924,7 @@ continue; rqh = &rq->rq_queues[bit + (word << RQB_L2BPW)]; TAILQ_FOREACH(ts, rqh, ts_procq) - if (THREAD_CAN_MIGRATE(ts->ts_thread)) + if (THREAD_CAN_MIGRATE(TS_TO_TD(ts))) return (ts); } } @@ -950,10 +957,10 @@ struct thread *td; struct tdq *tdq; - THREAD_LOCK_ASSERT(ts->ts_thread, MA_OWNED); + THREAD_LOCK_ASSERT(TS_TO_TD(ts), MA_OWNED); tdq = TDQ_CPU(cpu); - td = ts->ts_thread; + td = TS_TO_TD(ts); ts->ts_cpu = cpu; /* If the lock matches just return the queue. */ @@ -1078,7 +1085,7 @@ curthread->td_priority); return (self); } - pri = ts->ts_thread->td_priority; + pri = TS_TO_TD(ts)->td_priority; cpu = ts->ts_cpu; /* * Regardless of affinity, if the last cpu is idle send it there. @@ -1145,17 +1152,17 @@ return (ts); ts = runq_choose_from(&tdq->tdq_timeshare, tdq->tdq_ridx); if (ts != NULL) { - KASSERT(ts->ts_thread->td_priority >= PRI_MIN_TIMESHARE, + KASSERT(TS_TO_TD(ts)->td_priority >= PRI_MIN_TIMESHARE, ("tdq_choose: Invalid priority on timeshare queue %d", - ts->ts_thread->td_priority)); + TS_TO_TD(ts)->td_priority)); return (ts); } ts = runq_choose(&tdq->tdq_idle); if (ts != NULL) { - KASSERT(ts->ts_thread->td_priority >= PRI_MIN_IDLE, + KASSERT(TS_TO_TD(ts)->td_priority >= PRI_MIN_IDLE, ("tdq_choose: Invalid priority on idle queue %d", - ts->ts_thread->td_priority)); + TS_TO_TD(ts)->td_priority)); return (ts); } @@ -1330,7 +1337,7 @@ /* Add thread0's load since it's running. */ TDQ_LOCK(tdq); thread0.td_lock = TDQ_LOCKPTR(TDQ_SELF()); - tdq_load_add(tdq, &td_sched0); + tdq_load_add(tdq, TD_TO_TS(&thread0)); TDQ_UNLOCK(tdq); } @@ -1388,7 +1395,7 @@ struct td_sched *ts; int div; - ts = td->td_sched; + ts = TD_TO_TS(td); /* * The score is only needed if this is likely to be an interactive * task. Don't go through the expense of computing it if there's @@ -1425,6 +1432,7 @@ static void sched_priority(struct thread *td) { + struct td_sched *ts; int score; int pri; @@ -1453,15 +1461,15 @@ pri, score)); } else { pri = SCHED_PRI_MIN; - if (td->td_sched->ts_ticks) - pri += SCHED_PRI_TICKS(td->td_sched); + ts = TD_TO_TS(td); + if (ts->ts_ticks) + pri += SCHED_PRI_TICKS(ts); pri += SCHED_PRI_NICE(td->td_proc->p_nice); KASSERT(pri >= PRI_MIN_TIMESHARE && pri <= PRI_MAX_TIMESHARE, ("sched_priority: invalid priority %d: nice %d, " "ticks %d ftick %d ltick %d tick pri %d", - pri, td->td_proc->p_nice, td->td_sched->ts_ticks, - td->td_sched->ts_ftick, td->td_sched->ts_ltick, - SCHED_PRI_TICKS(td->td_sched))); + pri, td->td_proc->p_nice, ts->ts_ticks, + ts->ts_ftick, ts->ts_ltick, SCHED_PRI_TICKS(ts))); } sched_user_prio(td, pri); @@ -1479,7 +1487,7 @@ struct td_sched *ts; u_int sum; - ts = td->td_sched; + ts = TD_TO_TS(td); sum = ts->ts_runtime + ts->ts_slptime; if (sum < SCHED_SLP_RUN_MAX) return; @@ -1521,14 +1529,16 @@ static void sched_interact_fork(struct thread *td) { + struct td_sched *ts; int ratio; int sum; - sum = td->td_sched->ts_runtime + td->td_sched->ts_slptime; + ts = TD_TO_TS(td); + sum = ts->ts_runtime + ts->ts_slptime; if (sum > SCHED_SLP_RUN_FORK) { ratio = sum / SCHED_SLP_RUN_FORK; - td->td_sched->ts_runtime /= ratio; - td->td_sched->ts_slptime /= ratio; + ts->ts_runtime /= ratio; + ts->ts_slptime /= ratio; } } @@ -1543,10 +1553,8 @@ * Set up the scheduler specific parts of proc0. */ proc0.p_sched = NULL; /* XXX */ - thread0.td_sched = &td_sched0; - td_sched0.ts_ltick = ticks; - td_sched0.ts_ftick = ticks; - td_sched0.ts_thread = &thread0; + TD_TO_TS(&thread0)->ts_ltick = ticks; + TD_TO_TS(&thread0)->ts_ftick = ticks; } /* @@ -1602,7 +1610,7 @@ CTR6(KTR_SCHED, "sched_prio: %p(%s) prio %d newprio %d by %p(%s)", td, td->td_name, td->td_priority, prio, curthread, curthread->td_name); - ts = td->td_sched; + ts = TD_TO_TS(td); THREAD_LOCK_ASSERT(td, MA_OWNED); if (td->td_priority == prio) return; @@ -1753,7 +1761,7 @@ TDQ_UNLOCK(tdq); thread_lock(td); spinlock_exit(); - sched_setcpu(td->td_sched, TDQ_ID(tdq), SRQ_YIELDING); + sched_setcpu(TD_TO_TS(td), TDQ_ID(tdq), SRQ_YIELDING); #else td->td_lock = TDQ_LOCKPTR(tdq); #endif @@ -1770,7 +1778,7 @@ { struct tdq *tdn; - tdn = TDQ_CPU(td->td_sched->ts_cpu); + tdn = TDQ_CPU(TD_TO_TS(td)->ts_cpu); #ifdef SMP /* * Do the lock dance required to avoid LOR. We grab an extra @@ -1781,7 +1789,7 @@ thread_block_switch(td); /* This releases the lock on tdq. */ TDQ_LOCK(tdn); tdq_add(tdn, td, flags); - tdq_notify(td->td_sched); + tdq_notify(TD_TO_TS(td)); /* * After we unlock tdn the new cpu still can't switch into this * thread until we've unblocked it in cpu_switch(). The lock @@ -1843,7 +1851,7 @@ cpuid = PCPU_GET(cpuid); tdq = TDQ_CPU(cpuid); - ts = td->td_sched; + ts = TD_TO_TS(td); mtx = td->td_lock; #ifdef SMP ts->ts_rltick = ticks; @@ -1968,7 +1976,7 @@ int slptick; THREAD_LOCK_ASSERT(td, MA_OWNED); - ts = td->td_sched; + ts = TD_TO_TS(td); /* * If we slept for more than a tick update our interactivity and * priority. @@ -2005,8 +2013,8 @@ THREAD_LOCK_ASSERT(td, MA_OWNED); sched_newthread(child); child->td_lock = TDQ_LOCKPTR(TDQ_SELF()); - ts = td->td_sched; - ts2 = child->td_sched; + ts = TD_TO_TS(td); + ts2 = TD_TO_TS(child); ts2->ts_cpu = ts->ts_cpu; ts2->ts_runq = NULL; /* @@ -2028,7 +2036,7 @@ */ sched_interact_fork(child); sched_priority(child); - td->td_sched->ts_runtime += tickincr; + TD_TO_TS(td)->ts_runtime += tickincr; sched_interact_update(td); sched_priority(td); } @@ -2053,7 +2061,7 @@ if (TD_ON_RUNQ(td)) { struct tdq *tdq; - tdq = TDQ_CPU(td->td_sched->ts_cpu); + tdq = TDQ_CPU(TD_TO_TS(td)->ts_cpu); if (THREAD_CAN_MIGRATE(td)) { tdq->tdq_transferable--; tdq->tdq_group->tdg_transferable--; @@ -2091,7 +2099,7 @@ * launch expensive things to mark their children as expensive. */ thread_lock(td); - td->td_sched->ts_runtime += child->td_sched->ts_runtime; + TD_TO_TS(td)->ts_runtime += TD_TO_TS(child)->ts_runtime; sched_interact_update(td); sched_priority(td); thread_unlock(td); @@ -2129,7 +2137,7 @@ if (TAILQ_EMPTY(&tdq->tdq_timeshare.rq_queues[tdq->tdq_ridx])) tdq->tdq_ridx = tdq->tdq_idx; } - ts = td->td_sched; + ts = TD_TO_TS(td); /* * We only do slicing code for TIMESHARE threads. */ @@ -2139,7 +2147,7 @@ * We used a tick; charge it to the thread so that we can compute our * interactivity. */ - td->td_sched->ts_runtime += tickincr; + ts->ts_runtime += tickincr; sched_interact_update(td); /* * We used up one time slice. @@ -2162,7 +2170,7 @@ { struct td_sched *ts; - ts = curthread->td_sched; + ts = TD_TO_TS(curthread); /* Adjust ticks for pctcpu */ ts->ts_ticks += 1 << SCHED_TICK_SHIFT; ts->ts_ltick = ticks; @@ -2217,7 +2225,7 @@ ts = tdq_choose(tdq); if (ts) { tdq_runq_rem(tdq, ts); - return (ts->ts_thread); + return (TS_TO_TD(ts)); } #ifdef SMP /* @@ -2284,7 +2292,7 @@ KASSERT(td->td_flags & TDF_INMEM, ("sched_add: thread swapped out")); - ts = td->td_sched; + ts = TD_TO_TS(td); class = PRI_BASE(td->td_pri_class); TD_SET_RUNQ(td); if (ts->ts_slice == 0) @@ -2342,7 +2350,7 @@ td, td->td_name, td->td_priority, curthread, curthread->td_name); THREAD_LOCK_ASSERT(td, MA_OWNED); - ts = td->td_sched; + ts = TD_TO_TS(td); /* * Recalculate the priority before we select the target cpu or * run-queue. @@ -2401,7 +2409,7 @@ CTR5(KTR_SCHED, "sched_rem: %p(%s) prio %d by %p(%s)", td, td->td_name, td->td_priority, curthread, curthread->td_name); - ts = td->td_sched; + ts = TD_TO_TS(td); tdq = TDQ_CPU(ts->ts_cpu); TDQ_LOCK_ASSERT(tdq, MA_OWNED); MPASS(td->td_lock == TDQ_LOCKPTR(tdq)); @@ -2422,7 +2430,7 @@ struct td_sched *ts; pctcpu = 0; - ts = td->td_sched; + ts = TD_TO_TS(td); if (ts == NULL) return (0); @@ -2449,7 +2457,7 @@ struct td_sched *ts; THREAD_LOCK_ASSERT(td, MA_OWNED|MA_NOTRECURSED); - ts = td->td_sched; + ts = TD_TO_TS(td); if (ts->ts_flags & TSF_BOUND) sched_unbind(td); ts->ts_flags |= TSF_BOUND; @@ -2472,7 +2480,7 @@ struct td_sched *ts; THREAD_LOCK_ASSERT(td, MA_OWNED); - ts = td->td_sched; + ts = TD_TO_TS(td); if ((ts->ts_flags & TSF_BOUND) == 0) return; ts->ts_flags &= ~TSF_BOUND; @@ -2485,7 +2493,7 @@ sched_is_bound(struct thread *td) { THREAD_LOCK_ASSERT(td, MA_OWNED); - return (td->td_sched->ts_flags & TSF_BOUND); + return (TD_TO_TS(td)->ts_flags & TSF_BOUND); } /* @@ -2532,6 +2540,16 @@ } /* + * Early boot support. Make thread0 a viable entity. + */ +void +sched_init_thread0(void) +{ + + thread0p = &sched0.initial_thread; +} + +/* * The actual idle process. */ void @@ -2570,7 +2588,7 @@ spinlock_exit(); } else { MPASS(td->td_lock == TDQ_LOCKPTR(tdq)); - tdq_load_rem(tdq, td->td_sched); + tdq_load_rem(tdq, TD_TO_TS(td)); } KASSERT(curthread->td_md.md_spinlock_count == 1, ("invalid count")); newtd = choosethread(); @@ -2597,7 +2615,7 @@ */ cpuid = PCPU_GET(cpuid); tdq = TDQ_CPU(cpuid); - ts = td->td_sched; + ts = TD_TO_TS(td); if (TD_IS_IDLETHREAD(td)) td->td_lock = TDQ_LOCKPTR(tdq); MPASS(td->td_lock == TDQ_LOCKPTR(tdq)); @@ -2605,6 +2623,7 @@ TDQ_LOCK_ASSERT(tdq, MA_OWNED | MA_NOTRECURSED); } + static SYSCTL_NODE(_kern, OID_AUTO, sched, CTLFLAG_RW, 0, "Scheduler"); SYSCTL_STRING(_kern_sched, OID_AUTO, name, CTLFLAG_RD, "ULE", 0, @@ -2640,6 +2659,5 @@ static int ccpu = 0; SYSCTL_INT(_kern, OID_AUTO, ccpu, CTLFLAG_RD, &ccpu, 0, ""); - #define KERN_SWITCH_INCLUDE 1 #include "kern/kern_switch.c" ==== //depot/projects/bike_sched/sys/pc98/pc98/machdep.c#7 (text+ko) ==== @@ -1906,6 +1906,7 @@ int gsel_tss, metadata_missing, x; struct pcpu *pc; + sched_init_thread0(); thread0.td_kstack = proc0kstack; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/bike_sched/sys/powerpc/powerpc/machdep.c#5 (text+ko) ==== @@ -292,6 +292,7 @@ /* * Start initializing proc0 and thread0. */ + sched_init_thread0(); proc_linkup0(&proc0, &thread0); thread0.td_frame = &frame0; ==== //depot/projects/bike_sched/sys/sparc64/sparc64/machdep.c#5 (text+ko) ==== @@ -399,6 +399,7 @@ /* * Initialize proc0 stuff (p_contested needs to be done early). */ + sched_init_thread0(); proc_linkup0(&proc0, &thread0); proc0.p_md.md_sigtramp = NULL; proc0.p_md.md_utrap = NULL; ==== //depot/projects/bike_sched/sys/sun4v/sun4v/machdep.c#2 (text+ko) ==== @@ -363,7 +363,7 @@ /* * Initialize proc0 stuff (p_contested needs to be done early). */ - + sched_init_thread0(); proc_linkup0(&proc0, &thread0); proc0.p_md.md_sigtramp = NULL; proc0.p_md.md_utrap = NULL; ==== //depot/projects/bike_sched/sys/sys/proc.h#8 (text+ko) ==== @@ -732,7 +732,8 @@ extern struct sx proctree_lock; extern struct mtx ppeers_lock; extern struct proc proc0; /* Process slot for swapper. */ -extern struct thread thread0; /* Primary thread in proc0. */ +extern struct thread *thread0p; /* Primary thread in proc0. */ +#define thread0 (*thread0p) /* API Compatability */ extern struct vmspace vmspace0; /* VM space for proc0. */ extern int hogticks; /* Limit on kernel cpu hogs. */ extern int lastpid; ==== //depot/projects/bike_sched/sys/sys/sched.h#7 (text+ko) ==== @@ -169,10 +169,12 @@ #define SCHED_STAT_INC(var) #endif -/* temporarily here */ +/* (not so) temporarily here */ void schedinit(void); void sched_newproc(struct proc *p, struct thread *td); void sched_newthread(struct thread *td); +void sched_init_thread0(void); + #endif /* _KERNEL */ /* POSIX 1003.1b Process Scheduling */ From owner-p4-projects@FreeBSD.ORG Sun Dec 2 06:25:49 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52A9516A41A; Sun, 2 Dec 2007 06:25: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 B337E16A417 for ; Sun, 2 Dec 2007 06:25:48 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8804713C45A for ; Sun, 2 Dec 2007 06:25:48 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2667Xg081160 for ; Sun, 2 Dec 2007 06:06:07 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB26673Y081157 for perforce@freebsd.org; Sun, 2 Dec 2007 06:06:07 GMT (envelope-from sam@freebsd.org) Date: Sun, 2 Dec 2007 06:06:07 GMT Message-Id: <200712020606.lB26673Y081157@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 129960 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 06:25:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=129960 Change 129960 by sam@sam_ebb on 2007/12/02 06:05:17 clear old state Affected files ... .. //depot/projects/vap/sbin/ifconfig/Makefile#5 delete .. //depot/projects/vap/sbin/ifconfig/af_atalk.c#3 delete .. //depot/projects/vap/sbin/ifconfig/af_inet.c#3 delete .. //depot/projects/vap/sbin/ifconfig/af_inet6.c#3 delete .. //depot/projects/vap/sbin/ifconfig/af_ipx.c#3 delete .. //depot/projects/vap/sbin/ifconfig/af_link.c#3 delete .. //depot/projects/vap/sbin/ifconfig/ifclone.c#3 delete .. //depot/projects/vap/sbin/ifconfig/ifconfig.8#3 delete .. //depot/projects/vap/sbin/ifconfig/ifconfig.c#3 delete .. //depot/projects/vap/sbin/ifconfig/ifconfig.h#3 delete .. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#7 delete .. //depot/projects/vap/sbin/ifconfig/ifmedia.c#3 delete .. //depot/projects/vap/sbin/ifconfig/ifpfsync.c#3 delete .. //depot/projects/vap/sbin/ifconfig/ifvlan.c#3 delete .. //depot/projects/vap/sys/Makefile#4 delete .. //depot/projects/vap/sys/amd64/acpica/OsdEnvironment.c#3 delete .. //depot/projects/vap/sys/amd64/acpica/acpi_machdep.c#3 delete .. //depot/projects/vap/sys/amd64/acpica/acpi_wakeup.c#3 delete .. //depot/projects/vap/sys/amd64/acpica/madt.c#4 delete .. //depot/projects/vap/sys/amd64/amd64/apic_vector.S#4 delete .. //depot/projects/vap/sys/amd64/amd64/autoconf.c#3 delete .. //depot/projects/vap/sys/amd64/amd64/bios.c#3 delete .. //depot/projects/vap/sys/amd64/amd64/busdma_machdep.c#4 delete .. //depot/projects/vap/sys/amd64/amd64/cpu_switch.S#3 delete .. //depot/projects/vap/sys/amd64/amd64/db_disasm.c#4 delete .. //depot/projects/vap/sys/amd64/amd64/db_trace.c#4 delete .. //depot/projects/vap/sys/amd64/amd64/dump_machdep.c#3 delete .. //depot/projects/vap/sys/amd64/amd64/elf_machdep.c#3 delete .. //depot/projects/vap/sys/amd64/amd64/exception.S#4 delete .. //depot/projects/vap/sys/amd64/amd64/fpu.c#4 delete .. //depot/projects/vap/sys/amd64/amd64/gdb_machdep.c#3 delete .. //depot/projects/vap/sys/amd64/amd64/genassym.c#3 delete .. //depot/projects/vap/sys/amd64/amd64/identcpu.c#4 delete .. //depot/projects/vap/sys/amd64/amd64/initcpu.c#3 delete .. //depot/projects/vap/sys/amd64/amd64/intr_machdep.c#4 delete .. //depot/projects/vap/sys/amd64/amd64/io.c#3 delete .. //depot/projects/vap/sys/amd64/amd64/io_apic.c#4 delete .. //depot/projects/vap/sys/amd64/amd64/legacy.c#4 delete .. //depot/projects/vap/sys/amd64/amd64/local_apic.c#4 delete .. //depot/projects/vap/sys/amd64/amd64/machdep.c#4 delete .. //depot/projects/vap/sys/amd64/amd64/mp_machdep.c#4 delete .. //depot/projects/vap/sys/amd64/amd64/mp_watchdog.c#4 delete .. //depot/projects/vap/sys/amd64/amd64/mptable.c#4 delete .. //depot/projects/vap/sys/amd64/amd64/mptable_pci.c#3 delete .. //depot/projects/vap/sys/amd64/amd64/nexus.c#4 delete .. //depot/projects/vap/sys/amd64/amd64/pmap.c#4 delete .. //depot/projects/vap/sys/amd64/amd64/prof_machdep.c#4 delete .. //depot/projects/vap/sys/amd64/amd64/support.S#4 delete .. //depot/projects/vap/sys/amd64/amd64/sys_machdep.c#4 delete .. //depot/projects/vap/sys/amd64/amd64/trap.c#4 delete .. //depot/projects/vap/sys/amd64/amd64/tsc.c#3 delete .. //depot/projects/vap/sys/amd64/amd64/uma_machdep.c#3 delete .. //depot/projects/vap/sys/amd64/amd64/vm_machdep.c#4 delete .. //depot/projects/vap/sys/amd64/conf/GENERIC#4 delete .. //depot/projects/vap/sys/amd64/conf/GENERIC.hints#3 delete .. //depot/projects/vap/sys/amd64/conf/NOTES#4 delete .. //depot/projects/vap/sys/amd64/ia32/ia32_exception.S#3 delete .. //depot/projects/vap/sys/amd64/ia32/ia32_signal.c#3 delete .. //depot/projects/vap/sys/amd64/ia32/ia32_sigtramp.S#3 delete .. //depot/projects/vap/sys/amd64/ia32/ia32_syscall.c#4 delete .. //depot/projects/vap/sys/amd64/include/_limits.h#3 delete .. //depot/projects/vap/sys/amd64/include/_types.h#4 delete .. //depot/projects/vap/sys/amd64/include/acpica_machdep.h#3 delete .. //depot/projects/vap/sys/amd64/include/apicvar.h#4 delete .. //depot/projects/vap/sys/amd64/include/asm.h#4 delete .. //depot/projects/vap/sys/amd64/include/asmacros.h#3 delete .. //depot/projects/vap/sys/amd64/include/atomic.h#4 delete .. //depot/projects/vap/sys/amd64/include/bus.h#4 delete .. //depot/projects/vap/sys/amd64/include/bus_dma.h#4 delete .. //depot/projects/vap/sys/amd64/include/clock.h#3 delete .. //depot/projects/vap/sys/amd64/include/cpu.h#3 delete .. //depot/projects/vap/sys/amd64/include/cpufunc.h#4 delete .. //depot/projects/vap/sys/amd64/include/elf.h#3 delete .. //depot/projects/vap/sys/amd64/include/frame.h#3 delete .. //depot/projects/vap/sys/amd64/include/gdb_machdep.h#3 delete .. //depot/projects/vap/sys/amd64/include/intr_machdep.h#4 delete .. //depot/projects/vap/sys/amd64/include/kdb.h#3 delete .. //depot/projects/vap/sys/amd64/include/legacyvar.h#4 delete .. //depot/projects/vap/sys/amd64/include/md_var.h#3 delete .. //depot/projects/vap/sys/amd64/include/mptable.h#3 delete .. //depot/projects/vap/sys/amd64/include/mutex.h#3 delete .. //depot/projects/vap/sys/amd64/include/param.h#4 delete .. //depot/projects/vap/sys/amd64/include/pc/bios.h#3 delete .. //depot/projects/vap/sys/amd64/include/pcb.h#3 delete .. //depot/projects/vap/sys/amd64/include/pci_cfgreg.h#3 delete .. //depot/projects/vap/sys/amd64/include/pcpu.h#4 delete .. //depot/projects/vap/sys/amd64/include/pmap.h#3 delete .. //depot/projects/vap/sys/amd64/include/pmc_mdep.h#3 delete .. //depot/projects/vap/sys/amd64/include/profile.h#4 delete .. //depot/projects/vap/sys/amd64/include/reg.h#3 delete .. //depot/projects/vap/sys/amd64/include/segments.h#3 delete .. //depot/projects/vap/sys/amd64/include/setjmp.h#3 delete .. //depot/projects/vap/sys/amd64/include/signal.h#3 delete .. //depot/projects/vap/sys/amd64/include/smp.h#4 delete .. //depot/projects/vap/sys/amd64/include/specialreg.h#3 delete .. //depot/projects/vap/sys/amd64/include/stdarg.h#4 delete .. //depot/projects/vap/sys/amd64/include/trap.h#3 delete .. //depot/projects/vap/sys/amd64/include/vmparam.h#3 delete .. //depot/projects/vap/sys/amd64/isa/atpic.c#4 delete .. //depot/projects/vap/sys/amd64/isa/atpic_vector.S#3 delete .. //depot/projects/vap/sys/amd64/isa/clock.c#4 delete .. //depot/projects/vap/sys/amd64/isa/icu.h#3 delete .. //depot/projects/vap/sys/amd64/isa/isa.c#4 delete .. //depot/projects/vap/sys/amd64/isa/isa.h#3 delete .. //depot/projects/vap/sys/amd64/isa/isa_dma.c#4 delete .. //depot/projects/vap/sys/amd64/linux32/linux.h#3 delete .. //depot/projects/vap/sys/amd64/linux32/linux32_dummy.c#3 delete .. //depot/projects/vap/sys/amd64/linux32/linux32_locore.s#3 delete .. //depot/projects/vap/sys/amd64/linux32/linux32_machdep.c#4 delete .. //depot/projects/vap/sys/amd64/linux32/linux32_proto.h#4 delete .. //depot/projects/vap/sys/amd64/linux32/linux32_syscall.h#4 delete .. //depot/projects/vap/sys/amd64/linux32/linux32_sysent.c#4 delete .. //depot/projects/vap/sys/amd64/linux32/linux32_sysvec.c#4 delete .. //depot/projects/vap/sys/amd64/linux32/syscalls.conf#3 delete .. //depot/projects/vap/sys/amd64/linux32/syscalls.master#4 delete .. //depot/projects/vap/sys/amd64/pci/pci_bus.c#3 delete .. //depot/projects/vap/sys/amd64/pci/pci_cfgreg.c#4 delete .. //depot/projects/vap/sys/arm/arm/autoconf.c#3 delete .. //depot/projects/vap/sys/arm/arm/bcopy_page.S#3 delete .. //depot/projects/vap/sys/arm/arm/bcopyinout.S#3 delete .. //depot/projects/vap/sys/arm/arm/bcopyinout_xscale.S#3 delete .. //depot/projects/vap/sys/arm/arm/busdma_machdep.c#4 delete .. //depot/projects/vap/sys/arm/arm/cpufunc.c#4 delete .. //depot/projects/vap/sys/arm/arm/cpufunc_asm_arm9.S#3 delete .. //depot/projects/vap/sys/arm/arm/db_interface.c#3 delete .. //depot/projects/vap/sys/arm/arm/db_trace.c#3 delete .. //depot/projects/vap/sys/arm/arm/dump_machdep.c#3 delete .. //depot/projects/vap/sys/arm/arm/elf_machdep.c#3 delete .. //depot/projects/vap/sys/arm/arm/fusu.S#4 delete .. //depot/projects/vap/sys/arm/arm/genassym.c#4 delete .. //depot/projects/vap/sys/arm/arm/identcpu.c#3 delete .. //depot/projects/vap/sys/arm/arm/in_cksum.c#4 delete .. //depot/projects/vap/sys/arm/arm/in_cksum_arm.S#3 delete .. //depot/projects/vap/sys/arm/arm/intr.c#3 delete .. //depot/projects/vap/sys/arm/arm/locore.S#4 delete .. //depot/projects/vap/sys/arm/arm/machdep.c#4 delete .. //depot/projects/vap/sys/arm/arm/mem.c#3 delete .. //depot/projects/vap/sys/arm/arm/nexus.c#3 delete .. //depot/projects/vap/sys/arm/arm/nexus_io.c#3 delete .. //depot/projects/vap/sys/arm/arm/pmap.c#4 delete .. //depot/projects/vap/sys/arm/arm/support.S#4 delete .. //depot/projects/vap/sys/arm/arm/swtch.S#4 delete .. //depot/projects/vap/sys/arm/arm/sys_machdep.c#4 delete .. //depot/projects/vap/sys/arm/arm/trap.c#4 delete .. //depot/projects/vap/sys/arm/arm/undefined.c#4 delete .. //depot/projects/vap/sys/arm/arm/vm_machdep.c#4 delete .. //depot/projects/vap/sys/arm/conf/IQ31244#3 delete .. //depot/projects/vap/sys/arm/conf/SIMICS#3 delete .. //depot/projects/vap/sys/arm/include/_limits.h#3 delete .. //depot/projects/vap/sys/arm/include/_types.h#4 delete .. //depot/projects/vap/sys/arm/include/armreg.h#3 delete .. //depot/projects/vap/sys/arm/include/asm.h#3 delete .. //depot/projects/vap/sys/arm/include/asmacros.h#4 delete .. //depot/projects/vap/sys/arm/include/atomic.h#4 delete .. //depot/projects/vap/sys/arm/include/bootconfig.h#3 delete .. //depot/projects/vap/sys/arm/include/bus.h#4 delete .. //depot/projects/vap/sys/arm/include/bus_dma.h#3 delete .. //depot/projects/vap/sys/arm/include/clock.h#3 delete .. //depot/projects/vap/sys/arm/include/cpu.h#4 delete .. //depot/projects/vap/sys/arm/include/cpuconf.h#3 delete .. //depot/projects/vap/sys/arm/include/cpufunc.h#3 delete .. //depot/projects/vap/sys/arm/include/db_machdep.h#3 delete .. //depot/projects/vap/sys/arm/include/elf.h#3 delete .. //depot/projects/vap/sys/arm/include/endian.h#3 delete .. //depot/projects/vap/sys/arm/include/frame.h#3 delete .. //depot/projects/vap/sys/arm/include/in_cksum.h#3 delete .. //depot/projects/vap/sys/arm/include/intr.h#4 delete .. //depot/projects/vap/sys/arm/include/kdb.h#3 delete .. //depot/projects/vap/sys/arm/include/md_var.h#3 delete .. //depot/projects/vap/sys/arm/include/param.h#3 delete .. //depot/projects/vap/sys/arm/include/pcpu.h#3 delete .. //depot/projects/vap/sys/arm/include/pmap.h#4 delete .. //depot/projects/vap/sys/arm/include/pmc_mdep.h#3 delete .. //depot/projects/vap/sys/arm/include/profile.h#3 delete .. //depot/projects/vap/sys/arm/include/pte.h#3 delete .. //depot/projects/vap/sys/arm/include/sf_buf.h#3 delete .. //depot/projects/vap/sys/arm/include/signal.h#3 delete .. //depot/projects/vap/sys/arm/include/stdarg.h#4 delete .. //depot/projects/vap/sys/arm/include/undefined.h#3 delete .. //depot/projects/vap/sys/arm/include/vmparam.h#3 delete .. //depot/projects/vap/sys/arm/sa11x0/assabet_machdep.c#3 delete .. //depot/projects/vap/sys/arm/sa11x0/sa11x0.c#3 delete .. //depot/projects/vap/sys/arm/sa11x0/sa11x0_io.c#4 delete .. //depot/projects/vap/sys/arm/sa11x0/sa11x0_irqhandler.c#3 delete .. //depot/projects/vap/sys/arm/sa11x0/sa11x0_ost.c#3 delete .. //depot/projects/vap/sys/arm/sa11x0/sa11x0_reg.h#3 delete .. //depot/projects/vap/sys/arm/sa11x0/sa11x0_var.h#3 delete .. //depot/projects/vap/sys/arm/sa11x0/uart_cpu_sa1110.c#3 delete .. //depot/projects/vap/sys/arm/sa11x0/uart_dev_sa1110.c#3 delete .. //depot/projects/vap/sys/arm/xscale/i80321/files.i80321#3 delete .. //depot/projects/vap/sys/arm/xscale/i80321/i80321.c#4 delete .. //depot/projects/vap/sys/arm/xscale/i80321/i80321_intr.h#3 delete .. //depot/projects/vap/sys/arm/xscale/i80321/i80321_pci.c#3 delete .. //depot/projects/vap/sys/arm/xscale/i80321/i80321_space.c#4 delete .. //depot/projects/vap/sys/arm/xscale/i80321/i80321_timer.c#4 delete .. //depot/projects/vap/sys/arm/xscale/i80321/i80321_wdog.c#3 delete .. //depot/projects/vap/sys/arm/xscale/i80321/i80321reg.h#3 delete .. //depot/projects/vap/sys/arm/xscale/i80321/i80321var.h#3 delete .. //depot/projects/vap/sys/arm/xscale/i80321/iq31244_7seg.c#3 delete .. //depot/projects/vap/sys/arm/xscale/i80321/iq31244_machdep.c#4 delete .. //depot/projects/vap/sys/arm/xscale/i80321/iq80321.c#4 delete .. //depot/projects/vap/sys/arm/xscale/i80321/iq80321reg.h#3 delete .. //depot/projects/vap/sys/arm/xscale/i80321/obio.c#3 delete .. //depot/projects/vap/sys/arm/xscale/i80321/obio_space.c#4 delete .. //depot/projects/vap/sys/arm/xscale/i80321/obiovar.h#3 delete .. //depot/projects/vap/sys/arm/xscale/i80321/std.iq31244#3 delete .. //depot/projects/vap/sys/arm/xscale/i80321/uart_cpu_i80321.c#4 delete .. //depot/projects/vap/sys/boot/Makefile#3 delete .. //depot/projects/vap/sys/boot/common/Makefile.inc#3 delete .. //depot/projects/vap/sys/boot/common/boot.c#3 delete .. //depot/projects/vap/sys/boot/common/bootstrap.h#3 delete .. //depot/projects/vap/sys/boot/common/console.c#3 delete .. //depot/projects/vap/sys/boot/common/devopen.c#3 delete .. //depot/projects/vap/sys/boot/common/help.common#3 delete .. //depot/projects/vap/sys/boot/common/load_elf.c#3 delete .. //depot/projects/vap/sys/boot/common/load_elf_obj.c#3 delete .. //depot/projects/vap/sys/boot/common/loader.8#4 delete .. //depot/projects/vap/sys/boot/common/merge_help.awk#3 delete .. //depot/projects/vap/sys/boot/common/module.c#3 delete .. //depot/projects/vap/sys/boot/common/panic.c#3 delete .. //depot/projects/vap/sys/boot/common/pnp.c#3 delete .. //depot/projects/vap/sys/boot/common/reloc_elf.c#3 delete .. //depot/projects/vap/sys/boot/common/ufsread.c#4 delete .. //depot/projects/vap/sys/boot/efi/include/efi.h#3 delete .. //depot/projects/vap/sys/boot/efi/include/efi_nii.h#3 delete .. //depot/projects/vap/sys/boot/efi/include/efiapi.h#3 delete .. //depot/projects/vap/sys/boot/efi/include/eficon.h#3 delete .. //depot/projects/vap/sys/boot/efi/include/efidebug.h#3 delete .. //depot/projects/vap/sys/boot/efi/include/efidef.h#3 delete .. //depot/projects/vap/sys/boot/efi/include/efidevp.h#3 delete .. //depot/projects/vap/sys/boot/efi/include/efierr.h#3 delete .. //depot/projects/vap/sys/boot/efi/include/efifs.h#3 delete .. //depot/projects/vap/sys/boot/efi/include/efilib.h#3 delete .. //depot/projects/vap/sys/boot/efi/include/efinet.h#3 delete .. //depot/projects/vap/sys/boot/efi/include/efipart.h#3 delete .. //depot/projects/vap/sys/boot/efi/include/efiprot.h#3 delete .. //depot/projects/vap/sys/boot/efi/include/efipxebc.h#3 delete .. //depot/projects/vap/sys/boot/efi/include/efiser.h#3 delete .. //depot/projects/vap/sys/boot/efi/include/efistdarg.h#3 delete .. //depot/projects/vap/sys/boot/efi/include/i386/efibind.h#4 delete .. //depot/projects/vap/sys/boot/efi/include/i386/pe.h#3 delete .. //depot/projects/vap/sys/boot/efi/include/ia64/efibind.h#4 delete .. //depot/projects/vap/sys/boot/efi/include/ia64/pe.h#3 delete .. //depot/projects/vap/sys/boot/efi/libefi/Makefile#3 delete .. //depot/projects/vap/sys/boot/efi/libefi/efifs.c#3 delete .. //depot/projects/vap/sys/boot/efi/libefi/efinet.c#3 delete .. //depot/projects/vap/sys/boot/efi/libefi/libefi.c#3 delete .. //depot/projects/vap/sys/boot/efi/libefi/time.c#3 delete .. //depot/projects/vap/sys/boot/ficl/Makefile#3 delete .. //depot/projects/vap/sys/boot/ficl/ficl.h#3 delete .. //depot/projects/vap/sys/boot/ficl/float.c#3 delete .. //depot/projects/vap/sys/boot/ficl/loader.c#3 delete .. //depot/projects/vap/sys/boot/ficl/softwords/fileaccess.fr#3 delete .. //depot/projects/vap/sys/boot/ficl/softwords/jhlocal.fr#3 delete .. //depot/projects/vap/sys/boot/ficl/softwords/oo.fr#3 delete .. //depot/projects/vap/sys/boot/ficl/softwords/prefix.fr#3 delete .. //depot/projects/vap/sys/boot/ficl/softwords/softcore.awk#3 delete .. //depot/projects/vap/sys/boot/ficl/tools.c#3 delete .. //depot/projects/vap/sys/boot/ficl/unix.c#3 delete .. //depot/projects/vap/sys/boot/ficl/vm.c#3 delete .. //depot/projects/vap/sys/boot/ficl/words.c#3 delete .. //depot/projects/vap/sys/boot/forth/beastie.4th#3 delete .. //depot/projects/vap/sys/boot/forth/loader.4th#3 delete .. //depot/projects/vap/sys/boot/forth/loader.conf#4 delete .. //depot/projects/vap/sys/boot/forth/loader.conf.5#3 delete .. //depot/projects/vap/sys/boot/forth/support.4th#3 delete .. //depot/projects/vap/sys/boot/i386/Makefile#3 delete .. //depot/projects/vap/sys/boot/i386/Makefile.inc#4 delete .. //depot/projects/vap/sys/boot/i386/boot0/boot0.S#4 delete .. //depot/projects/vap/sys/boot/i386/boot2/Makefile#4 delete .. //depot/projects/vap/sys/boot/i386/boot2/boot1.S#3 delete .. //depot/projects/vap/sys/boot/i386/boot2/boot2.c#3 delete .. //depot/projects/vap/sys/boot/i386/boot2/lib.h#3 delete .. //depot/projects/vap/sys/boot/i386/boot2/sio.S#3 delete .. //depot/projects/vap/sys/boot/i386/btx/btx/btx.S#3 delete .. //depot/projects/vap/sys/boot/i386/cdboot/cdboot.s#3 delete .. //depot/projects/vap/sys/boot/i386/libi386/Makefile#3 delete .. //depot/projects/vap/sys/boot/i386/libi386/biosacpi.c#4 delete .. //depot/projects/vap/sys/boot/i386/libi386/bioscd.c#3 delete .. //depot/projects/vap/sys/boot/i386/libi386/biosdisk.c#3 delete .. //depot/projects/vap/sys/boot/i386/libi386/biosmem.c#3 delete .. //depot/projects/vap/sys/boot/i386/libi386/biospci.c#3 delete .. //depot/projects/vap/sys/boot/i386/libi386/biospnp.c#3 delete .. //depot/projects/vap/sys/boot/i386/libi386/biossmap.c#3 delete .. //depot/projects/vap/sys/boot/i386/libi386/bootinfo.c#3 delete .. //depot/projects/vap/sys/boot/i386/libi386/bootinfo32.c#3 delete .. //depot/projects/vap/sys/boot/i386/libi386/bootinfo64.c#3 delete .. //depot/projects/vap/sys/boot/i386/libi386/comconsole.c#3 delete .. //depot/projects/vap/sys/boot/i386/libi386/devicename.c#3 delete .. //depot/projects/vap/sys/boot/i386/libi386/elf32_freebsd.c#3 delete .. //depot/projects/vap/sys/boot/i386/libi386/elf64_freebsd.c#3 delete .. //depot/projects/vap/sys/boot/i386/libi386/i386_copy.c#3 delete .. //depot/projects/vap/sys/boot/i386/libi386/libi386.h#3 delete .. //depot/projects/vap/sys/boot/i386/libi386/pxe.c#4 delete .. //depot/projects/vap/sys/boot/i386/loader/Makefile#3 delete .. //depot/projects/vap/sys/boot/i386/loader/conf.c#3 delete .. //depot/projects/vap/sys/boot/i386/loader/help.i386#3 delete .. //depot/projects/vap/sys/boot/i386/loader/main.c#3 delete .. //depot/projects/vap/sys/boot/i386/pxeldr/pxeboot.8#3 delete .. //depot/projects/vap/sys/boot/i386/pxeldr/pxeldr.S#3 delete .. //depot/projects/vap/sys/boot/ia64/Makefile#3 delete .. //depot/projects/vap/sys/boot/ia64/efi/Makefile#3 delete .. //depot/projects/vap/sys/boot/ia64/efi/conf.c#3 delete .. //depot/projects/vap/sys/boot/ia64/efi/efimd.c#3 delete .. //depot/projects/vap/sys/boot/ia64/efi/main.c#3 delete .. //depot/projects/vap/sys/boot/ia64/efi/start.S#3 delete .. //depot/projects/vap/sys/boot/ia64/efi/version#3 delete .. //depot/projects/vap/sys/boot/ia64/ski/Makefile#3 delete .. //depot/projects/vap/sys/boot/ia64/ski/acpi_stub.c#3 delete .. //depot/projects/vap/sys/boot/ia64/ski/conf.c#3 delete .. //depot/projects/vap/sys/boot/ia64/ski/efi_stub.c#3 delete .. //depot/projects/vap/sys/boot/ia64/ski/libski.h#3 delete .. //depot/projects/vap/sys/boot/ia64/ski/main.c#3 delete .. //depot/projects/vap/sys/boot/ia64/ski/skifs.c#3 delete .. //depot/projects/vap/sys/boot/ia64/ski/version#3 delete .. //depot/projects/vap/sys/boot/ofw/common/main.c#3 delete .. //depot/projects/vap/sys/boot/ofw/libofw/Makefile#3 delete .. //depot/projects/vap/sys/boot/ofw/libofw/devicename.c#3 delete .. //depot/projects/vap/sys/boot/ofw/libofw/elf_freebsd.c#3 delete .. //depot/projects/vap/sys/boot/ofw/libofw/libofw.h#3 delete .. //depot/projects/vap/sys/boot/ofw/libofw/ofw_console.c#3 delete .. //depot/projects/vap/sys/boot/ofw/libofw/ofw_copy.c#3 delete .. //depot/projects/vap/sys/boot/ofw/libofw/ofw_disk.c#3 delete .. //depot/projects/vap/sys/boot/ofw/libofw/ofw_memory.c#3 delete .. //depot/projects/vap/sys/boot/ofw/libofw/ofw_net.c#4 delete .. //depot/projects/vap/sys/boot/ofw/libofw/openfirm.c#3 delete .. //depot/projects/vap/sys/boot/ofw/libofw/openfirm.h#3 delete .. //depot/projects/vap/sys/boot/pc98/Makefile#3 delete .. //depot/projects/vap/sys/boot/pc98/Makefile.inc#3 delete .. //depot/projects/vap/sys/boot/pc98/boot0.5/Makefile#3 delete .. //depot/projects/vap/sys/boot/pc98/boot0.5/boot.s#3 delete .. //depot/projects/vap/sys/boot/pc98/boot0.5/boot0.5.s#3 delete .. //depot/projects/vap/sys/boot/pc98/boot0.5/disk.s#3 delete .. //depot/projects/vap/sys/boot/pc98/boot0.5/selector.s#3 delete .. //depot/projects/vap/sys/boot/pc98/boot0.5/start.s#3 delete .. //depot/projects/vap/sys/boot/pc98/boot2/Makefile#4 delete .. //depot/projects/vap/sys/boot/pc98/boot2/boot.c#3 delete .. //depot/projects/vap/sys/boot/pc98/boot2/boot.h#3 delete .. //depot/projects/vap/sys/boot/pc98/boot2/boot2.S#3 delete .. //depot/projects/vap/sys/boot/pc98/boot2/disk.c#3 delete .. //depot/projects/vap/sys/boot/pc98/boot2/inode.h#3 delete .. //depot/projects/vap/sys/boot/pc98/boot2/io.c#3 delete .. //depot/projects/vap/sys/boot/pc98/boot2/sys.c#3 delete .. //depot/projects/vap/sys/boot/pc98/boot2/table.c#3 delete .. //depot/projects/vap/sys/boot/pc98/btx/btx/Makefile#3 delete .. //depot/projects/vap/sys/boot/pc98/btx/btx/btx.S#3 delete .. //depot/projects/vap/sys/boot/pc98/btx/btxldr/Makefile#3 delete .. //depot/projects/vap/sys/boot/pc98/btx/btxldr/btxldr.S#3 delete .. //depot/projects/vap/sys/boot/pc98/kgzldr/Makefile#3 delete .. //depot/projects/vap/sys/boot/pc98/kgzldr/crt.s#3 delete .. //depot/projects/vap/sys/boot/pc98/libpc98/Makefile#3 delete .. //depot/projects/vap/sys/boot/pc98/libpc98/biosdisk.c#3 delete .. //depot/projects/vap/sys/boot/pc98/libpc98/biosmem.c#3 delete .. //depot/projects/vap/sys/boot/pc98/libpc98/comconsole.c#3 delete .. //depot/projects/vap/sys/boot/pc98/libpc98/time.c#3 delete .. //depot/projects/vap/sys/boot/pc98/libpc98/vidconsole.c#4 delete .. //depot/projects/vap/sys/boot/pc98/loader/Makefile#3 delete .. //depot/projects/vap/sys/boot/pc98/loader/main.c#3 delete .. //depot/projects/vap/sys/boot/powerpc/loader/Makefile#3 delete .. //depot/projects/vap/sys/boot/powerpc/loader/conf.c#3 delete .. //depot/projects/vap/sys/boot/powerpc/loader/metadata.c#3 delete .. //depot/projects/vap/sys/boot/sparc64/loader/Makefile#3 delete .. //depot/projects/vap/sys/boot/sparc64/loader/main.c#3 delete .. //depot/projects/vap/sys/boot/sparc64/loader/metadata.c#3 delete .. //depot/projects/vap/sys/bsm/audit_kevents.h#3 delete .. //depot/projects/vap/sys/cam/cam.c#3 delete .. //depot/projects/vap/sys/cam/cam_ccb.h#3 delete .. //depot/projects/vap/sys/cam/cam_debug.h#3 delete .. //depot/projects/vap/sys/cam/cam_periph.c#4 delete .. //depot/projects/vap/sys/cam/cam_periph.h#3 delete .. //depot/projects/vap/sys/cam/cam_queue.c#3 delete .. //depot/projects/vap/sys/cam/cam_sim.c#3 delete .. //depot/projects/vap/sys/cam/cam_sim.h#3 delete .. //depot/projects/vap/sys/cam/cam_xpt.c#4 delete .. //depot/projects/vap/sys/cam/cam_xpt.h#3 delete .. //depot/projects/vap/sys/cam/cam_xpt_periph.h#3 delete .. //depot/projects/vap/sys/cam/cam_xpt_sim.h#3 delete .. //depot/projects/vap/sys/cam/scsi/scsi_all.c#4 delete .. //depot/projects/vap/sys/cam/scsi/scsi_all.h#3 delete .. //depot/projects/vap/sys/cam/scsi/scsi_cd.c#4 delete .. //depot/projects/vap/sys/cam/scsi/scsi_ch.c#4 delete .. //depot/projects/vap/sys/cam/scsi/scsi_da.c#4 delete .. //depot/projects/vap/sys/cam/scsi/scsi_low.c#4 delete .. //depot/projects/vap/sys/cam/scsi/scsi_pass.c#4 delete .. //depot/projects/vap/sys/cam/scsi/scsi_pt.c#3 delete .. //depot/projects/vap/sys/cam/scsi/scsi_sa.c#4 delete .. //depot/projects/vap/sys/cam/scsi/scsi_ses.c#4 delete .. //depot/projects/vap/sys/cam/scsi/scsi_ses.h#3 delete .. //depot/projects/vap/sys/cam/scsi/scsi_targ_bh.c#3 delete .. //depot/projects/vap/sys/cam/scsi/scsi_target.c#4 delete .. //depot/projects/vap/sys/compat/freebsd32/Makefile#3 delete .. //depot/projects/vap/sys/compat/freebsd32/freebsd32.h#3 delete .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_misc.c#4 delete .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_proto.h#4 delete .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscall.h#4 delete .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscalls.c#4 delete .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_sysent.c#4 delete .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_util.h#3 delete .. //depot/projects/vap/sys/compat/freebsd32/syscalls.conf#3 delete .. //depot/projects/vap/sys/compat/freebsd32/syscalls.master#4 delete .. //depot/projects/vap/sys/compat/ia32/ia32_genassym.c#3 delete .. //depot/projects/vap/sys/compat/ia32/ia32_signal.h#4 delete .. //depot/projects/vap/sys/compat/ia32/ia32_sysvec.c#4 delete .. //depot/projects/vap/sys/compat/linprocfs/linprocfs.c#4 delete .. //depot/projects/vap/sys/compat/linux/linux_file.c#4 delete .. //depot/projects/vap/sys/compat/linux/linux_getcwd.c#4 delete .. //depot/projects/vap/sys/compat/linux/linux_ioctl.c#4 delete .. //depot/projects/vap/sys/compat/linux/linux_ioctl.h#3 delete .. //depot/projects/vap/sys/compat/linux/linux_ipc.c#4 delete .. //depot/projects/vap/sys/compat/linux/linux_ipc.h#3 delete .. //depot/projects/vap/sys/compat/linux/linux_mib.c#3 delete .. //depot/projects/vap/sys/compat/linux/linux_mib.h#3 delete .. //depot/projects/vap/sys/compat/linux/linux_misc.c#4 delete .. //depot/projects/vap/sys/compat/linux/linux_signal.c#4 delete .. //depot/projects/vap/sys/compat/linux/linux_signal.h#3 delete .. //depot/projects/vap/sys/compat/linux/linux_socket.c#4 delete .. //depot/projects/vap/sys/compat/linux/linux_stats.c#4 delete .. //depot/projects/vap/sys/compat/linux/linux_sysctl.c#3 delete .. //depot/projects/vap/sys/compat/linux/linux_uid16.c#3 delete .. //depot/projects/vap/sys/compat/linux/linux_util.c#4 delete .. //depot/projects/vap/sys/compat/linux/linux_util.h#4 delete .. //depot/projects/vap/sys/compat/ndis/kern_ndis.c#4 delete .. //depot/projects/vap/sys/compat/ndis/kern_windrv.c#3 delete .. //depot/projects/vap/sys/compat/ndis/ndis_var.h#4 delete .. //depot/projects/vap/sys/compat/ndis/ntoskrnl_var.h#4 delete .. //depot/projects/vap/sys/compat/ndis/pe_var.h#4 delete .. //depot/projects/vap/sys/compat/ndis/subr_hal.c#4 delete .. //depot/projects/vap/sys/compat/ndis/subr_ndis.c#4 delete .. //depot/projects/vap/sys/compat/ndis/subr_ntoskrnl.c#4 delete .. //depot/projects/vap/sys/compat/ndis/subr_pe.c#4 delete .. //depot/projects/vap/sys/compat/ndis/subr_usbd.c#3 delete .. //depot/projects/vap/sys/compat/ndis/winx32_wrap.S#3 delete .. //depot/projects/vap/sys/compat/pecoff/imgact_pecoff.c#4 delete .. //depot/projects/vap/sys/compat/svr4/Makefile#3 delete .. //depot/projects/vap/sys/compat/svr4/imgact_svr4.c#4 delete .. //depot/projects/vap/sys/compat/svr4/svr4.h#3 delete .. //depot/projects/vap/sys/compat/svr4/svr4_fcntl.c#4 delete .. //depot/projects/vap/sys/compat/svr4/svr4_filio.c#3 delete .. //depot/projects/vap/sys/compat/svr4/svr4_ioctl.c#3 delete .. //depot/projects/vap/sys/compat/svr4/svr4_ipc.c#4 delete .. //depot/projects/vap/sys/compat/svr4/svr4_misc.c#4 delete .. //depot/projects/vap/sys/compat/svr4/svr4_proto.h#3 delete .. //depot/projects/vap/sys/compat/svr4/svr4_siginfo.h#3 delete .. //depot/projects/vap/sys/compat/svr4/svr4_signal.c#4 delete .. //depot/projects/vap/sys/compat/svr4/svr4_signal.h#4 delete .. //depot/projects/vap/sys/compat/svr4/svr4_socket.c#3 delete .. //depot/projects/vap/sys/compat/svr4/svr4_socket.h#3 delete .. //depot/projects/vap/sys/compat/svr4/svr4_sockio.c#3 delete .. //depot/projects/vap/sys/compat/svr4/svr4_stat.c#4 delete .. //depot/projects/vap/sys/compat/svr4/svr4_stream.c#4 delete .. //depot/projects/vap/sys/compat/svr4/svr4_stropts.h#3 delete .. //depot/projects/vap/sys/compat/svr4/svr4_syscall.h#3 delete .. //depot/projects/vap/sys/compat/svr4/svr4_syscallnames.c#3 delete .. //depot/projects/vap/sys/compat/svr4/svr4_sysent.c#3 delete .. //depot/projects/vap/sys/compat/svr4/svr4_sysvec.c#4 delete .. //depot/projects/vap/sys/compat/svr4/svr4_termios.c#3 delete .. //depot/projects/vap/sys/compat/svr4/svr4_ttold.c#3 delete .. //depot/projects/vap/sys/compat/svr4/svr4_util.h#4 delete .. //depot/projects/vap/sys/compat/svr4/syscalls.conf#3 delete .. //depot/projects/vap/sys/compat/svr4/syscalls.master#3 delete .. //depot/projects/vap/sys/conf/Makefile.amd64#4 delete .. //depot/projects/vap/sys/conf/Makefile.arm#4 delete .. //depot/projects/vap/sys/conf/Makefile.i386#4 delete .. //depot/projects/vap/sys/conf/Makefile.ia64#4 delete .. //depot/projects/vap/sys/conf/Makefile.pc98#4 delete .. //depot/projects/vap/sys/conf/Makefile.powerpc#4 delete .. //depot/projects/vap/sys/conf/Makefile.sparc64#4 delete .. //depot/projects/vap/sys/conf/NOTES#4 delete .. //depot/projects/vap/sys/conf/files#6 delete .. //depot/projects/vap/sys/conf/files.amd64#4 delete .. //depot/projects/vap/sys/conf/files.arm#4 delete .. //depot/projects/vap/sys/conf/files.i386#4 delete .. //depot/projects/vap/sys/conf/files.ia64#4 delete .. //depot/projects/vap/sys/conf/files.pc98#4 delete .. //depot/projects/vap/sys/conf/files.powerpc#4 delete .. //depot/projects/vap/sys/conf/files.sparc64#4 delete .. //depot/projects/vap/sys/conf/kern.mk#4 delete .. //depot/projects/vap/sys/conf/kern.post.mk#4 delete .. //depot/projects/vap/sys/conf/kern.pre.mk#4 delete .. //depot/projects/vap/sys/conf/kmod.mk#4 delete .. //depot/projects/vap/sys/conf/ldscript.arm#3 delete .. //depot/projects/vap/sys/conf/newvers.sh#3 delete .. //depot/projects/vap/sys/conf/options#4 delete .. //depot/projects/vap/sys/conf/options.amd64#4 delete .. //depot/projects/vap/sys/conf/options.arm#4 delete .. //depot/projects/vap/sys/conf/options.i386#4 delete .. //depot/projects/vap/sys/conf/options.ia64#3 delete .. //depot/projects/vap/sys/conf/options.pc98#4 delete .. //depot/projects/vap/sys/conf/options.sparc64#3 delete .. //depot/projects/vap/sys/conf/systags.sh#3 delete .. //depot/projects/vap/sys/contrib/altq/altq/altq_cbq.c#3 delete .. //depot/projects/vap/sys/contrib/altq/altq/altq_cdnr.c#3 delete .. //depot/projects/vap/sys/contrib/altq/altq/altq_hfsc.c#3 delete .. //depot/projects/vap/sys/contrib/altq/altq/altq_priq.c#3 delete .. //depot/projects/vap/sys/contrib/altq/altq/altq_red.c#3 delete .. //depot/projects/vap/sys/contrib/altq/altq/altq_rio.c#3 delete .. //depot/projects/vap/sys/contrib/altq/altq/altq_subr.c#4 delete .. //depot/projects/vap/sys/contrib/dev/acpica/CHANGES.txt#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/acapps.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/acconfig.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/acdebug.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/acdisasm.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/acdispat.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/acefi.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/acenv.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/acevents.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/acexcep.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/acfreebsd.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/acgcc.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/acglobal.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/achware.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/acinterp.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/aclocal.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/acmacros.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/acnamesp.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/acobject.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/acoutput.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/acparser.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/acpi.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/acpica_prep.sh#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/acpiosxf.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/acpixf.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/acresrc.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/acstruct.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/actables.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/actbl.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/actbl1.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/actbl2.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/actypes.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/acutils.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/amlcode.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/amlresrc.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/common/adisasm.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/common/getopt.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/aslanalyze.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/aslcodegen.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/aslcompile.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/aslcompiler.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/aslcompiler.l#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/aslcompiler.y#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/aslerror.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/aslfiles.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/aslfold.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/aslglobal.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/asllength.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/asllisting.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/aslload.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/asllookup.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/aslmain.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/aslmap.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/aslopcodes.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/asloperands.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/aslopt.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/aslresource.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/aslrestype1.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/aslrestype2.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/aslstubs.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/asltransform.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/asltree.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/asltypes.h#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/compiler/aslutils.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dbcmds.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dbdisply.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dbexec.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dbfileio.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dbhistry.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dbinput.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dbstats.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dbutils.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dbxface.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dmbuffer.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dmnames.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dmobject.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dmopcode.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dmresrc.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dmresrcl.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dmresrcs.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dmutils.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dmwalk.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dsfield.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dsinit.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dsmethod.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dsmthdat.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dsobject.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dsopcode.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dsutils.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dswexec.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dswload.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dswscope.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/dswstate.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/evevent.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/evgpe.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/evgpeblk.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/evmisc.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/evregion.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/evrgnini.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/evsci.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/evxface.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/evxfevnt.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/evxfregn.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/exconfig.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/exconvrt.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/excreate.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/exdump.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/exfield.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/exfldio.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/exmisc.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/exmutex.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/exnames.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/exoparg1.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/exoparg2.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/exoparg3.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/exoparg6.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/exprep.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/exregion.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/exresnte.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/exresolv.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/exresop.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/exstore.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/exstoren.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/exstorob.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/exsystem.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/exutils.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/hwacpi.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/hwgpe.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/hwregs.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/hwsleep.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/hwtimer.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/nsaccess.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/nsalloc.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/nsdump.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/nsdumpdv.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/nseval.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/nsinit.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/nsload.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/nsnames.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/nsobject.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/nsparse.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/nssearch.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/nsutils.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/nswalk.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/nsxfeval.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/nsxfname.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/nsxfobj.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/osunixxf.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/psargs.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/psopcode.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/psparse.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/psscope.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/pstree.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/psutils.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/pswalk.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/psxface.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/rsaddr.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/rscalc.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/rscreate.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/rsdump.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/rsio.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/rsirq.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/rslist.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/rsmemory.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/rsmisc.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/rsutils.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/rsxface.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/tbinstal.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/tbutils.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/tbxface.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/tbxfroot.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/utalloc.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/utclib.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/utcopy.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/utdebug.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/utdelete.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/uteval.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/utglobal.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/utinit.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/utmath.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/utmisc.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/utobject.c#3 delete .. //depot/projects/vap/sys/contrib/dev/acpica/utxface.c#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/COPYRIGHT#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/README#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/ah.h#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/ah_desc.h#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/ah_devid.h#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/armv4-be-elf.inc#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/armv4-le-elf.inc#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/i386-elf.inc#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/mips-be-elf.inc#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/mips-le-elf.inc#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/mips1-be-elf.inc#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/mips1-le-elf.inc#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/sh4-le-elf.inc#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/x86_64-elf.inc#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/xscale-be-elf.inc#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/xscale-le-elf.inc#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#3 delete .. //depot/projects/vap/sys/contrib/dev/ath/version.h#3 delete .. //depot/projects/vap/sys/contrib/dev/nve/adapter.h#3 delete .. //depot/projects/vap/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu#3 delete .. //depot/projects/vap/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu#3 delete .. //depot/projects/vap/sys/contrib/dev/oltr/if_oltr.c#4 delete .. //depot/projects/vap/sys/contrib/dev/oltr/if_oltr_pci.c#3 delete .. //depot/projects/vap/sys/contrib/dev/oltr/if_oltrvar.h#3 delete .. //depot/projects/vap/sys/contrib/ia64/libuwx/src/Makefile#3 delete .. //depot/projects/vap/sys/contrib/ia64/libuwx/src/uwx.h#3 delete .. //depot/projects/vap/sys/contrib/ia64/libuwx/src/uwx_bstream.c#3 delete .. //depot/projects/vap/sys/contrib/ia64/libuwx/src/uwx_bstream.h#3 delete .. //depot/projects/vap/sys/contrib/ia64/libuwx/src/uwx_context.c#3 delete .. //depot/projects/vap/sys/contrib/ia64/libuwx/src/uwx_context.h#3 delete .. //depot/projects/vap/sys/contrib/ia64/libuwx/src/uwx_env.c#3 delete .. //depot/projects/vap/sys/contrib/ia64/libuwx/src/uwx_env.h#3 delete .. //depot/projects/vap/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#3 delete .. //depot/projects/vap/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#3 delete .. //depot/projects/vap/sys/contrib/ia64/libuwx/src/uwx_self.c#3 delete .. //depot/projects/vap/sys/contrib/ia64/libuwx/src/uwx_self.h#3 delete .. //depot/projects/vap/sys/contrib/ia64/libuwx/src/uwx_self_context.s#3 delete .. //depot/projects/vap/sys/contrib/ia64/libuwx/src/uwx_step.c#3 delete .. //depot/projects/vap/sys/contrib/ia64/libuwx/src/uwx_step.h#3 delete .. //depot/projects/vap/sys/contrib/ia64/libuwx/src/uwx_str.c#3 delete .. //depot/projects/vap/sys/contrib/ia64/libuwx/src/uwx_str.h#3 delete .. //depot/projects/vap/sys/contrib/ia64/libuwx/src/uwx_swap.c#3 delete .. //depot/projects/vap/sys/contrib/ia64/libuwx/src/uwx_swap.h#3 delete .. //depot/projects/vap/sys/contrib/ia64/libuwx/src/uwx_trace.c#3 delete .. //depot/projects/vap/sys/contrib/ia64/libuwx/src/uwx_trace.h#3 delete .. //depot/projects/vap/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#3 delete .. //depot/projects/vap/sys/contrib/ia64/libuwx/src/uwx_uinfo.h#3 delete .. //depot/projects/vap/sys/contrib/ia64/libuwx/src/uwx_utable.c#3 delete .. //depot/projects/vap/sys/contrib/ia64/libuwx/src/uwx_utable.h#3 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/fil.c#4 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_auth.c#4 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_auth.h#4 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_compat.h#4 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_fil.h#4 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_frag.c#4 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_frag.h#4 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#4 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_htable.c#3 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_htable.h#3 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#4 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#3 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_log.c#4 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_lookup.c#3 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_lookup.h#3 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_nat.c#4 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_nat.h#4 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#4 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_pool.c#3 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_pool.h#3 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#3 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_proxy.c#4 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_proxy.h#4 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#4 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#4 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#3 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_scan.c#3 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_scan.h#3 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_state.c#4 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_state.h#4 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_sync.c#3 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_sync.h#3 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ipl.h#4 delete .. //depot/projects/vap/sys/contrib/ipfilter/netinet/mlfk_ipl.c#4 delete .. //depot/projects/vap/sys/contrib/ngatm/netnatm/api/cc_conn.c#3 delete .. //depot/projects/vap/sys/contrib/ngatm/netnatm/api/ccpriv.h#3 delete .. //depot/projects/vap/sys/contrib/ngatm/netnatm/api/unisap.h#3 delete .. //depot/projects/vap/sys/contrib/ngatm/netnatm/msg/uni_ie.c#3 delete .. //depot/projects/vap/sys/contrib/pf/net/if_pflog.c#4 delete .. //depot/projects/vap/sys/contrib/pf/net/if_pflog.h#3 delete .. //depot/projects/vap/sys/contrib/pf/net/if_pfsync.c#4 delete .. //depot/projects/vap/sys/contrib/pf/net/if_pfsync.h#3 delete .. //depot/projects/vap/sys/contrib/pf/net/pf.c#4 delete .. //depot/projects/vap/sys/contrib/pf/net/pf_if.c#4 delete .. //depot/projects/vap/sys/contrib/pf/net/pf_ioctl.c#4 delete .. //depot/projects/vap/sys/contrib/pf/net/pf_norm.c#3 delete .. //depot/projects/vap/sys/contrib/pf/net/pf_osfp.c#3 delete .. //depot/projects/vap/sys/contrib/pf/net/pf_subr.c#3 delete .. //depot/projects/vap/sys/contrib/pf/net/pf_table.c#3 delete .. //depot/projects/vap/sys/contrib/pf/net/pfvar.h#3 delete .. //depot/projects/vap/sys/crypto/rijndael/rijndael-alg-fst.c#4 delete .. //depot/projects/vap/sys/crypto/sha2/sha2.c#3 delete .. //depot/projects/vap/sys/ddb/db_access.c#3 delete .. //depot/projects/vap/sys/ddb/db_command.c#3 delete .. //depot/projects/vap/sys/ddb/db_examine.c#3 delete .. //depot/projects/vap/sys/ddb/db_main.c#3 delete .. //depot/projects/vap/sys/ddb/db_output.c#3 delete .. //depot/projects/vap/sys/ddb/db_output.h#3 delete .. //depot/projects/vap/sys/ddb/db_ps.c#3 delete .. //depot/projects/vap/sys/ddb/db_sym.c#3 delete .. //depot/projects/vap/sys/ddb/db_thread.c#3 delete .. //depot/projects/vap/sys/ddb/db_watch.c#3 delete .. //depot/projects/vap/sys/ddb/ddb.h#4 delete .. //depot/projects/vap/sys/dev/aac/aac.c#4 delete .. //depot/projects/vap/sys/dev/aac/aac_cam.c#4 delete .. //depot/projects/vap/sys/dev/aac/aac_debug.c#3 delete .. //depot/projects/vap/sys/dev/aac/aac_linux.c#3 delete .. //depot/projects/vap/sys/dev/aac/aac_pci.c#4 delete .. //depot/projects/vap/sys/dev/aac/aac_tables.h#3 delete .. //depot/projects/vap/sys/dev/aac/aacreg.h#4 delete .. //depot/projects/vap/sys/dev/aac/aacvar.h#3 delete .. //depot/projects/vap/sys/dev/acpi_support/acpi_asus.c#4 delete .. //depot/projects/vap/sys/dev/acpi_support/acpi_fujitsu.c#3 delete .. //depot/projects/vap/sys/dev/acpi_support/acpi_ibm.c#4 delete .. //depot/projects/vap/sys/dev/acpi_support/acpi_panasonic.c#3 delete .. //depot/projects/vap/sys/dev/acpi_support/acpi_sony.c#4 delete .. //depot/projects/vap/sys/dev/acpi_support/acpi_toshiba.c#4 delete .. //depot/projects/vap/sys/dev/acpica/Osd/OsdDebug.c#3 delete .. //depot/projects/vap/sys/dev/acpica/Osd/OsdHardware.c#3 delete .. //depot/projects/vap/sys/dev/acpica/Osd/OsdInterrupt.c#3 delete .. //depot/projects/vap/sys/dev/acpica/Osd/OsdMemory.c#3 delete .. //depot/projects/vap/sys/dev/acpica/Osd/OsdSchedule.c#4 delete .. //depot/projects/vap/sys/dev/acpica/Osd/OsdStream.c#3 delete .. //depot/projects/vap/sys/dev/acpica/Osd/OsdSynch.c#3 delete .. //depot/projects/vap/sys/dev/acpica/Osd/OsdTable.c#3 delete .. //depot/projects/vap/sys/dev/acpica/acpi.c#4 delete .. //depot/projects/vap/sys/dev/acpica/acpi_acad.c#3 delete .. //depot/projects/vap/sys/dev/acpica/acpi_battery.c#4 delete .. //depot/projects/vap/sys/dev/acpica/acpi_button.c#4 delete .. //depot/projects/vap/sys/dev/acpica/acpi_cmbat.c#3 delete .. //depot/projects/vap/sys/dev/acpica/acpi_cpu.c#4 delete .. //depot/projects/vap/sys/dev/acpica/acpi_ec.c#4 delete .. //depot/projects/vap/sys/dev/acpica/acpi_if.m#4 delete .. //depot/projects/vap/sys/dev/acpica/acpi_isab.c#3 delete .. //depot/projects/vap/sys/dev/acpica/acpi_lid.c#3 delete .. //depot/projects/vap/sys/dev/acpica/acpi_package.c#4 delete .. //depot/projects/vap/sys/dev/acpica/acpi_pci.c#3 delete .. //depot/projects/vap/sys/dev/acpica/acpi_pci_link.c#3 delete .. //depot/projects/vap/sys/dev/acpica/acpi_pcib.c#4 delete .. //depot/projects/vap/sys/dev/acpica/acpi_pcib_acpi.c#4 delete .. //depot/projects/vap/sys/dev/acpica/acpi_pcib_pci.c#3 delete .. //depot/projects/vap/sys/dev/acpica/acpi_perf.c#3 delete .. //depot/projects/vap/sys/dev/acpica/acpi_powerres.c#3 delete .. //depot/projects/vap/sys/dev/acpica/acpi_quirk.c#3 delete .. //depot/projects/vap/sys/dev/acpica/acpi_quirks#4 delete .. //depot/projects/vap/sys/dev/acpica/acpi_resource.c#4 delete .. //depot/projects/vap/sys/dev/acpica/acpi_thermal.c#4 delete .. //depot/projects/vap/sys/dev/acpica/acpi_throttle.c#3 delete .. //depot/projects/vap/sys/dev/acpica/acpi_timer.c#4 delete .. //depot/projects/vap/sys/dev/acpica/acpi_video.c#4 delete .. //depot/projects/vap/sys/dev/acpica/acpiio.h#4 delete .. //depot/projects/vap/sys/dev/acpica/acpivar.h#4 delete .. //depot/projects/vap/sys/dev/adlink/adlink.c#4 delete .. //depot/projects/vap/sys/dev/advansys/adv_eisa.c#3 delete .. //depot/projects/vap/sys/dev/advansys/adv_isa.c#3 delete .. //depot/projects/vap/sys/dev/advansys/adv_pci.c#4 delete .. //depot/projects/vap/sys/dev/advansys/advansys.c#3 delete .. //depot/projects/vap/sys/dev/advansys/advlib.c#3 delete .. //depot/projects/vap/sys/dev/advansys/advlib.h#3 delete .. //depot/projects/vap/sys/dev/advansys/adw_pci.c#4 delete .. //depot/projects/vap/sys/dev/advansys/adwcam.c#3 delete .. //depot/projects/vap/sys/dev/advansys/adwlib.c#4 delete .. //depot/projects/vap/sys/dev/aha/aha.c#3 delete .. //depot/projects/vap/sys/dev/aha/aha_isa.c#4 delete .. //depot/projects/vap/sys/dev/aha/aha_mca.c#4 delete .. //depot/projects/vap/sys/dev/aha/ahareg.h#4 delete .. //depot/projects/vap/sys/dev/ahb/ahb.c#3 delete .. //depot/projects/vap/sys/dev/ahb/ahbreg.h#3 delete .. //depot/projects/vap/sys/dev/aic/aic.c#3 delete .. //depot/projects/vap/sys/dev/aic/aic_cbus.c#4 delete .. //depot/projects/vap/sys/dev/aic/aic_isa.c#3 delete .. //depot/projects/vap/sys/dev/aic/aic_pccard.c#3 delete .. //depot/projects/vap/sys/dev/aic/aicvar.h#3 delete .. //depot/projects/vap/sys/dev/aic7xxx/ahc_eisa.c#3 delete .. //depot/projects/vap/sys/dev/aic7xxx/ahc_isa.c#3 delete .. //depot/projects/vap/sys/dev/aic7xxx/ahc_pci.c#4 delete .. //depot/projects/vap/sys/dev/aic7xxx/ahd_pci.c#4 delete .. //depot/projects/vap/sys/dev/aic7xxx/aic7770.c#3 delete .. //depot/projects/vap/sys/dev/aic7xxx/aic79xx.c#4 delete .. //depot/projects/vap/sys/dev/aic7xxx/aic79xx.h#3 delete .. //depot/projects/vap/sys/dev/aic7xxx/aic79xx.seq#3 delete .. //depot/projects/vap/sys/dev/aic7xxx/aic79xx_osm.c#4 delete .. //depot/projects/vap/sys/dev/aic7xxx/aic79xx_osm.h#3 delete .. //depot/projects/vap/sys/dev/aic7xxx/aic79xx_pci.c#4 delete .. //depot/projects/vap/sys/dev/aic7xxx/aic7xxx.c#4 delete .. //depot/projects/vap/sys/dev/aic7xxx/aic7xxx.h#3 delete .. //depot/projects/vap/sys/dev/aic7xxx/aic7xxx.seq#3 delete .. //depot/projects/vap/sys/dev/aic7xxx/aic7xxx_inline.h#3 delete .. //depot/projects/vap/sys/dev/aic7xxx/aic7xxx_osm.c#3 delete .. //depot/projects/vap/sys/dev/aic7xxx/aic7xxx_osm.h#3 delete .. //depot/projects/vap/sys/dev/aic7xxx/aic7xxx_pci.c#3 delete .. //depot/projects/vap/sys/dev/aic7xxx/aic_osm_lib.c#3 delete .. //depot/projects/vap/sys/dev/aic7xxx/aic_osm_lib.h#3 delete .. //depot/projects/vap/sys/dev/aic7xxx/aicasm/Makefile#3 delete .. //depot/projects/vap/sys/dev/aic7xxx/aicasm/aicasm_gram.y#3 delete .. //depot/projects/vap/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#3 delete .. //depot/projects/vap/sys/dev/amd/amd.c#4 delete .. //depot/projects/vap/sys/dev/amr/amr.c#4 delete .. //depot/projects/vap/sys/dev/amr/amr_cam.c#4 delete .. //depot/projects/vap/sys/dev/amr/amr_disk.c#3 delete .. //depot/projects/vap/sys/dev/amr/amr_pci.c#4 delete .. //depot/projects/vap/sys/dev/amr/amrio.h#3 delete .. //depot/projects/vap/sys/dev/amr/amrreg.h#4 delete .. //depot/projects/vap/sys/dev/amr/amrvar.h#4 delete .. //depot/projects/vap/sys/dev/an/if_an.c#4 delete .. //depot/projects/vap/sys/dev/an/if_an_isa.c#3 delete .. //depot/projects/vap/sys/dev/an/if_an_pccard.c#3 delete .. //depot/projects/vap/sys/dev/an/if_an_pci.c#4 delete .. //depot/projects/vap/sys/dev/an/if_anreg.h#3 delete .. //depot/projects/vap/sys/dev/ar/if_ar.c#4 delete .. //depot/projects/vap/sys/dev/ar/if_ar_isa.c#3 delete .. //depot/projects/vap/sys/dev/ar/if_ar_pci.c#4 delete .. //depot/projects/vap/sys/dev/arcmsr/arcmsr.c#3 delete .. //depot/projects/vap/sys/dev/arcmsr/arcmsr.h#3 delete .. //depot/projects/vap/sys/dev/arl/if_arl.c#3 delete .. //depot/projects/vap/sys/dev/arl/if_arl_isa.c#3 delete .. //depot/projects/vap/sys/dev/arl/if_arlreg.h#3 delete .. //depot/projects/vap/sys/dev/asr/asr.c#4 delete .. //depot/projects/vap/sys/dev/asr/dptsig.h#3 delete .. //depot/projects/vap/sys/dev/asr/i2odep.h#3 delete .. //depot/projects/vap/sys/dev/ata/ata-all.c#4 delete .. //depot/projects/vap/sys/dev/ata/ata-all.h#4 delete .. //depot/projects/vap/sys/dev/ata/ata-card.c#4 delete .. //depot/projects/vap/sys/dev/ata/ata-cbus.c#4 delete .. //depot/projects/vap/sys/dev/ata/ata-chipset.c#4 delete .. //depot/projects/vap/sys/dev/ata/ata-disk.c#4 delete .. //depot/projects/vap/sys/dev/ata/ata-disk.h#4 delete .. //depot/projects/vap/sys/dev/ata/ata-dma.c#4 delete .. //depot/projects/vap/sys/dev/ata/ata-isa.c#4 delete .. //depot/projects/vap/sys/dev/ata/ata-lowlevel.c#4 delete .. //depot/projects/vap/sys/dev/ata/ata-pci.c#4 delete .. //depot/projects/vap/sys/dev/ata/ata-pci.h#4 delete .. //depot/projects/vap/sys/dev/ata/ata-queue.c#4 delete .. //depot/projects/vap/sys/dev/ata/ata-raid.c#4 delete .. //depot/projects/vap/sys/dev/ata/ata-raid.h#4 delete .. //depot/projects/vap/sys/dev/ata/ata_if.m#3 delete .. //depot/projects/vap/sys/dev/ata/atapi-cam.c#4 delete .. //depot/projects/vap/sys/dev/ata/atapi-cd.c#4 delete .. //depot/projects/vap/sys/dev/ata/atapi-cd.h#4 delete .. //depot/projects/vap/sys/dev/ata/atapi-fd.c#4 delete .. //depot/projects/vap/sys/dev/ata/atapi-fd.h#4 delete .. //depot/projects/vap/sys/dev/ata/atapi-tape.c#4 delete .. //depot/projects/vap/sys/dev/ata/atapi-tape.h#4 delete .. //depot/projects/vap/sys/dev/ath/ath_rate/amrr/amrr.c#4 delete .. //depot/projects/vap/sys/dev/ath/ath_rate/onoe/onoe.c#7 delete .. //depot/projects/vap/sys/dev/ath/ath_rate/onoe/onoe.h#4 delete .. //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#4 delete .. //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.h#3 delete .. //depot/projects/vap/sys/dev/ath/if_ath.c#19 delete .. //depot/projects/vap/sys/dev/ath/if_ath_pci.c#4 delete .. //depot/projects/vap/sys/dev/ath/if_athioctl.h#4 delete .. //depot/projects/vap/sys/dev/ath/if_athrate.h#5 delete .. //depot/projects/vap/sys/dev/ath/if_athvar.h#10 delete .. //depot/projects/vap/sys/dev/auxio/auxio.c#3 delete .. //depot/projects/vap/sys/dev/awi/am79c930.c#3 delete .. //depot/projects/vap/sys/dev/awi/awi.c#4 delete .. //depot/projects/vap/sys/dev/awi/awivar.h#3 delete .. //depot/projects/vap/sys/dev/awi/if_awi_pccard.c#3 delete .. //depot/projects/vap/sys/dev/bfe/if_bfe.c#4 delete .. //depot/projects/vap/sys/dev/bfe/if_bfereg.h#3 delete .. //depot/projects/vap/sys/dev/bge/if_bge.c#4 delete .. //depot/projects/vap/sys/dev/bge/if_bgereg.h#4 delete .. //depot/projects/vap/sys/dev/bktr/CHANGELOG.TXT#3 delete .. //depot/projects/vap/sys/dev/bktr/bktr_audio.c#3 delete .. //depot/projects/vap/sys/dev/bktr/bktr_card.c#4 delete .. //depot/projects/vap/sys/dev/bktr/bktr_card.h#3 delete .. //depot/projects/vap/sys/dev/bktr/bktr_core.c#3 delete .. //depot/projects/vap/sys/dev/bktr/bktr_i2c.c#3 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 2 06:45:45 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0709416A41B; Sun, 2 Dec 2007 06:45: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 7B45116A41A for ; Sun, 2 Dec 2007 06:45:44 +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 62AC613C44B for ; Sun, 2 Dec 2007 06:45:44 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB26jiNd088635 for ; Sun, 2 Dec 2007 06:45:44 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB26bF35087293 for perforce@freebsd.org; Sun, 2 Dec 2007 06:37:15 GMT (envelope-from sam@freebsd.org) Date: Sun, 2 Dec 2007 06:37:15 GMT Message-Id: <200712020637.lB26bF35087293@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 129961 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 06:45:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=129961 Change 129961 by sam@sam_ebb on 2007/12/02 06:37:04 try again to re-populate branch Affected files ... .. //depot/projects/vap/COPYRIGHT#2 integrate .. //depot/projects/vap/LOCKS#2 integrate .. //depot/projects/vap/MAINTAINERS#2 integrate .. //depot/projects/vap/Makefile#2 integrate .. //depot/projects/vap/Makefile.inc1#2 integrate .. //depot/projects/vap/ObsoleteFiles.inc#2 integrate .. //depot/projects/vap/README#2 integrate .. //depot/projects/vap/UPDATING#2 integrate .. //depot/projects/vap/bin/Makefile#2 integrate .. //depot/projects/vap/bin/Makefile.inc#2 integrate .. //depot/projects/vap/bin/cat/Makefile#2 integrate .. //depot/projects/vap/bin/cat/cat.1#2 integrate .. //depot/projects/vap/bin/cat/cat.c#2 integrate .. //depot/projects/vap/bin/chflags/Makefile#2 integrate .. //depot/projects/vap/bin/chflags/chflags.1#2 integrate .. //depot/projects/vap/bin/chflags/chflags.c#2 integrate .. //depot/projects/vap/bin/chio/Makefile#2 integrate .. //depot/projects/vap/bin/chio/chio.1#2 integrate .. //depot/projects/vap/bin/chio/chio.c#2 integrate .. //depot/projects/vap/bin/chio/defs.h#2 integrate .. //depot/projects/vap/bin/chio/pathnames.h#2 integrate .. //depot/projects/vap/bin/chmod/Makefile#2 integrate .. //depot/projects/vap/bin/chmod/chmod.1#2 integrate .. //depot/projects/vap/bin/chmod/chmod.c#2 integrate .. //depot/projects/vap/bin/cp/Makefile#2 integrate .. //depot/projects/vap/bin/cp/cp.1#2 integrate .. //depot/projects/vap/bin/cp/cp.c#2 integrate .. //depot/projects/vap/bin/cp/extern.h#2 integrate .. //depot/projects/vap/bin/cp/utils.c#2 integrate .. //depot/projects/vap/bin/csh/Makefile#2 integrate .. //depot/projects/vap/bin/csh/USD.doc/csh.1#2 integrate .. //depot/projects/vap/bin/csh/USD.doc/csh.2#2 integrate .. //depot/projects/vap/bin/csh/USD.doc/csh.3#2 integrate .. //depot/projects/vap/bin/csh/USD.doc/csh.4#2 integrate .. //depot/projects/vap/bin/csh/USD.doc/csh.a#2 integrate .. //depot/projects/vap/bin/csh/USD.doc/csh.g#2 integrate .. //depot/projects/vap/bin/csh/USD.doc/tabs#2 integrate .. //depot/projects/vap/bin/csh/config.h#2 integrate .. //depot/projects/vap/bin/csh/config_p.h#2 integrate .. //depot/projects/vap/bin/csh/host.defs#2 integrate .. //depot/projects/vap/bin/csh/iconv.h#2 integrate .. //depot/projects/vap/bin/csh/iconv_stub.c#2 integrate .. //depot/projects/vap/bin/date/Makefile#2 integrate .. //depot/projects/vap/bin/date/date.1#2 integrate .. //depot/projects/vap/bin/date/date.c#2 integrate .. //depot/projects/vap/bin/date/extern.h#2 integrate .. //depot/projects/vap/bin/date/netdate.c#2 integrate .. //depot/projects/vap/bin/date/vary.c#2 integrate .. //depot/projects/vap/bin/date/vary.h#2 integrate .. //depot/projects/vap/bin/dd/Makefile#2 integrate .. //depot/projects/vap/bin/dd/args.c#2 integrate .. //depot/projects/vap/bin/dd/conv.c#2 integrate .. //depot/projects/vap/bin/dd/conv_tab.c#2 integrate .. //depot/projects/vap/bin/dd/dd.1#2 integrate .. //depot/projects/vap/bin/dd/dd.c#2 integrate .. //depot/projects/vap/bin/dd/dd.h#2 integrate .. //depot/projects/vap/bin/dd/extern.h#2 integrate .. //depot/projects/vap/bin/dd/gen.c#2 integrate .. //depot/projects/vap/bin/dd/misc.c#2 integrate .. //depot/projects/vap/bin/dd/position.c#2 integrate .. //depot/projects/vap/bin/dd/ref.ascii#2 integrate .. //depot/projects/vap/bin/dd/ref.ebcdic#2 integrate .. //depot/projects/vap/bin/dd/ref.ibm#2 integrate .. //depot/projects/vap/bin/dd/ref.lcase#2 integrate .. //depot/projects/vap/bin/dd/ref.oldascii#2 integrate .. //depot/projects/vap/bin/dd/ref.oldebcdic#2 integrate .. //depot/projects/vap/bin/dd/ref.oldibm#2 integrate .. //depot/projects/vap/bin/dd/ref.pareven#2 integrate .. //depot/projects/vap/bin/dd/ref.parnone#2 integrate .. //depot/projects/vap/bin/dd/ref.parodd#2 integrate .. //depot/projects/vap/bin/dd/ref.parset#2 integrate .. //depot/projects/vap/bin/dd/ref.swab#2 integrate .. //depot/projects/vap/bin/dd/ref.ucase#2 integrate .. //depot/projects/vap/bin/df/Makefile#2 integrate .. //depot/projects/vap/bin/df/df.1#2 integrate .. //depot/projects/vap/bin/df/df.c#2 integrate .. //depot/projects/vap/bin/domainname/Makefile#2 integrate .. //depot/projects/vap/bin/domainname/domainname.1#2 integrate .. //depot/projects/vap/bin/domainname/domainname.c#2 integrate .. //depot/projects/vap/bin/echo/Makefile#2 integrate .. //depot/projects/vap/bin/echo/echo.1#2 integrate .. //depot/projects/vap/bin/echo/echo.c#2 integrate .. //depot/projects/vap/bin/ed/Makefile#2 integrate .. //depot/projects/vap/bin/ed/POSIX#2 integrate .. //depot/projects/vap/bin/ed/README#2 integrate .. //depot/projects/vap/bin/ed/buf.c#2 integrate .. //depot/projects/vap/bin/ed/cbc.c#2 integrate .. //depot/projects/vap/bin/ed/ed.1#2 integrate .. //depot/projects/vap/bin/ed/ed.h#2 integrate .. //depot/projects/vap/bin/ed/glbl.c#2 integrate .. //depot/projects/vap/bin/ed/io.c#2 integrate .. //depot/projects/vap/bin/ed/main.c#2 integrate .. //depot/projects/vap/bin/ed/re.c#2 integrate .. //depot/projects/vap/bin/ed/sub.c#2 integrate .. //depot/projects/vap/bin/ed/test/=.err#2 integrate .. //depot/projects/vap/bin/ed/test/Makefile#2 integrate .. //depot/projects/vap/bin/ed/test/README#2 integrate .. //depot/projects/vap/bin/ed/test/TODO#2 integrate .. //depot/projects/vap/bin/ed/test/a.d#2 integrate .. //depot/projects/vap/bin/ed/test/a.r#2 integrate .. //depot/projects/vap/bin/ed/test/a.t#2 integrate .. //depot/projects/vap/bin/ed/test/a1.err#2 integrate .. //depot/projects/vap/bin/ed/test/a2.err#2 integrate .. //depot/projects/vap/bin/ed/test/addr.d#2 integrate .. //depot/projects/vap/bin/ed/test/addr.r#2 integrate .. //depot/projects/vap/bin/ed/test/addr.t#2 integrate .. //depot/projects/vap/bin/ed/test/addr1.err#2 integrate .. //depot/projects/vap/bin/ed/test/addr2.err#2 integrate .. //depot/projects/vap/bin/ed/test/ascii.d.uu#2 integrate .. //depot/projects/vap/bin/ed/test/ascii.r.uu#2 integrate .. //depot/projects/vap/bin/ed/test/ascii.t#2 integrate .. //depot/projects/vap/bin/ed/test/bang1.d#2 integrate .. //depot/projects/vap/bin/ed/test/bang1.err#2 integrate .. //depot/projects/vap/bin/ed/test/bang1.r#2 integrate .. //depot/projects/vap/bin/ed/test/bang1.t#2 integrate .. //depot/projects/vap/bin/ed/test/bang2.err#2 integrate .. //depot/projects/vap/bin/ed/test/c.d#2 integrate .. //depot/projects/vap/bin/ed/test/c.r#2 integrate .. //depot/projects/vap/bin/ed/test/c.t#2 integrate .. //depot/projects/vap/bin/ed/test/c1.err#2 integrate .. //depot/projects/vap/bin/ed/test/c2.err#2 integrate .. //depot/projects/vap/bin/ed/test/ckscripts.sh#2 integrate .. //depot/projects/vap/bin/ed/test/d.d#2 integrate .. //depot/projects/vap/bin/ed/test/d.err#2 integrate .. //depot/projects/vap/bin/ed/test/d.r#2 integrate .. //depot/projects/vap/bin/ed/test/d.t#2 integrate .. //depot/projects/vap/bin/ed/test/e1.d#2 integrate .. //depot/projects/vap/bin/ed/test/e1.err#2 integrate .. //depot/projects/vap/bin/ed/test/e1.r#2 integrate .. //depot/projects/vap/bin/ed/test/e1.t#2 integrate .. //depot/projects/vap/bin/ed/test/e2.d#2 integrate .. //depot/projects/vap/bin/ed/test/e2.err#2 integrate .. //depot/projects/vap/bin/ed/test/e2.r#2 integrate .. //depot/projects/vap/bin/ed/test/e2.t#2 integrate .. //depot/projects/vap/bin/ed/test/e3.d#2 integrate .. //depot/projects/vap/bin/ed/test/e3.err#2 integrate .. //depot/projects/vap/bin/ed/test/e3.r#2 integrate .. //depot/projects/vap/bin/ed/test/e3.t#2 integrate .. //depot/projects/vap/bin/ed/test/e4.d#2 integrate .. //depot/projects/vap/bin/ed/test/e4.r#2 integrate .. //depot/projects/vap/bin/ed/test/e4.t#2 integrate .. //depot/projects/vap/bin/ed/test/f1.err#2 integrate .. //depot/projects/vap/bin/ed/test/f2.err#2 integrate .. //depot/projects/vap/bin/ed/test/g1.d#2 integrate .. //depot/projects/vap/bin/ed/test/g1.err#2 integrate .. //depot/projects/vap/bin/ed/test/g1.r#2 integrate .. //depot/projects/vap/bin/ed/test/g1.t#2 integrate .. //depot/projects/vap/bin/ed/test/g2.d#2 integrate .. //depot/projects/vap/bin/ed/test/g2.err#2 integrate .. //depot/projects/vap/bin/ed/test/g2.r#2 integrate .. //depot/projects/vap/bin/ed/test/g2.t#2 integrate .. //depot/projects/vap/bin/ed/test/g3.d#2 integrate .. //depot/projects/vap/bin/ed/test/g3.err#2 integrate .. //depot/projects/vap/bin/ed/test/g3.r#2 integrate .. //depot/projects/vap/bin/ed/test/g3.t#2 integrate .. //depot/projects/vap/bin/ed/test/g4.d#2 integrate .. //depot/projects/vap/bin/ed/test/g4.r#2 integrate .. //depot/projects/vap/bin/ed/test/g4.t#2 integrate .. //depot/projects/vap/bin/ed/test/g5.d#2 integrate .. //depot/projects/vap/bin/ed/test/g5.r#2 integrate .. //depot/projects/vap/bin/ed/test/g5.t#2 integrate .. //depot/projects/vap/bin/ed/test/h.err#2 integrate .. //depot/projects/vap/bin/ed/test/i.d#2 integrate .. //depot/projects/vap/bin/ed/test/i.r#2 integrate .. //depot/projects/vap/bin/ed/test/i.t#2 integrate .. //depot/projects/vap/bin/ed/test/i1.err#2 integrate .. //depot/projects/vap/bin/ed/test/i2.err#2 integrate .. //depot/projects/vap/bin/ed/test/i3.err#2 integrate .. //depot/projects/vap/bin/ed/test/j.d#2 integrate .. //depot/projects/vap/bin/ed/test/j.r#2 integrate .. //depot/projects/vap/bin/ed/test/j.t#2 integrate .. //depot/projects/vap/bin/ed/test/k.d#2 integrate .. //depot/projects/vap/bin/ed/test/k.r#2 integrate .. //depot/projects/vap/bin/ed/test/k.t#2 integrate .. //depot/projects/vap/bin/ed/test/k1.err#2 integrate .. //depot/projects/vap/bin/ed/test/k2.err#2 integrate .. //depot/projects/vap/bin/ed/test/k3.err#2 integrate .. //depot/projects/vap/bin/ed/test/k4.err#2 integrate .. //depot/projects/vap/bin/ed/test/l.d#2 integrate .. //depot/projects/vap/bin/ed/test/l.r#2 integrate .. //depot/projects/vap/bin/ed/test/l.t#2 integrate .. //depot/projects/vap/bin/ed/test/m.d#2 integrate .. //depot/projects/vap/bin/ed/test/m.err#2 integrate .. //depot/projects/vap/bin/ed/test/m.r#2 integrate .. //depot/projects/vap/bin/ed/test/m.t#2 integrate .. //depot/projects/vap/bin/ed/test/mkscripts.sh#2 integrate .. //depot/projects/vap/bin/ed/test/n.d#2 integrate .. //depot/projects/vap/bin/ed/test/n.r#2 integrate .. //depot/projects/vap/bin/ed/test/n.t#2 integrate .. //depot/projects/vap/bin/ed/test/nl.err#2 integrate .. //depot/projects/vap/bin/ed/test/nl1.d#2 integrate .. //depot/projects/vap/bin/ed/test/nl1.r#2 integrate .. //depot/projects/vap/bin/ed/test/nl1.t#2 integrate .. //depot/projects/vap/bin/ed/test/nl2.d#2 integrate .. //depot/projects/vap/bin/ed/test/nl2.r#2 integrate .. //depot/projects/vap/bin/ed/test/nl2.t#2 integrate .. //depot/projects/vap/bin/ed/test/p.d#2 integrate .. //depot/projects/vap/bin/ed/test/p.r#2 integrate .. //depot/projects/vap/bin/ed/test/p.t#2 integrate .. //depot/projects/vap/bin/ed/test/q.d#2 integrate .. //depot/projects/vap/bin/ed/test/q.r#2 integrate .. //depot/projects/vap/bin/ed/test/q.t#2 integrate .. //depot/projects/vap/bin/ed/test/q1.err#2 integrate .. //depot/projects/vap/bin/ed/test/r1.d#2 integrate .. //depot/projects/vap/bin/ed/test/r1.err#2 integrate .. //depot/projects/vap/bin/ed/test/r1.r#2 integrate .. //depot/projects/vap/bin/ed/test/r1.t#2 integrate .. //depot/projects/vap/bin/ed/test/r2.d#2 integrate .. //depot/projects/vap/bin/ed/test/r2.err#2 integrate .. //depot/projects/vap/bin/ed/test/r2.r#2 integrate .. //depot/projects/vap/bin/ed/test/r2.t#2 integrate .. //depot/projects/vap/bin/ed/test/r3.d#2 integrate .. //depot/projects/vap/bin/ed/test/r3.r#2 integrate .. //depot/projects/vap/bin/ed/test/r3.t#2 integrate .. //depot/projects/vap/bin/ed/test/s1.d#2 integrate .. //depot/projects/vap/bin/ed/test/s1.err#2 integrate .. //depot/projects/vap/bin/ed/test/s1.r#2 integrate .. //depot/projects/vap/bin/ed/test/s1.t#2 integrate .. //depot/projects/vap/bin/ed/test/s10.err#2 integrate .. //depot/projects/vap/bin/ed/test/s2.d#2 integrate .. //depot/projects/vap/bin/ed/test/s2.err#2 integrate .. //depot/projects/vap/bin/ed/test/s2.r#2 integrate .. //depot/projects/vap/bin/ed/test/s2.t#2 integrate .. //depot/projects/vap/bin/ed/test/s3.d#2 integrate .. //depot/projects/vap/bin/ed/test/s3.err#2 integrate .. //depot/projects/vap/bin/ed/test/s3.r#2 integrate .. //depot/projects/vap/bin/ed/test/s3.t#2 integrate .. //depot/projects/vap/bin/ed/test/s4.err#2 integrate .. //depot/projects/vap/bin/ed/test/s5.err#2 integrate .. //depot/projects/vap/bin/ed/test/s6.err#2 integrate .. //depot/projects/vap/bin/ed/test/s7.err#2 integrate .. //depot/projects/vap/bin/ed/test/s8.err#2 integrate .. //depot/projects/vap/bin/ed/test/s9.err#2 integrate .. //depot/projects/vap/bin/ed/test/t.d#2 integrate .. //depot/projects/vap/bin/ed/test/t.r#2 integrate .. //depot/projects/vap/bin/ed/test/t1.d#2 integrate .. //depot/projects/vap/bin/ed/test/t1.err#2 integrate .. //depot/projects/vap/bin/ed/test/t1.r#2 integrate .. //depot/projects/vap/bin/ed/test/t1.t#2 integrate .. //depot/projects/vap/bin/ed/test/t2.d#2 integrate .. //depot/projects/vap/bin/ed/test/t2.err#2 integrate .. //depot/projects/vap/bin/ed/test/t2.r#2 integrate .. //depot/projects/vap/bin/ed/test/t2.t#2 integrate .. //depot/projects/vap/bin/ed/test/u.d#2 integrate .. //depot/projects/vap/bin/ed/test/u.err#2 integrate .. //depot/projects/vap/bin/ed/test/u.r#2 integrate .. //depot/projects/vap/bin/ed/test/u.t#2 integrate .. //depot/projects/vap/bin/ed/test/v.d#2 integrate .. //depot/projects/vap/bin/ed/test/v.r#2 integrate .. //depot/projects/vap/bin/ed/test/v.t#2 integrate .. //depot/projects/vap/bin/ed/test/w.d#2 integrate .. //depot/projects/vap/bin/ed/test/w.r#2 integrate .. //depot/projects/vap/bin/ed/test/w.t#2 integrate .. //depot/projects/vap/bin/ed/test/w1.err#2 integrate .. //depot/projects/vap/bin/ed/test/w2.err#2 integrate .. //depot/projects/vap/bin/ed/test/w3.err#2 integrate .. //depot/projects/vap/bin/ed/test/x.err#2 integrate .. //depot/projects/vap/bin/ed/test/z.err#2 integrate .. //depot/projects/vap/bin/ed/undo.c#2 integrate .. //depot/projects/vap/bin/expr/Makefile#2 integrate .. //depot/projects/vap/bin/expr/expr.1#2 integrate .. //depot/projects/vap/bin/expr/expr.y#2 integrate .. //depot/projects/vap/bin/getfacl/Makefile#2 integrate .. //depot/projects/vap/bin/getfacl/getfacl.1#2 integrate .. //depot/projects/vap/bin/getfacl/getfacl.c#2 integrate .. //depot/projects/vap/bin/hostname/Makefile#2 integrate .. //depot/projects/vap/bin/hostname/hostname.1#2 integrate .. //depot/projects/vap/bin/hostname/hostname.c#2 integrate .. //depot/projects/vap/bin/kenv/Makefile#2 integrate .. //depot/projects/vap/bin/kenv/kenv.1#2 integrate .. //depot/projects/vap/bin/kenv/kenv.c#2 integrate .. //depot/projects/vap/bin/kill/Makefile#2 integrate .. //depot/projects/vap/bin/kill/kill.1#2 integrate .. //depot/projects/vap/bin/kill/kill.c#2 integrate .. //depot/projects/vap/bin/ln/Makefile#2 integrate .. //depot/projects/vap/bin/ln/ln.1#2 integrate .. //depot/projects/vap/bin/ln/ln.c#2 integrate .. //depot/projects/vap/bin/ln/symlink.7#2 integrate .. //depot/projects/vap/bin/ls/Makefile#2 integrate .. //depot/projects/vap/bin/ls/cmp.c#2 integrate .. //depot/projects/vap/bin/ls/extern.h#2 integrate .. //depot/projects/vap/bin/ls/ls.1#2 integrate .. //depot/projects/vap/bin/ls/ls.c#2 integrate .. //depot/projects/vap/bin/ls/ls.h#2 integrate .. //depot/projects/vap/bin/ls/print.c#2 integrate .. //depot/projects/vap/bin/ls/util.c#2 integrate .. //depot/projects/vap/bin/mkdir/Makefile#2 integrate .. //depot/projects/vap/bin/mkdir/mkdir.1#2 integrate .. //depot/projects/vap/bin/mkdir/mkdir.c#2 integrate .. //depot/projects/vap/bin/mv/Makefile#2 integrate .. //depot/projects/vap/bin/mv/mv.1#2 integrate .. //depot/projects/vap/bin/mv/mv.c#2 integrate .. //depot/projects/vap/bin/pax/Makefile#2 integrate .. //depot/projects/vap/bin/pax/ar_io.c#2 integrate .. //depot/projects/vap/bin/pax/ar_subs.c#2 integrate .. //depot/projects/vap/bin/pax/buf_subs.c#2 integrate .. //depot/projects/vap/bin/pax/cache.c#2 integrate .. //depot/projects/vap/bin/pax/cache.h#2 integrate .. //depot/projects/vap/bin/pax/cpio.1#2 integrate .. //depot/projects/vap/bin/pax/cpio.c#2 integrate .. //depot/projects/vap/bin/pax/cpio.h#2 integrate .. //depot/projects/vap/bin/pax/extern.h#2 integrate .. //depot/projects/vap/bin/pax/file_subs.c#2 integrate .. //depot/projects/vap/bin/pax/ftree.c#2 integrate .. //depot/projects/vap/bin/pax/ftree.h#2 integrate .. //depot/projects/vap/bin/pax/gen_subs.c#2 integrate .. //depot/projects/vap/bin/pax/getoldopt.c#2 integrate .. //depot/projects/vap/bin/pax/options.c#2 integrate .. //depot/projects/vap/bin/pax/options.h#2 integrate .. //depot/projects/vap/bin/pax/pat_rep.c#2 integrate .. //depot/projects/vap/bin/pax/pat_rep.h#2 integrate .. //depot/projects/vap/bin/pax/pax.1#2 integrate .. //depot/projects/vap/bin/pax/pax.c#2 integrate .. //depot/projects/vap/bin/pax/pax.h#2 integrate .. //depot/projects/vap/bin/pax/sel_subs.c#2 integrate .. //depot/projects/vap/bin/pax/sel_subs.h#2 integrate .. //depot/projects/vap/bin/pax/tables.c#2 integrate .. //depot/projects/vap/bin/pax/tables.h#2 integrate .. //depot/projects/vap/bin/pax/tar.1#2 integrate .. //depot/projects/vap/bin/pax/tar.c#2 integrate .. //depot/projects/vap/bin/pax/tar.h#2 integrate .. //depot/projects/vap/bin/pax/tty_subs.c#2 integrate .. //depot/projects/vap/bin/ps/Makefile#2 integrate .. //depot/projects/vap/bin/ps/extern.h#2 integrate .. //depot/projects/vap/bin/ps/fmt.c#2 integrate .. //depot/projects/vap/bin/ps/keyword.c#2 integrate .. //depot/projects/vap/bin/ps/nlist.c#2 integrate .. //depot/projects/vap/bin/ps/print.c#2 integrate .. //depot/projects/vap/bin/ps/ps.1#2 integrate .. //depot/projects/vap/bin/ps/ps.c#2 integrate .. //depot/projects/vap/bin/ps/ps.h#2 integrate .. //depot/projects/vap/bin/pwd/Makefile#2 integrate .. //depot/projects/vap/bin/pwd/pwd.1#2 integrate .. //depot/projects/vap/bin/pwd/pwd.c#2 integrate .. //depot/projects/vap/bin/rcp/Makefile#2 integrate .. //depot/projects/vap/bin/rcp/extern.h#2 integrate .. //depot/projects/vap/bin/rcp/rcp.1#2 integrate .. //depot/projects/vap/bin/rcp/rcp.c#2 integrate .. //depot/projects/vap/bin/rcp/util.c#2 integrate .. //depot/projects/vap/bin/realpath/Makefile#2 integrate .. //depot/projects/vap/bin/realpath/realpath.1#2 integrate .. //depot/projects/vap/bin/realpath/realpath.c#2 integrate .. //depot/projects/vap/bin/rm/Makefile#2 integrate .. //depot/projects/vap/bin/rm/rm.1#2 integrate .. //depot/projects/vap/bin/rm/rm.c#2 integrate .. //depot/projects/vap/bin/rmail/Makefile#2 integrate .. //depot/projects/vap/bin/rmdir/Makefile#2 integrate .. //depot/projects/vap/bin/rmdir/rmdir.1#2 integrate .. //depot/projects/vap/bin/rmdir/rmdir.c#2 integrate .. //depot/projects/vap/bin/setfacl/Makefile#2 integrate .. //depot/projects/vap/bin/setfacl/file.c#2 integrate .. //depot/projects/vap/bin/setfacl/mask.c#2 integrate .. //depot/projects/vap/bin/setfacl/merge.c#2 integrate .. //depot/projects/vap/bin/setfacl/remove.c#2 integrate .. //depot/projects/vap/bin/setfacl/setfacl.1#2 integrate .. //depot/projects/vap/bin/setfacl/setfacl.c#2 integrate .. //depot/projects/vap/bin/setfacl/setfacl.h#2 integrate .. //depot/projects/vap/bin/setfacl/util.c#2 integrate .. //depot/projects/vap/bin/sh/Makefile#2 integrate .. //depot/projects/vap/bin/sh/TOUR#2 integrate .. //depot/projects/vap/bin/sh/alias.c#2 integrate .. //depot/projects/vap/bin/sh/alias.h#2 integrate .. //depot/projects/vap/bin/sh/arith.h#2 integrate .. //depot/projects/vap/bin/sh/arith.y#2 integrate .. //depot/projects/vap/bin/sh/arith_lex.l#2 integrate .. //depot/projects/vap/bin/sh/bltin/bltin.h#2 integrate .. //depot/projects/vap/bin/sh/bltin/echo.1#2 integrate .. //depot/projects/vap/bin/sh/bltin/echo.c#2 integrate .. //depot/projects/vap/bin/sh/builtins.def#2 integrate .. //depot/projects/vap/bin/sh/cd.c#2 integrate .. //depot/projects/vap/bin/sh/cd.h#2 integrate .. //depot/projects/vap/bin/sh/error.c#2 integrate .. //depot/projects/vap/bin/sh/error.h#2 integrate .. //depot/projects/vap/bin/sh/eval.c#2 integrate .. //depot/projects/vap/bin/sh/eval.h#2 integrate .. //depot/projects/vap/bin/sh/exec.c#2 integrate .. //depot/projects/vap/bin/sh/exec.h#2 integrate .. //depot/projects/vap/bin/sh/expand.c#2 integrate .. //depot/projects/vap/bin/sh/expand.h#2 integrate .. //depot/projects/vap/bin/sh/funcs/cmv#2 integrate .. //depot/projects/vap/bin/sh/funcs/dirs#2 integrate .. //depot/projects/vap/bin/sh/funcs/kill#2 integrate .. //depot/projects/vap/bin/sh/funcs/login#2 integrate .. //depot/projects/vap/bin/sh/funcs/newgrp#2 integrate .. //depot/projects/vap/bin/sh/funcs/popd#2 integrate .. //depot/projects/vap/bin/sh/funcs/pushd#2 integrate .. //depot/projects/vap/bin/sh/funcs/suspend#2 integrate .. //depot/projects/vap/bin/sh/histedit.c#2 integrate .. //depot/projects/vap/bin/sh/init.h#2 integrate .. //depot/projects/vap/bin/sh/input.c#2 integrate .. //depot/projects/vap/bin/sh/input.h#2 integrate .. //depot/projects/vap/bin/sh/jobs.c#2 integrate .. //depot/projects/vap/bin/sh/jobs.h#2 integrate .. //depot/projects/vap/bin/sh/mail.c#2 integrate .. //depot/projects/vap/bin/sh/mail.h#2 integrate .. //depot/projects/vap/bin/sh/main.c#2 integrate .. //depot/projects/vap/bin/sh/main.h#2 integrate .. //depot/projects/vap/bin/sh/memalloc.c#2 integrate .. //depot/projects/vap/bin/sh/memalloc.h#2 integrate .. //depot/projects/vap/bin/sh/miscbltin.c#2 integrate .. //depot/projects/vap/bin/sh/mkbuiltins#2 integrate .. //depot/projects/vap/bin/sh/mkinit.c#2 integrate .. //depot/projects/vap/bin/sh/mknodes.c#2 integrate .. //depot/projects/vap/bin/sh/mksyntax.c#2 integrate .. //depot/projects/vap/bin/sh/mktokens#2 integrate .. //depot/projects/vap/bin/sh/myhistedit.h#2 integrate .. //depot/projects/vap/bin/sh/mystring.c#2 integrate .. //depot/projects/vap/bin/sh/mystring.h#2 integrate .. //depot/projects/vap/bin/sh/nodes.c.pat#2 integrate .. //depot/projects/vap/bin/sh/nodetypes#2 integrate .. //depot/projects/vap/bin/sh/options.c#2 integrate .. //depot/projects/vap/bin/sh/options.h#2 integrate .. //depot/projects/vap/bin/sh/output.c#2 integrate .. //depot/projects/vap/bin/sh/output.h#2 integrate .. //depot/projects/vap/bin/sh/parser.c#2 integrate .. //depot/projects/vap/bin/sh/parser.h#2 integrate .. //depot/projects/vap/bin/sh/redir.c#2 integrate .. //depot/projects/vap/bin/sh/redir.h#2 integrate .. //depot/projects/vap/bin/sh/sh.1#2 integrate .. //depot/projects/vap/bin/sh/shell.h#2 integrate .. //depot/projects/vap/bin/sh/show.c#2 integrate .. //depot/projects/vap/bin/sh/show.h#2 integrate .. //depot/projects/vap/bin/sh/trap.c#2 integrate .. //depot/projects/vap/bin/sh/trap.h#2 integrate .. //depot/projects/vap/bin/sh/var.c#2 integrate .. //depot/projects/vap/bin/sh/var.h#2 integrate .. //depot/projects/vap/bin/sleep/Makefile#2 integrate .. //depot/projects/vap/bin/sleep/sleep.1#2 integrate .. //depot/projects/vap/bin/sleep/sleep.c#2 integrate .. //depot/projects/vap/bin/stty/Makefile#2 integrate .. //depot/projects/vap/bin/stty/cchar.c#2 integrate .. //depot/projects/vap/bin/stty/extern.h#2 integrate .. //depot/projects/vap/bin/stty/gfmt.c#2 integrate .. //depot/projects/vap/bin/stty/key.c#2 integrate .. //depot/projects/vap/bin/stty/modes.c#2 integrate .. //depot/projects/vap/bin/stty/print.c#2 integrate .. //depot/projects/vap/bin/stty/stty.1#2 integrate .. //depot/projects/vap/bin/stty/stty.c#2 integrate .. //depot/projects/vap/bin/stty/stty.h#2 integrate .. //depot/projects/vap/bin/stty/util.c#2 integrate .. //depot/projects/vap/bin/sync/Makefile#2 integrate .. //depot/projects/vap/bin/sync/sync.8#2 integrate .. //depot/projects/vap/bin/sync/sync.c#2 integrate .. //depot/projects/vap/bin/test/Makefile#2 integrate .. //depot/projects/vap/bin/test/TEST.README#2 integrate .. //depot/projects/vap/bin/test/TEST.csh#2 integrate .. //depot/projects/vap/bin/test/TEST.sh#2 integrate .. //depot/projects/vap/bin/test/test.1#2 integrate .. //depot/projects/vap/bin/test/test.c#2 integrate .. //depot/projects/vap/cddl/Makefile#2 integrate .. //depot/projects/vap/cddl/Makefile.inc#2 integrate .. //depot/projects/vap/cddl/lib/Makefile#2 integrate .. //depot/projects/vap/cddl/lib/Makefile.inc#2 integrate .. //depot/projects/vap/cddl/lib/libavl/Makefile#2 integrate .. //depot/projects/vap/cddl/lib/libnvpair/Makefile#2 integrate .. //depot/projects/vap/cddl/lib/libumem/Makefile#2 integrate .. //depot/projects/vap/cddl/lib/libuutil/Makefile#2 integrate .. //depot/projects/vap/cddl/lib/libzfs/Makefile#2 integrate .. //depot/projects/vap/cddl/lib/libzpool/Makefile#2 integrate .. //depot/projects/vap/cddl/sbin/Makefile#2 integrate .. //depot/projects/vap/cddl/sbin/Makefile.inc#2 integrate .. //depot/projects/vap/cddl/sbin/zfs/Makefile#2 integrate .. //depot/projects/vap/cddl/sbin/zpool/Makefile#2 integrate .. //depot/projects/vap/cddl/usr.bin/Makefile#2 integrate .. //depot/projects/vap/cddl/usr.bin/Makefile.inc#2 integrate .. //depot/projects/vap/cddl/usr.bin/ztest/Makefile#2 integrate .. //depot/projects/vap/cddl/usr.sbin/Makefile#2 integrate .. //depot/projects/vap/cddl/usr.sbin/Makefile.inc#2 integrate .. //depot/projects/vap/cddl/usr.sbin/zdb/Makefile#2 integrate .. //depot/projects/vap/compat/opensolaris/include/alloca.h#2 integrate .. //depot/projects/vap/compat/opensolaris/include/devid.h#2 integrate .. //depot/projects/vap/compat/opensolaris/include/fcntl.h#2 integrate .. //depot/projects/vap/compat/opensolaris/include/fsshare.h#2 integrate .. //depot/projects/vap/compat/opensolaris/include/libintl.h#2 integrate .. //depot/projects/vap/compat/opensolaris/include/mnttab.h#2 integrate .. //depot/projects/vap/compat/opensolaris/include/priv.h#2 integrate .. //depot/projects/vap/compat/opensolaris/include/solaris.h#2 integrate .. //depot/projects/vap/compat/opensolaris/include/stdio.h#2 integrate .. //depot/projects/vap/compat/opensolaris/include/stdlib.h#2 integrate .. //depot/projects/vap/compat/opensolaris/include/strings.h#2 integrate .. //depot/projects/vap/compat/opensolaris/include/unistd.h#2 integrate .. //depot/projects/vap/compat/opensolaris/include/zone.h#2 integrate .. //depot/projects/vap/compat/opensolaris/lib/libumem/umem.c#2 integrate .. //depot/projects/vap/compat/opensolaris/lib/libumem/umem.h#2 integrate .. //depot/projects/vap/compat/opensolaris/misc/deviceid.c#2 integrate .. //depot/projects/vap/compat/opensolaris/misc/fsshare.c#2 integrate .. //depot/projects/vap/compat/opensolaris/misc/mkdirp.c#2 integrate .. //depot/projects/vap/compat/opensolaris/misc/mnttab.c#2 integrate .. //depot/projects/vap/compat/opensolaris/misc/zmount.c#2 integrate .. //depot/projects/vap/compat/opensolaris/misc/zone.c#2 integrate .. //depot/projects/vap/contrib/amd/AUTHORS#2 integrate .. //depot/projects/vap/contrib/amd/BUGS#2 integrate .. //depot/projects/vap/contrib/amd/COPYING#2 integrate .. //depot/projects/vap/contrib/amd/ChangeLog#2 integrate .. //depot/projects/vap/contrib/amd/FREEBSD-Xlist#2 integrate .. //depot/projects/vap/contrib/amd/FREEBSD-upgrade#2 integrate .. //depot/projects/vap/contrib/amd/INSTALL#2 integrate .. //depot/projects/vap/contrib/amd/MIRRORS.html#2 integrate .. //depot/projects/vap/contrib/amd/MIRRORS.txt#2 integrate .. //depot/projects/vap/contrib/amd/NEWS#2 integrate .. //depot/projects/vap/contrib/amd/README#2 integrate .. //depot/projects/vap/contrib/amd/README.ldap#2 integrate .. //depot/projects/vap/contrib/amd/README.y2k#2 integrate .. //depot/projects/vap/contrib/amd/amd/am_ops.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/amd.8#2 integrate .. //depot/projects/vap/contrib/amd/amd/amd.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/amd.h#2 integrate .. //depot/projects/vap/contrib/amd/amd/amfs_auto.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/amfs_direct.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/amfs_error.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/amfs_host.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/amfs_inherit.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/amfs_link.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/amfs_linkx.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/amfs_nfsl.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/amfs_nfsx.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/amfs_program.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/amfs_root.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/amfs_toplvl.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/amfs_union.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/amq_subr.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/amq_svc.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/autil.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/clock.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/conf.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/conf_parse.y#2 integrate .. //depot/projects/vap/contrib/amd/amd/conf_tok.l#2 integrate .. //depot/projects/vap/contrib/amd/amd/get_args.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/info_file.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/info_hesiod.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/info_ldap.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/info_ndbm.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/info_nis.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/info_nisplus.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/info_passwd.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/info_union.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/map.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/mapc.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/mntfs.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/nfs_prot_svc.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/nfs_start.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/nfs_subr.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/ops_TEMPLATE.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/ops_cachefs.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/ops_cdfs.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/ops_efs.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/ops_lofs.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/ops_mfs.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/ops_nfs.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/ops_nfs3.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/ops_nullfs.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/ops_pcfs.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/ops_tfs.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/ops_tmpfs.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/ops_ufs.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/ops_umapfs.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/ops_unionfs.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/ops_xfs.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/opts.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/restart.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/rpc_fwd.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/sched.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/srvr_amfs_auto.c#2 integrate .. //depot/projects/vap/contrib/amd/amd/srvr_nfs.c#2 integrate .. //depot/projects/vap/contrib/amd/amq/amq.8#2 integrate .. //depot/projects/vap/contrib/amd/amq/amq.c#2 integrate .. //depot/projects/vap/contrib/amd/amq/amq.h#2 integrate .. //depot/projects/vap/contrib/amd/amq/amq_clnt.c#2 integrate .. //depot/projects/vap/contrib/amd/amq/amq_xdr.c#2 integrate .. //depot/projects/vap/contrib/amd/amq/pawd.1#2 integrate .. //depot/projects/vap/contrib/amd/amq/pawd.c#2 integrate .. //depot/projects/vap/contrib/amd/aux_conf.h.in#2 integrate .. //depot/projects/vap/contrib/amd/bootstrap#2 integrate .. //depot/projects/vap/contrib/amd/conf/checkmount/checkmount_bsd44.c#2 integrate .. //depot/projects/vap/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#2 integrate .. //depot/projects/vap/contrib/amd/conf/mtab/mtab_bsd.c#2 integrate .. //depot/projects/vap/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#2 integrate .. //depot/projects/vap/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#2 integrate .. //depot/projects/vap/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#2 integrate .. //depot/projects/vap/contrib/amd/conf/transp/transp_sockets.c#2 integrate .. //depot/projects/vap/contrib/amd/conf/trap/trap_default.h#2 integrate .. //depot/projects/vap/contrib/amd/conf/umount/umount_bsd44.c#2 integrate .. //depot/projects/vap/contrib/amd/doc/am-utils.texi#2 integrate .. //depot/projects/vap/contrib/amd/doc/texinfo.tex#2 integrate .. //depot/projects/vap/contrib/amd/doc/version.texi#2 integrate .. //depot/projects/vap/contrib/amd/fixmount/fixmount.8#2 integrate .. //depot/projects/vap/contrib/amd/fixmount/fixmount.c#2 integrate .. //depot/projects/vap/contrib/amd/fsinfo/fsi_analyze.c#2 integrate .. //depot/projects/vap/contrib/amd/fsinfo/fsi_data.h#2 integrate .. //depot/projects/vap/contrib/amd/fsinfo/fsi_dict.c#2 integrate .. //depot/projects/vap/contrib/amd/fsinfo/fsi_gram.y#2 integrate .. //depot/projects/vap/contrib/amd/fsinfo/fsi_lex.l#2 integrate .. //depot/projects/vap/contrib/amd/fsinfo/fsi_util.c#2 integrate .. //depot/projects/vap/contrib/amd/fsinfo/fsinfo.8#2 integrate .. //depot/projects/vap/contrib/amd/fsinfo/fsinfo.c#2 integrate .. //depot/projects/vap/contrib/amd/fsinfo/fsinfo.h#2 integrate .. //depot/projects/vap/contrib/amd/fsinfo/wr_atab.c#2 integrate .. //depot/projects/vap/contrib/amd/fsinfo/wr_bparam.c#2 integrate .. //depot/projects/vap/contrib/amd/fsinfo/wr_dumpset.c#2 integrate .. //depot/projects/vap/contrib/amd/fsinfo/wr_exportfs.c#2 integrate .. //depot/projects/vap/contrib/amd/fsinfo/wr_fstab.c#2 integrate .. //depot/projects/vap/contrib/amd/hlfsd/hlfsd.8#2 integrate .. //depot/projects/vap/contrib/amd/hlfsd/hlfsd.c#2 integrate .. //depot/projects/vap/contrib/amd/hlfsd/hlfsd.h#2 integrate .. //depot/projects/vap/contrib/amd/hlfsd/homedir.c#2 integrate .. //depot/projects/vap/contrib/amd/hlfsd/nfs_prot_svc.c#2 integrate .. //depot/projects/vap/contrib/amd/hlfsd/stubs.c#2 integrate .. //depot/projects/vap/contrib/amd/include/am_compat.h#2 integrate .. //depot/projects/vap/contrib/amd/include/am_defs.h#2 integrate .. //depot/projects/vap/contrib/amd/include/am_utils.h#2 integrate .. //depot/projects/vap/contrib/amd/include/am_xdr_func.h#2 integrate .. //depot/projects/vap/contrib/amd/include/amq_defs.h#2 integrate .. //depot/projects/vap/contrib/amd/include/mount_headers1.h#2 integrate .. //depot/projects/vap/contrib/amd/include/mount_headers2.h#2 integrate .. //depot/projects/vap/contrib/amd/ldap-id.ms#2 integrate .. //depot/projects/vap/contrib/amd/ldap-id.txt#2 integrate .. //depot/projects/vap/contrib/amd/libamu/alloca.c#2 integrate .. //depot/projects/vap/contrib/amd/libamu/amu.h#2 integrate .. //depot/projects/vap/contrib/amd/libamu/hasmntopt.c#2 integrate .. //depot/projects/vap/contrib/amd/libamu/misc_rpc.c#2 integrate .. //depot/projects/vap/contrib/amd/libamu/mount_fs.c#2 integrate .. //depot/projects/vap/contrib/amd/libamu/mtab.c#2 integrate .. //depot/projects/vap/contrib/amd/libamu/nfs_prot_xdr.c#2 integrate .. //depot/projects/vap/contrib/amd/libamu/strerror.c#2 integrate .. //depot/projects/vap/contrib/amd/libamu/util.c#2 integrate .. //depot/projects/vap/contrib/amd/libamu/wire.c#2 integrate .. //depot/projects/vap/contrib/amd/libamu/xdr_func.c#2 integrate .. //depot/projects/vap/contrib/amd/libamu/xutil.c#2 integrate .. //depot/projects/vap/contrib/amd/m4/GNUmakefile#2 integrate .. //depot/projects/vap/contrib/amd/m4/amdgrep#2 integrate .. //depot/projects/vap/contrib/amd/m4/amindent#2 integrate .. //depot/projects/vap/contrib/amd/m4/autopat#2 integrate .. //depot/projects/vap/contrib/amd/m4/chop-aclocal.pl#2 integrate .. //depot/projects/vap/contrib/amd/m4/copy-if-newbig#2 integrate .. //depot/projects/vap/contrib/amd/m4/macros/HEADER#2 integrate .. //depot/projects/vap/contrib/amd/m4/macros/TRAILER#2 integrate .. //depot/projects/vap/contrib/amd/m4/mk-aclocal#2 integrate .. //depot/projects/vap/contrib/amd/m4/mkconf#2 integrate .. //depot/projects/vap/contrib/amd/m4/rmtspc#2 integrate .. //depot/projects/vap/contrib/amd/m4/update_build_version#2 integrate .. //depot/projects/vap/contrib/amd/mk-amd-map/mk-amd-map.8#2 integrate .. //depot/projects/vap/contrib/amd/mk-amd-map/mk-amd-map.c#2 integrate .. //depot/projects/vap/contrib/amd/scripts/Makefile.am#2 integrate .. //depot/projects/vap/contrib/amd/scripts/Makefile.in#2 integrate .. //depot/projects/vap/contrib/amd/scripts/am-eject.in#2 integrate .. //depot/projects/vap/contrib/amd/scripts/amd.conf-sample#2 integrate .. //depot/projects/vap/contrib/amd/scripts/amd.conf.5#2 integrate .. //depot/projects/vap/contrib/amd/scripts/amd2ldif.in#2 integrate .. //depot/projects/vap/contrib/amd/scripts/amd2sun.in#2 integrate .. //depot/projects/vap/contrib/amd/scripts/automount2amd.8#2 integrate .. //depot/projects/vap/contrib/amd/scripts/automount2amd.in#2 integrate .. //depot/projects/vap/contrib/amd/scripts/ctl-amd.in#2 integrate .. //depot/projects/vap/contrib/amd/scripts/ctl-hlfsd.in#2 integrate .. //depot/projects/vap/contrib/amd/scripts/expn.1#2 integrate .. //depot/projects/vap/contrib/amd/scripts/expn.in#2 integrate .. //depot/projects/vap/contrib/amd/scripts/fix-amd-map.in#2 integrate .. //depot/projects/vap/contrib/amd/scripts/fixrmtab.in#2 integrate .. //depot/projects/vap/contrib/amd/scripts/redhat-ctl-amd.in#2 integrate .. //depot/projects/vap/contrib/amd/scripts/wait4amd.in#2 integrate .. //depot/projects/vap/contrib/amd/scripts/wait4amd2die.in#2 integrate .. //depot/projects/vap/contrib/amd/tasks#2 integrate .. //depot/projects/vap/contrib/amd/wire-test/wire-test.8#2 integrate .. //depot/projects/vap/contrib/amd/wire-test/wire-test.c#2 integrate .. //depot/projects/vap/contrib/bc/AUTHORS#2 integrate .. //depot/projects/vap/contrib/bc/ChangeLog#2 integrate .. //depot/projects/vap/contrib/bc/Examples/ckbook.b#2 integrate .. //depot/projects/vap/contrib/bc/Examples/pi.b#2 integrate .. //depot/projects/vap/contrib/bc/Examples/primes.b#2 integrate .. //depot/projects/vap/contrib/bc/Examples/twins.b#2 integrate .. //depot/projects/vap/contrib/bc/FAQ#2 integrate .. //depot/projects/vap/contrib/bc/FREEBSD-upgrade#2 integrate .. //depot/projects/vap/contrib/bc/INSTALL#2 integrate .. //depot/projects/vap/contrib/bc/Makefile.am#2 integrate .. //depot/projects/vap/contrib/bc/Makefile.in#2 integrate .. //depot/projects/vap/contrib/bc/NEWS#2 integrate .. //depot/projects/vap/contrib/bc/README#2 integrate .. //depot/projects/vap/contrib/bc/Test/BUG.bc#2 integrate .. //depot/projects/vap/contrib/bc/Test/array.b#2 integrate .. //depot/projects/vap/contrib/bc/Test/arrayp.b#2 integrate .. //depot/projects/vap/contrib/bc/Test/aryprm.b#2 integrate .. //depot/projects/vap/contrib/bc/Test/atan.b#2 integrate .. //depot/projects/vap/contrib/bc/Test/checklib.b#2 integrate .. //depot/projects/vap/contrib/bc/Test/div.b#2 integrate .. //depot/projects/vap/contrib/bc/Test/exp.b#2 integrate .. //depot/projects/vap/contrib/bc/Test/fact.b#2 integrate .. //depot/projects/vap/contrib/bc/Test/jn.b#2 integrate .. //depot/projects/vap/contrib/bc/Test/ln.b#2 integrate .. //depot/projects/vap/contrib/bc/Test/mul.b#2 integrate .. //depot/projects/vap/contrib/bc/Test/raise.b#2 integrate .. //depot/projects/vap/contrib/bc/Test/signum#2 integrate .. //depot/projects/vap/contrib/bc/Test/sine.b#2 integrate .. //depot/projects/vap/contrib/bc/Test/sqrt.b#2 integrate .. //depot/projects/vap/contrib/bc/Test/sqrt1.b#2 integrate .. //depot/projects/vap/contrib/bc/Test/sqrt2.b#2 integrate .. //depot/projects/vap/contrib/bc/Test/testfn.b#2 integrate .. //depot/projects/vap/contrib/bc/Test/timetest#2 integrate .. //depot/projects/vap/contrib/bc/acconfig.h#2 integrate .. //depot/projects/vap/contrib/bc/aclocal.m4#2 integrate .. //depot/projects/vap/contrib/bc/bc/Makefile.am#2 integrate .. //depot/projects/vap/contrib/bc/bc/Makefile.in#2 integrate .. //depot/projects/vap/contrib/bc/bc/bc.y#2 integrate .. //depot/projects/vap/contrib/bc/bc/bcdefs.h#2 integrate .. //depot/projects/vap/contrib/bc/bc/const.h#2 integrate .. //depot/projects/vap/contrib/bc/bc/execute.c#2 integrate .. //depot/projects/vap/contrib/bc/bc/fix-libmath_h#2 integrate .. //depot/projects/vap/contrib/bc/bc/global.c#2 integrate .. //depot/projects/vap/contrib/bc/bc/global.h#2 integrate .. //depot/projects/vap/contrib/bc/bc/libmath.b#2 integrate .. //depot/projects/vap/contrib/bc/bc/libmath.h#2 integrate .. //depot/projects/vap/contrib/bc/bc/load.c#2 integrate .. //depot/projects/vap/contrib/bc/bc/main.c#2 integrate .. //depot/projects/vap/contrib/bc/bc/proto.h#2 integrate .. //depot/projects/vap/contrib/bc/bc/sbc.y#2 integrate .. //depot/projects/vap/contrib/bc/bc/scan.l#2 integrate .. //depot/projects/vap/contrib/bc/bc/storage.c#2 integrate .. //depot/projects/vap/contrib/bc/bc/util.c#2 integrate .. //depot/projects/vap/contrib/bc/config.h.in#2 integrate .. //depot/projects/vap/contrib/bc/configure#2 integrate .. //depot/projects/vap/contrib/bc/configure.in#2 integrate .. //depot/projects/vap/contrib/bc/dc/Makefile.am#2 integrate .. //depot/projects/vap/contrib/bc/dc/Makefile.in#2 integrate .. //depot/projects/vap/contrib/bc/dc/array.c#2 integrate .. //depot/projects/vap/contrib/bc/dc/dc-proto.h#2 integrate .. //depot/projects/vap/contrib/bc/dc/dc-regdef.h#2 integrate .. //depot/projects/vap/contrib/bc/dc/dc.c#2 integrate .. //depot/projects/vap/contrib/bc/dc/dc.h#2 integrate .. //depot/projects/vap/contrib/bc/dc/eval.c#2 integrate .. //depot/projects/vap/contrib/bc/dc/misc.c#2 integrate .. //depot/projects/vap/contrib/bc/dc/numeric.c#2 integrate .. //depot/projects/vap/contrib/bc/dc/stack.c#2 integrate .. //depot/projects/vap/contrib/bc/dc/string.c#2 integrate .. //depot/projects/vap/contrib/bc/doc/Makefile.am#2 integrate .. //depot/projects/vap/contrib/bc/doc/Makefile.in#2 integrate .. //depot/projects/vap/contrib/bc/doc/bc.1#2 integrate .. //depot/projects/vap/contrib/bc/doc/bc.texi#2 integrate .. //depot/projects/vap/contrib/bc/doc/dc.1#2 integrate .. //depot/projects/vap/contrib/bc/doc/dc.texi#2 integrate .. //depot/projects/vap/contrib/bc/h/number.h#2 integrate .. //depot/projects/vap/contrib/bc/install-sh#2 integrate .. //depot/projects/vap/contrib/bc/lib/Makefile.am#2 integrate .. //depot/projects/vap/contrib/bc/lib/Makefile.in#2 integrate .. //depot/projects/vap/contrib/bc/lib/number.c#2 integrate .. //depot/projects/vap/contrib/bc/lib/testmul.c#2 integrate .. //depot/projects/vap/contrib/bc/lib/vfprintf.c#2 integrate .. //depot/projects/vap/contrib/bc/missing#2 integrate .. //depot/projects/vap/contrib/bc/mkinstalldirs#2 integrate .. //depot/projects/vap/contrib/bc/stamp-h.in#2 integrate .. //depot/projects/vap/contrib/bind9/CHANGES#2 integrate .. //depot/projects/vap/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/vap/contrib/bind9/FAQ#2 integrate .. //depot/projects/vap/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/vap/contrib/bind9/FREEBSD-Upgrade#2 integrate .. //depot/projects/vap/contrib/bind9/FREEBSD-Xlist#2 integrate .. //depot/projects/vap/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/vap/contrib/bind9/README#2 integrate .. //depot/projects/vap/contrib/bind9/README.idnkit#2 integrate .. //depot/projects/vap/contrib/bind9/acconfig.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/Makefile.in#2 integrate .. //depot/projects/vap/contrib/bind9/bin/check/Makefile.in#2 integrate .. //depot/projects/vap/contrib/bind9/bin/check/check-tool.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/check/check-tool.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/vap/contrib/bind9/bin/check/named-checkconf.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/vap/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/vap/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/vap/contrib/bind9/bin/check/named-checkzone.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/vap/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/Makefile.in#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/host.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/nslookup.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dnssec/Makefile.in#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/dnssec/dnssectool.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/Makefile.in#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/builtin.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/client.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/control.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/include/named/builtin.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/include/named/config.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/include/named/control.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/include/named/interfacemgr.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/include/named/listenlist.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/include/named/log.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/include/named/logconf.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/include/named/lwaddr.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/include/named/lwdclient.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/include/named/lwresd.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/include/named/lwsearch.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/include/named/main.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/include/named/notify.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/include/named/ns_smf_globals.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/include/named/query.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/include/named/server.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/include/named/sortlist.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/include/named/tkeyconf.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/include/named/tsigconf.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/include/named/types.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/include/named/update.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/include/named/xfrout.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/include/named/zoneconf.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/listenlist.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/log.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/logconf.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/lwaddr.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/lwdclient.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/lwderror.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/lwdgabn.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/lwdgnba.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/lwdgrbn.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/lwdnoop.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/lwsearch.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/main.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/notify.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/server.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/sortlist.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/tkeyconf.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/tsigconf.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/unix/Makefile.in#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/unix/include/named/os.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/unix/os.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/xfrout.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/nsupdate/Makefile.in#2 integrate .. //depot/projects/vap/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/vap/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/vap/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/Makefile.in#2 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/include/rndc/os.h#2 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/rndc-confgen.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/rndc.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/rndc.conf#2 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/unix/Makefile.in#2 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/unix/os.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/util.c#2 integrate .. //depot/projects/vap/contrib/bind9/bin/rndc/util.h#2 integrate .. //depot/projects/vap/contrib/bind9/config.guess#2 integrate .. //depot/projects/vap/contrib/bind9/config.sub#2 integrate .. //depot/projects/vap/contrib/bind9/config.threads.in#2 integrate .. //depot/projects/vap/contrib/bind9/configure.in#2 integrate .. //depot/projects/vap/contrib/bind9/doc/Makefile.in#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/README-SGML#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/isc-logo.eps#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/isc-logo.pdf#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/man.dig.html#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/man.host.html#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/man.named.html#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate .. //depot/projects/vap/contrib/bind9/doc/arm/man.rndc.html#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/draft/update#2 integrate .. //depot/projects/vap/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/vap/contrib/bind9/doc/misc/dnssec#2 integrate .. //depot/projects/vap/contrib/bind9/doc/misc/format-options.pl#2 integrate .. //depot/projects/vap/contrib/bind9/doc/misc/ipv6#2 integrate .. //depot/projects/vap/contrib/bind9/doc/misc/migration#2 integrate .. //depot/projects/vap/contrib/bind9/doc/misc/migration-4to9#2 integrate .. //depot/projects/vap/contrib/bind9/doc/misc/options#2 integrate .. //depot/projects/vap/contrib/bind9/doc/misc/rfc-compliance#2 integrate .. //depot/projects/vap/contrib/bind9/doc/misc/roadmap#2 integrate .. //depot/projects/vap/contrib/bind9/doc/misc/sdb#2 integrate .. //depot/projects/vap/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/vap/contrib/bind9/doc/rfc/rfc1032.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/rfc/rfc1033.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/rfc/rfc1034.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/rfc/rfc1035.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/rfc/rfc1101.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/rfc/rfc1122.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/rfc/rfc1123.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/rfc/rfc1183.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/rfc/rfc1348.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/rfc/rfc1535.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/rfc/rfc1536.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/rfc/rfc1537.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/rfc/rfc1591.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/rfc/rfc1611.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/rfc/rfc1612.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/rfc/rfc1706.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/rfc/rfc1712.txt#2 integrate .. //depot/projects/vap/contrib/bind9/doc/rfc/rfc1750.txt#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 2 11:11:39 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5FA616A41A; Sun, 2 Dec 2007 11:11:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6EEA516A417 for ; Sun, 2 Dec 2007 11:11:38 +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 478E213C45D for ; Sun, 2 Dec 2007 11:11:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2BBcYa042826 for ; Sun, 2 Dec 2007 11:11:38 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB2BBcEO042822 for perforce@freebsd.org; Sun, 2 Dec 2007 11:11:38 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 11:11:38 GMT Message-Id: <200712021111.lB2BBcEO042822@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 129993 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 11:11:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=129993 Change 129993 by hselasky@hselasky_laptop001 on 2007/12/02 11:11:29 We need to initialize "priv_mtx" in the "usbd_memory_info" structure. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#58 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#58 (text+ko) ==== @@ -729,6 +729,7 @@ info->xfer_page_cache_end = USBD_ADD_BYTES(buf, parm.size[2]); info->usb_mtx = &(udev->bus->mtx); + info->priv_mtx = priv_mtx; info->dma_tag_p = parm.dma_tag_p; info->dma_tag_max = parm.dma_tag_max; From owner-p4-projects@FreeBSD.ORG Sun Dec 2 11:14:01 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6DC6116A420; Sun, 2 Dec 2007 11:14: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 1EF6516A419 for ; Sun, 2 Dec 2007 11:14:01 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0E66713C457 for ; Sun, 2 Dec 2007 11:14:01 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2BE0Zl043370 for ; Sun, 2 Dec 2007 11:14:01 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB2BDefa043362 for perforce@freebsd.org; Sun, 2 Dec 2007 11:13:40 GMT (envelope-from zec@FreeBSD.org) Date: Sun, 2 Dec 2007 11:13:40 GMT Message-Id: <200712021113.lB2BDefa043362@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 129994 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 11:14:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=129994 Change 129994 by zec@zec_tpx32 on 2007/12/02 11:13:11 IFC Affected files ... .. //depot/projects/vimage/src/sys/dev/iwi/if_iwi.c#7 edit .. //depot/projects/vimage/src/sys/net80211/ieee80211.c#8 edit .. //depot/projects/vimage/src/sys/net80211/ieee80211_var.h#7 edit .. //depot/user/zec/forwarding/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/user/zec/forwarding/sys/amd64/amd64/exception.S#2 integrate .. //depot/user/zec/forwarding/sys/amd64/amd64/genassym.c#3 integrate .. //depot/user/zec/forwarding/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/user/zec/forwarding/sys/amd64/amd64/machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/amd64/amd64/msi.c#2 integrate .. //depot/user/zec/forwarding/sys/amd64/amd64/nexus.c#2 integrate .. //depot/user/zec/forwarding/sys/amd64/amd64/pmap.c#2 integrate .. //depot/user/zec/forwarding/sys/amd64/amd64/prof_machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/amd64/amd64/trap.c#2 integrate .. //depot/user/zec/forwarding/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/user/zec/forwarding/sys/amd64/conf/GENERIC#3 integrate .. //depot/user/zec/forwarding/sys/amd64/conf/GENERIC.hints#2 integrate .. //depot/user/zec/forwarding/sys/amd64/conf/NOTES#2 integrate .. //depot/user/zec/forwarding/sys/amd64/include/clock.h#2 integrate .. //depot/user/zec/forwarding/sys/amd64/include/pc/bios.h#2 integrate .. //depot/user/zec/forwarding/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/user/zec/forwarding/sys/amd64/isa/clock.c#3 integrate .. //depot/user/zec/forwarding/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/user/zec/forwarding/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/user/zec/forwarding/sys/arm/arm/bcopyinout.S#2 integrate .. //depot/user/zec/forwarding/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/arm/arm/cpufunc.c#2 integrate .. //depot/user/zec/forwarding/sys/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/user/zec/forwarding/sys/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/user/zec/forwarding/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/user/zec/forwarding/sys/arm/arm/identcpu.c#2 integrate .. //depot/user/zec/forwarding/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/user/zec/forwarding/sys/arm/arm/pmap.c#3 integrate .. //depot/user/zec/forwarding/sys/arm/arm/support.S#2 integrate .. //depot/user/zec/forwarding/sys/arm/arm/swtch.S#2 integrate .. //depot/user/zec/forwarding/sys/arm/arm/trap.c#2 integrate .. //depot/user/zec/forwarding/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/user/zec/forwarding/sys/arm/at91/at91_mcireg.h#2 integrate .. //depot/user/zec/forwarding/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/user/zec/forwarding/sys/arm/at91/if_ate.c#2 integrate .. //depot/user/zec/forwarding/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/user/zec/forwarding/sys/arm/at91/std.at91#2 integrate .. //depot/user/zec/forwarding/sys/arm/at91/std.kb920x#2 integrate .. //depot/user/zec/forwarding/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/user/zec/forwarding/sys/arm/conf/HL200#1 branch .. //depot/user/zec/forwarding/sys/arm/include/armreg.h#2 integrate .. //depot/user/zec/forwarding/sys/arm/include/asm.h#2 integrate .. //depot/user/zec/forwarding/sys/arm/include/atomic.h#2 integrate .. //depot/user/zec/forwarding/sys/arm/include/cpuconf.h#2 integrate .. //depot/user/zec/forwarding/sys/arm/include/cpufunc.h#2 integrate .. //depot/user/zec/forwarding/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/user/zec/forwarding/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/user/zec/forwarding/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/user/zec/forwarding/sys/boot/arm/at91/boot2/boot2.c#2 integrate .. //depot/user/zec/forwarding/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/user/zec/forwarding/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/user/zec/forwarding/sys/boot/arm/at91/libat91/emac_init.c#2 integrate .. //depot/user/zec/forwarding/sys/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/user/zec/forwarding/sys/boot/common/loader.8#2 integrate .. //depot/user/zec/forwarding/sys/boot/common/ufsread.c#2 integrate .. //depot/user/zec/forwarding/sys/boot/ficl/Makefile#2 integrate .. //depot/user/zec/forwarding/sys/boot/i386/Makefile#2 integrate .. //depot/user/zec/forwarding/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/user/zec/forwarding/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/user/zec/forwarding/sys/boot/i386/gptboot/Makefile#1 branch .. //depot/user/zec/forwarding/sys/boot/i386/gptboot/gptboot.c#1 branch .. //depot/user/zec/forwarding/sys/boot/i386/gptboot/gptldr.S#1 branch .. //depot/user/zec/forwarding/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/user/zec/forwarding/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/user/zec/forwarding/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/user/zec/forwarding/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/user/zec/forwarding/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/user/zec/forwarding/sys/boot/i386/libi386/devicename.c#2 integrate .. //depot/user/zec/forwarding/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/user/zec/forwarding/sys/boot/i386/loader/main.c#2 integrate .. //depot/user/zec/forwarding/sys/boot/i386/pmbr/Makefile#1 branch .. //depot/user/zec/forwarding/sys/boot/i386/pmbr/pmbr.s#1 branch .. //depot/user/zec/forwarding/sys/boot/pc98/Makefile.inc#2 integrate .. //depot/user/zec/forwarding/sys/boot/pc98/boot2/boot.c#2 integrate .. //depot/user/zec/forwarding/sys/boot/pc98/cdboot/cdboot.s#2 integrate .. //depot/user/zec/forwarding/sys/boot/pc98/libpc98/bioscd.c#2 integrate .. //depot/user/zec/forwarding/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/user/zec/forwarding/sys/boot/pc98/loader/main.c#2 integrate .. //depot/user/zec/forwarding/sys/bsm/audit.h#2 integrate .. //depot/user/zec/forwarding/sys/cam/cam_xpt.c#2 integrate .. //depot/user/zec/forwarding/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/user/zec/forwarding/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/user/zec/forwarding/sys/compat/linux/linux_file.c#2 integrate .. //depot/user/zec/forwarding/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/user/zec/forwarding/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/user/zec/forwarding/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/user/zec/forwarding/sys/compat/linux/linux_misc.c#2 integrate .. //depot/user/zec/forwarding/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/user/zec/forwarding/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/user/zec/forwarding/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/user/zec/forwarding/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/user/zec/forwarding/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/user/zec/forwarding/sys/compat/opensolaris/rpc/xdr.h#2 integrate .. //depot/user/zec/forwarding/sys/compat/opensolaris/sys/atomic.h#2 integrate .. //depot/user/zec/forwarding/sys/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/user/zec/forwarding/sys/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/user/zec/forwarding/sys/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/user/zec/forwarding/sys/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/user/zec/forwarding/sys/compat/opensolaris/sys/elf.h#1 branch .. //depot/user/zec/forwarding/sys/compat/opensolaris/sys/kcondvar.h#2 integrate .. //depot/user/zec/forwarding/sys/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/user/zec/forwarding/sys/compat/opensolaris/sys/mman.h#1 branch .. //depot/user/zec/forwarding/sys/compat/opensolaris/sys/modctl.h#1 branch .. //depot/user/zec/forwarding/sys/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/user/zec/forwarding/sys/compat/opensolaris/sys/objfs.h#1 branch .. //depot/user/zec/forwarding/sys/compat/opensolaris/sys/param.h#1 branch .. //depot/user/zec/forwarding/sys/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/user/zec/forwarding/sys/compat/opensolaris/sys/proc.h#2 integrate .. //depot/user/zec/forwarding/sys/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/user/zec/forwarding/sys/compat/opensolaris/sys/stat.h#1 branch .. //depot/user/zec/forwarding/sys/compat/opensolaris/sys/time.h#2 integrate .. //depot/user/zec/forwarding/sys/compat/opensolaris/sys/types.h#2 integrate .. //depot/user/zec/forwarding/sys/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/user/zec/forwarding/sys/compat/svr4/imgact_svr4.c#2 integrate .. //depot/user/zec/forwarding/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/user/zec/forwarding/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/user/zec/forwarding/sys/conf/NOTES#3 integrate .. //depot/user/zec/forwarding/sys/conf/files#4 integrate .. //depot/user/zec/forwarding/sys/conf/files.amd64#2 integrate .. //depot/user/zec/forwarding/sys/conf/files.arm#2 integrate .. //depot/user/zec/forwarding/sys/conf/files.i386#2 integrate .. //depot/user/zec/forwarding/sys/conf/files.ia64#2 integrate .. //depot/user/zec/forwarding/sys/conf/files.pc98#2 integrate .. //depot/user/zec/forwarding/sys/conf/files.powerpc#2 integrate .. //depot/user/zec/forwarding/sys/conf/files.sun4v#2 integrate .. //depot/user/zec/forwarding/sys/conf/kmod.mk#2 integrate .. //depot/user/zec/forwarding/sys/conf/newvers.sh#2 integrate .. //depot/user/zec/forwarding/sys/conf/options#3 integrate .. //depot/user/zec/forwarding/sys/conf/options.amd64#2 integrate .. //depot/user/zec/forwarding/sys/conf/options.arm#2 integrate .. //depot/user/zec/forwarding/sys/conf/options.i386#2 integrate .. //depot/user/zec/forwarding/sys/contrib/dev/wpi/LICENSE#1 branch .. //depot/user/zec/forwarding/sys/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu#1 branch .. //depot/user/zec/forwarding/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/user/zec/forwarding/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/user/zec/forwarding/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/ipfilter/netinet/ip_htable.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/user/zec/forwarding/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/user/zec/forwarding/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/user/zec/forwarding/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/user/zec/forwarding/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/user/zec/forwarding/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/opensolaris/common/avl/avl.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/user/zec/forwarding/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate .. //depot/user/zec/forwarding/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate .. //depot/user/zec/forwarding/sys/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate .. //depot/user/zec/forwarding/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate .. //depot/user/zec/forwarding/sys/contrib/opensolaris/uts/common/sys/procset.h#2 integrate .. //depot/user/zec/forwarding/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate .. //depot/user/zec/forwarding/sys/contrib/opensolaris/uts/common/sys/vfs.h#2 delete .. //depot/user/zec/forwarding/sys/contrib/opensolaris/uts/common/sys/vmem.h#2 integrate .. //depot/user/zec/forwarding/sys/contrib/pf/net/pf.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/user/zec/forwarding/sys/contrib/pf/net/pf_table.c#2 integrate .. //depot/user/zec/forwarding/sys/ddb/db_examine.c#2 integrate .. //depot/user/zec/forwarding/sys/ddb/db_ps.c#3 integrate .. //depot/user/zec/forwarding/sys/dev/aac/aac.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/aac/aac_cam.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/aac/aac_debug.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/aac/aac_pci.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/acpica/acpi.c#3 integrate .. //depot/user/zec/forwarding/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/user/zec/forwarding/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/acpica/acpi_pci.c#3 integrate .. //depot/user/zec/forwarding/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/acpica/acpivar.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/agp/agp.c#1 branch .. //depot/user/zec/forwarding/sys/dev/agp/agp_ali.c#1 branch .. //depot/user/zec/forwarding/sys/dev/agp/agp_amd.c#1 branch .. //depot/user/zec/forwarding/sys/dev/agp/agp_amd64.c#1 branch .. //depot/user/zec/forwarding/sys/dev/agp/agp_ati.c#1 branch .. //depot/user/zec/forwarding/sys/dev/agp/agp_i810.c#1 branch .. //depot/user/zec/forwarding/sys/dev/agp/agp_if.m#1 branch .. //depot/user/zec/forwarding/sys/dev/agp/agp_intel.c#1 branch .. //depot/user/zec/forwarding/sys/dev/agp/agp_nvidia.c#1 branch .. //depot/user/zec/forwarding/sys/dev/agp/agp_sis.c#1 branch .. //depot/user/zec/forwarding/sys/dev/agp/agp_via.c#1 branch .. //depot/user/zec/forwarding/sys/dev/agp/agppriv.h#1 branch .. //depot/user/zec/forwarding/sys/dev/agp/agpreg.h#1 branch .. //depot/user/zec/forwarding/sys/dev/agp/agpvar.h#1 branch .. //depot/user/zec/forwarding/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/amr/amr.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/amr/amr_cam.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/an/if_an.c#3 integrate .. //depot/user/zec/forwarding/sys/dev/an/if_anreg.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/asmc/asmc.c#1 branch .. //depot/user/zec/forwarding/sys/dev/asmc/asmcvar.h#1 branch .. //depot/user/zec/forwarding/sys/dev/ata/ata-all.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/user/zec/forwarding/sys/dev/ata/ata-disk.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/ata/ata-dma.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/ata/ata-pci.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/ata/ata-pci.h#3 integrate .. //depot/user/zec/forwarding/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/ath/ath_rate/sample/sample.c#3 integrate .. //depot/user/zec/forwarding/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/bce/if_bce.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/bge/if_bge.c#3 integrate .. //depot/user/zec/forwarding/sys/dev/bktr/msp34xx.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/ciss/ciss.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/ctau/if_ct.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/cx/if_cx.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/dc/dcphy.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/dc/if_dc.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/drm/drmP.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_80003es2lan.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_80003es2lan.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_82540.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_82541.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_82541.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_82542.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_82543.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_82543.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_82571.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_82571.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_82575.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_82575.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_api.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_api.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_defines.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_hw.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_ich8lan.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_ich8lan.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_mac.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_mac.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_manage.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_manage.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_nvm.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_nvm.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_osdep.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_phy.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_phy.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/e1000_regs.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/em/if_em.c#3 integrate .. //depot/user/zec/forwarding/sys/dev/em/if_em.h#3 integrate .. //depot/user/zec/forwarding/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/fdc/fdc.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/firewire/firewire.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/flash/at45d.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/gem/if_gem.c#3 integrate .. //depot/user/zec/forwarding/sys/dev/hptmv/entry.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/idt/idt_pci.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/ipmi/ipmi_kcs.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/ipmi/ipmi_smic.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/ipmi/ipmi_ssif.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/ipw/if_ipwreg.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/iscsi/initiator/isc_sm.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/iscsi/initiator/isc_soc.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/isp/isp_target.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/lge/if_lge.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/md/md.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/mfi/mfi_cam.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/mii/amphy.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/mii/e1000phy.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/mii/gentbi.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/mii/miidevs#2 integrate .. //depot/user/zec/forwarding/sys/dev/mii/nsphy.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/mii/rgephy.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/mii/rgephyreg.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/mii/rlphy.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/mii/tdkphy.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/mii/ukphy_subr.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/mpt/mpt.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/mpt/mpt.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/msk/if_msk.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/my/if_my.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/user/zec/forwarding/sys/dev/nge/if_nge.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/nve/if_nve.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/nvram/nvram.c#1 branch .. //depot/user/zec/forwarding/sys/dev/nxge/if_nxge.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/if_nxge.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/include/build-version.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/include/version.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/include/xge-debug.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/include/xge-defs.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/include/xge-list.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/include/xge-os-pal.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/include/xge-os-template.h#2 delete .. //depot/user/zec/forwarding/sys/dev/nxge/include/xge-queue.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/include/xgehal-channel.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/include/xgehal-config.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/include/xgehal-device.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/include/xgehal-driver.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/include/xgehal-event.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/include/xgehal-fifo.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/include/xgehal-mgmt.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/include/xgehal-mgmtaux.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/include/xgehal-mm.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/include/xgehal-regs.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/include/xgehal-ring.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/include/xgehal-stats.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/include/xgehal-types.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/include/xgehal.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/xge-osdep.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/xgehal/xge-queue.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/xgehal/xgehal-channel-fp.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/xgehal/xgehal-channel.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/xgehal/xgehal-config.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/xgehal/xgehal-device-fp.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/xgehal/xgehal-device.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/xgehal/xgehal-driver.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/xgehal/xgehal-fifo-fp.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/xgehal/xgehal-fifo.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/xgehal/xgehal-mgmt.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/xgehal/xgehal-mgmtaux.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/xgehal/xgehal-mm.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/xgehal/xgehal-ring-fp.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/xgehal/xgehal-ring.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/xgehal/xgehal-stats.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/nxge/xgell-version.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/ofw/ofw_disk.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/pccard/pccarddevs#2 integrate .. //depot/user/zec/forwarding/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/user/zec/forwarding/sys/dev/pccbb/pccbb_pci.c#3 integrate .. //depot/user/zec/forwarding/sys/dev/pci/pci.c#3 integrate .. //depot/user/zec/forwarding/sys/dev/pci/pci_user.c#3 integrate .. //depot/user/zec/forwarding/sys/dev/puc/puc_pci.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/ral/rt2560.c#3 integrate .. //depot/user/zec/forwarding/sys/dev/ral/rt2661.c#3 integrate .. //depot/user/zec/forwarding/sys/dev/random/harvest.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/random/yarrow.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/re/if_re.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/safe/safe.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/si/si_pci.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/sio/sio.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/sio/sio_isa.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/sio/sio_puc.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/sk/if_sk.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/sound/isa/ad1816.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/sound/pci/emu10kx.c#3 integrate .. //depot/user/zec/forwarding/sys/dev/sound/pci/envy24.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/sound/pci/envy24ht.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/sound/sbus/cs4231.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/stge/if_stge.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/ti/if_ti.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/twa/tw_cl_init.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/twa/tw_cl_intr.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/twa/tw_cl_io.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/twa/tw_cl_misc.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/twa/tw_cl_share.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/twa/tw_osl.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/twa/tw_osl_cam.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/twa/tw_osl_share.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/txp/if_txp.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/user/zec/forwarding/sys/dev/usb/if_axe.c#3 integrate .. //depot/user/zec/forwarding/sys/dev/usb/if_axereg.h#3 integrate .. //depot/user/zec/forwarding/sys/dev/usb/if_rum.c#3 integrate .. //depot/user/zec/forwarding/sys/dev/usb/if_ural.c#3 integrate .. //depot/user/zec/forwarding/sys/dev/usb/if_zyd.c#3 integrate .. //depot/user/zec/forwarding/sys/dev/usb/if_zydfw.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/usb/if_zydreg.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/usb/uchcom.c#1 branch .. //depot/user/zec/forwarding/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/usb/uipaq.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/usb/ukbd.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/usb/usb.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/usb/usb_port.h#2 integrate .. //depot/user/zec/forwarding/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/usb/usbdevs#3 integrate .. //depot/user/zec/forwarding/sys/dev/utopia/utopia.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/vge/if_vge.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/vx/if_vx_pci.c#2 integrate .. //depot/user/zec/forwarding/sys/dev/wpi/if_wpi.c#1 branch .. //depot/user/zec/forwarding/sys/dev/wpi/if_wpireg.h#1 branch .. //depot/user/zec/forwarding/sys/dev/wpi/if_wpivar.h#1 branch .. //depot/user/zec/forwarding/sys/fs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/user/zec/forwarding/sys/fs/coda/coda_vfsops.c#2 integrate .. //depot/user/zec/forwarding/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/user/zec/forwarding/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/user/zec/forwarding/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/user/zec/forwarding/sys/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/user/zec/forwarding/sys/fs/msdosfs/denode.h#2 integrate .. //depot/user/zec/forwarding/sys/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/user/zec/forwarding/sys/fs/msdosfs/msdosfs_fat.c#3 integrate .. //depot/user/zec/forwarding/sys/fs/msdosfs/msdosfs_lookup.c#2 integrate .. //depot/user/zec/forwarding/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/user/zec/forwarding/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/user/zec/forwarding/sys/fs/ntfs/ntfs_ihash.c#2 integrate .. //depot/user/zec/forwarding/sys/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/user/zec/forwarding/sys/fs/nullfs/null_subr.c#2 integrate .. //depot/user/zec/forwarding/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/user/zec/forwarding/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/user/zec/forwarding/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/user/zec/forwarding/sys/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/user/zec/forwarding/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/user/zec/forwarding/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/user/zec/forwarding/sys/fs/tmpfs/tmpfs.h#2 integrate .. //depot/user/zec/forwarding/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/user/zec/forwarding/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate .. //depot/user/zec/forwarding/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/user/zec/forwarding/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/user/zec/forwarding/sys/fs/unionfs/union.h#2 integrate .. //depot/user/zec/forwarding/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/user/zec/forwarding/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/user/zec/forwarding/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/user/zec/forwarding/sys/geom/bde/g_bde.c#2 integrate .. //depot/user/zec/forwarding/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/user/zec/forwarding/sys/geom/eli/g_eli.c#2 integrate .. //depot/user/zec/forwarding/sys/geom/eli/g_eli_crypto.c#2 integrate .. //depot/user/zec/forwarding/sys/geom/geom_io.c#2 integrate .. //depot/user/zec/forwarding/sys/geom/journal/g_journal.c#2 integrate .. //depot/user/zec/forwarding/sys/geom/label/g_label_reiserfs.c#2 integrate .. //depot/user/zec/forwarding/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/user/zec/forwarding/sys/geom/multipath/g_multipath.c#2 integrate .. //depot/user/zec/forwarding/sys/geom/part/g_part.c#2 integrate .. //depot/user/zec/forwarding/sys/geom/part/g_part.h#2 integrate .. //depot/user/zec/forwarding/sys/geom/part/g_part_apm.c#2 integrate .. //depot/user/zec/forwarding/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/user/zec/forwarding/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/user/zec/forwarding/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/user/zec/forwarding/sys/geom/vinum/geom_vinum_init.c#2 integrate .. //depot/user/zec/forwarding/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/user/zec/forwarding/sys/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/user/zec/forwarding/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/user/zec/forwarding/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/user/zec/forwarding/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#2 integrate .. //depot/user/zec/forwarding/sys/i386/bios/apm.c#2 integrate .. //depot/user/zec/forwarding/sys/i386/conf/DEFAULTS#2 integrate .. //depot/user/zec/forwarding/sys/i386/conf/GENERIC#3 integrate .. //depot/user/zec/forwarding/sys/i386/conf/GENERIC.hints#2 integrate .. //depot/user/zec/forwarding/sys/i386/conf/NOTES#2 integrate .. //depot/user/zec/forwarding/sys/i386/conf/PAE#2 integrate .. //depot/user/zec/forwarding/sys/i386/conf/XBOX#2 integrate .. //depot/user/zec/forwarding/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/i386/i386/genassym.c#3 integrate .. //depot/user/zec/forwarding/sys/i386/i386/in_cksum.c#2 integrate .. //depot/user/zec/forwarding/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/i386/i386/locore.s#2 integrate .. //depot/user/zec/forwarding/sys/i386/i386/machdep.c#3 integrate .. //depot/user/zec/forwarding/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/i386/i386/msi.c#2 integrate .. //depot/user/zec/forwarding/sys/i386/i386/pmap.c#2 integrate .. //depot/user/zec/forwarding/sys/i386/i386/trap.c#2 integrate .. //depot/user/zec/forwarding/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/user/zec/forwarding/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/user/zec/forwarding/sys/i386/include/bootinfo.h#2 integrate .. //depot/user/zec/forwarding/sys/i386/include/clock.h#2 integrate .. //depot/user/zec/forwarding/sys/i386/include/in_cksum.h#2 integrate .. //depot/user/zec/forwarding/sys/i386/include/pc/bios.h#2 integrate .. //depot/user/zec/forwarding/sys/i386/include/pmap.h#2 integrate .. //depot/user/zec/forwarding/sys/i386/isa/clock.c#2 integrate .. //depot/user/zec/forwarding/sys/i386/isa/prof_machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/i386/linux/imgact_linux.c#2 integrate .. //depot/user/zec/forwarding/sys/i386/linux/linux_machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/user/zec/forwarding/sys/i4b/layer1/isic/i4b_avm_a1.c#2 integrate .. //depot/user/zec/forwarding/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#2 integrate .. //depot/user/zec/forwarding/sys/i4b/layer1/isic/i4b_isic.c#2 integrate .. //depot/user/zec/forwarding/sys/i4b/layer1/isic/i4b_itk_ix1.c#2 integrate .. //depot/user/zec/forwarding/sys/i4b/layer1/isic/i4b_tel_s016.c#2 integrate .. //depot/user/zec/forwarding/sys/i4b/layer1/isic/i4b_tel_s0163.c#2 integrate .. //depot/user/zec/forwarding/sys/i4b/layer1/isic/i4b_tel_s08.c#2 integrate .. //depot/user/zec/forwarding/sys/ia64/disasm/disasm.h#2 integrate .. //depot/user/zec/forwarding/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/ia64/ia64/db_machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/ia64/ia64/exception.S#2 integrate .. //depot/user/zec/forwarding/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/user/zec/forwarding/sys/ia64/ia64/machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/ia64/ia64/pmap.c#2 integrate .. //depot/user/zec/forwarding/sys/ia64/ia64/support.S#2 integrate .. //depot/user/zec/forwarding/sys/ia64/ia64/trap.c#2 integrate .. //depot/user/zec/forwarding/sys/ia64/ia64/vm_machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/ia64/include/atomic.h#2 integrate .. //depot/user/zec/forwarding/sys/kern/imgact_aout.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/imgact_elf.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/imgact_gzip.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/init_main.c#3 integrate .. //depot/user/zec/forwarding/sys/kern/kern_acct.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/kern_alq.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/kern_clock.c#3 integrate .. //depot/user/zec/forwarding/sys/kern/kern_cpu.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/kern_environment.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/kern_exec.c#3 integrate .. //depot/user/zec/forwarding/sys/kern/kern_exit.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/kern_fork.c#3 integrate .. //depot/user/zec/forwarding/sys/kern/kern_idle.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/kern_intr.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/kern_jail.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/kern_kse.c#3 integrate .. //depot/user/zec/forwarding/sys/kern/kern_kthread.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/kern_ktrace.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/kern_linker.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/kern_lock.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/kern_mbuf.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/kern_mutex.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/kern_proc.c#3 integrate .. //depot/user/zec/forwarding/sys/kern/kern_prot.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/kern_rmlock.c#1 branch .. //depot/user/zec/forwarding/sys/kern/kern_rwlock.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/kern_shutdown.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/kern_sig.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/kern_switch.c#3 integrate .. //depot/user/zec/forwarding/sys/kern/kern_sx.c#3 integrate .. //depot/user/zec/forwarding/sys/kern/kern_synch.c#3 integrate .. //depot/user/zec/forwarding/sys/kern/kern_sysctl.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/kern_thr.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/kern_thread.c#3 integrate .. //depot/user/zec/forwarding/sys/kern/kern_timeout.c#3 integrate .. //depot/user/zec/forwarding/sys/kern/kern_umtx.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/link_elf.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/link_elf_obj.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/linker_if.m#2 integrate .. //depot/user/zec/forwarding/sys/kern/p1003_1b.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/sched_4bsd.c#3 integrate .. //depot/user/zec/forwarding/sys/kern/sched_ule.c#3 integrate .. //depot/user/zec/forwarding/sys/kern/subr_bus.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/subr_lock.c#3 integrate .. //depot/user/zec/forwarding/sys/kern/subr_param.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/subr_pcpu.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/user/zec/forwarding/sys/kern/subr_smp.c#3 integrate .. //depot/user/zec/forwarding/sys/kern/subr_stack.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/subr_taskqueue.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/subr_trap.c#3 integrate .. //depot/user/zec/forwarding/sys/kern/subr_turnstile.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/subr_witness.c#3 integrate .. //depot/user/zec/forwarding/sys/kern/sys_generic.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/sys_pipe.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/sys_process.c#3 integrate .. //depot/user/zec/forwarding/sys/kern/sys_socket.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/syscalls.master#2 integrate .. //depot/user/zec/forwarding/sys/kern/sysv_msg.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/sysv_sem.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/sysv_shm.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/tty_pty.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/uipc_mbuf.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/uipc_mbuf2.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/uipc_sem.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/uipc_socket.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/uipc_syscalls.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/uipc_usrreq.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/vfs_acl.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/vfs_aio.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/vfs_bio.c#3 integrate .. //depot/user/zec/forwarding/sys/kern/vfs_cache.c#3 integrate .. //depot/user/zec/forwarding/sys/kern/vfs_extattr.c#2 integrate .. //depot/user/zec/forwarding/sys/kern/vfs_lookup.c#3 integrate .. //depot/user/zec/forwarding/sys/kern/vfs_mount.c#3 integrate .. //depot/user/zec/forwarding/sys/kern/vfs_subr.c#3 integrate .. //depot/user/zec/forwarding/sys/kern/vfs_syscalls.c#3 integrate .. //depot/user/zec/forwarding/sys/kern/vfs_vnops.c#2 integrate .. //depot/user/zec/forwarding/sys/libkern/arm/ffs.S#2 integrate .. //depot/user/zec/forwarding/sys/modules/Makefile#3 integrate .. //depot/user/zec/forwarding/sys/modules/agp/Makefile#2 integrate .. //depot/user/zec/forwarding/sys/modules/asmc/Makefile#1 branch .. //depot/user/zec/forwarding/sys/modules/geom/Makefile#2 integrate .. //depot/user/zec/forwarding/sys/modules/nvram/Makefile#1 branch .. //depot/user/zec/forwarding/sys/modules/nxge/Makefile#2 integrate .. //depot/user/zec/forwarding/sys/modules/uchcom/Makefile#1 branch .. //depot/user/zec/forwarding/sys/modules/wpi/Makefile#1 branch .. //depot/user/zec/forwarding/sys/modules/wpifw/Makefile#1 branch .. //depot/user/zec/forwarding/sys/modules/zfs/Makefile#2 integrate .. //depot/user/zec/forwarding/sys/net/bpf.c#3 integrate .. //depot/user/zec/forwarding/sys/net/bpf.h#2 integrate .. //depot/user/zec/forwarding/sys/net/bsd_comp.c#2 integrate .. //depot/user/zec/forwarding/sys/net/ethernet.h#2 integrate .. //depot/user/zec/forwarding/sys/net/ieee8023ad_lacp.c#2 integrate .. //depot/user/zec/forwarding/sys/net/if.c#2 integrate .. //depot/user/zec/forwarding/sys/net/if_atmsubr.c#2 integrate .. //depot/user/zec/forwarding/sys/net/if_bridge.c#3 integrate .. //depot/user/zec/forwarding/sys/net/if_bridgevar.h#2 integrate .. //depot/user/zec/forwarding/sys/net/if_disc.c#2 integrate .. //depot/user/zec/forwarding/sys/net/if_enc.c#2 integrate .. //depot/user/zec/forwarding/sys/net/if_ethersubr.c#3 integrate .. //depot/user/zec/forwarding/sys/net/if_fddisubr.c#2 integrate .. //depot/user/zec/forwarding/sys/net/if_fwsubr.c#2 integrate .. //depot/user/zec/forwarding/sys/net/if_gif.c#2 integrate .. //depot/user/zec/forwarding/sys/net/if_iso88025subr.c#2 integrate .. //depot/user/zec/forwarding/sys/net/if_lagg.c#2 integrate .. //depot/user/zec/forwarding/sys/net/if_lagg.h#2 integrate .. //depot/user/zec/forwarding/sys/net/if_loop.c#2 integrate .. //depot/user/zec/forwarding/sys/net/if_ppp.c#2 integrate .. //depot/user/zec/forwarding/sys/net/if_stf.c#3 integrate .. //depot/user/zec/forwarding/sys/net/if_tun.c#2 integrate .. //depot/user/zec/forwarding/sys/net/if_vlan.c#2 integrate .. //depot/user/zec/forwarding/sys/net/pfil.c#2 integrate .. //depot/user/zec/forwarding/sys/net/pfil.h#2 integrate .. //depot/user/zec/forwarding/sys/net/route.c#3 integrate .. //depot/user/zec/forwarding/sys/net80211/ieee80211.c#3 integrate .. //depot/user/zec/forwarding/sys/net80211/ieee80211.h#2 integrate .. //depot/user/zec/forwarding/sys/net80211/ieee80211_freebsd.c#2 integrate .. //depot/user/zec/forwarding/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/user/zec/forwarding/sys/net80211/ieee80211_ht.c#3 integrate .. //depot/user/zec/forwarding/sys/net80211/ieee80211_ht.h#3 integrate .. //depot/user/zec/forwarding/sys/net80211/ieee80211_input.c#2 integrate .. //depot/user/zec/forwarding/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/user/zec/forwarding/sys/net80211/ieee80211_ioctl.h#3 integrate .. //depot/user/zec/forwarding/sys/net80211/ieee80211_node.c#3 integrate .. //depot/user/zec/forwarding/sys/net80211/ieee80211_node.h#3 integrate .. //depot/user/zec/forwarding/sys/net80211/ieee80211_output.c#3 integrate .. //depot/user/zec/forwarding/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/user/zec/forwarding/sys/net80211/ieee80211_proto.h#3 integrate .. //depot/user/zec/forwarding/sys/net80211/ieee80211_scan.c#2 integrate .. //depot/user/zec/forwarding/sys/net80211/ieee80211_scan_ap.c#2 integrate .. //depot/user/zec/forwarding/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/user/zec/forwarding/sys/net80211/ieee80211_var.h#3 integrate .. //depot/user/zec/forwarding/sys/netatalk/aarp.c#2 integrate .. //depot/user/zec/forwarding/sys/netatalk/ddp_input.c#2 integrate .. //depot/user/zec/forwarding/sys/netatalk/ddp_output.c#2 integrate .. //depot/user/zec/forwarding/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/user/zec/forwarding/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/user/zec/forwarding/sys/netgraph/netgraph.h#2 integrate .. //depot/user/zec/forwarding/sys/netgraph/ng_base.c#2 integrate .. //depot/user/zec/forwarding/sys/netgraph/ng_cisco.c#2 integrate .. //depot/user/zec/forwarding/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/user/zec/forwarding/sys/netgraph/ng_pppoe.c#3 integrate .. //depot/user/zec/forwarding/sys/netgraph/ng_socket.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/accf_data.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/accf_http.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/if_ether.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/igmp.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/in.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/in_cksum.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/in_gif.c#3 integrate .. //depot/user/zec/forwarding/sys/netinet/in_pcb.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/in_proto.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/in_rmx.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/ip.h#2 integrate .. //depot/user/zec/forwarding/sys/netinet/ip_carp.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/ip_divert.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/ip_dummynet.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/ip_dummynet.h#2 integrate .. //depot/user/zec/forwarding/sys/netinet/ip_ecn.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/ip_encap.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/ip_fastfwd.c#3 integrate .. //depot/user/zec/forwarding/sys/netinet/ip_fw2.c#3 integrate .. //depot/user/zec/forwarding/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/ip_gre.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/ip_icmp.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/ip_id.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/ip_input.c#3 integrate .. //depot/user/zec/forwarding/sys/netinet/ip_ipsec.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/ip_mroute.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/ip_options.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/ip_output.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/libalias/alias_util.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/raw_ip.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/sctp_bsd_addr.c#3 integrate .. //depot/user/zec/forwarding/sys/netinet/sctp_constants.h#3 integrate .. //depot/user/zec/forwarding/sys/netinet/sctp_indata.c#3 integrate .. //depot/user/zec/forwarding/sys/netinet/sctp_input.c#3 integrate .. //depot/user/zec/forwarding/sys/netinet/sctp_output.c#3 integrate .. //depot/user/zec/forwarding/sys/netinet/sctp_pcb.c#3 integrate .. //depot/user/zec/forwarding/sys/netinet/sctp_pcb.h#3 integrate .. //depot/user/zec/forwarding/sys/netinet/sctp_structs.h#3 integrate .. //depot/user/zec/forwarding/sys/netinet/sctp_timer.c#3 integrate .. //depot/user/zec/forwarding/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/user/zec/forwarding/sys/netinet/sctp_var.h#3 integrate .. //depot/user/zec/forwarding/sys/netinet/sctputil.c#3 integrate .. //depot/user/zec/forwarding/sys/netinet/sctputil.h#3 integrate .. //depot/user/zec/forwarding/sys/netinet/tcp_debug.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/tcp_input.c#3 integrate .. //depot/user/zec/forwarding/sys/netinet/tcp_output.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/tcp_reass.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/tcp_subr.c#3 integrate .. //depot/user/zec/forwarding/sys/netinet/tcp_syncache.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/tcp_timer.c#3 integrate .. //depot/user/zec/forwarding/sys/netinet/tcp_timewait.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/user/zec/forwarding/sys/netinet/udp_usrreq.c#3 integrate .. //depot/user/zec/forwarding/sys/netinet6/ip6_output.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet6/nd6.c#2 integrate .. //depot/user/zec/forwarding/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/user/zec/forwarding/sys/netipsec/ipsec.c#2 integrate .. //depot/user/zec/forwarding/sys/netipsec/ipsec.h#2 integrate .. //depot/user/zec/forwarding/sys/netipsec/ipsec_input.c#3 integrate .. //depot/user/zec/forwarding/sys/netipsec/ipsec_output.c#2 integrate .. //depot/user/zec/forwarding/sys/netipsec/keysock.c#2 integrate .. //depot/user/zec/forwarding/sys/netipsec/xform.h#2 integrate .. //depot/user/zec/forwarding/sys/netipsec/xform_ipip.c#2 integrate .. //depot/user/zec/forwarding/sys/netsmb/smb_iod.c#2 integrate .. //depot/user/zec/forwarding/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/user/zec/forwarding/sys/nfsclient/nfs.h#2 integrate .. //depot/user/zec/forwarding/sys/nfsclient/nfs_nfsiod.c#3 integrate .. //depot/user/zec/forwarding/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/user/zec/forwarding/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/user/zec/forwarding/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/user/zec/forwarding/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/user/zec/forwarding/sys/nfsclient/nfsmount.h#2 integrate .. //depot/user/zec/forwarding/sys/nfsserver/nfs.h#2 integrate .. //depot/user/zec/forwarding/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/user/zec/forwarding/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/user/zec/forwarding/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/user/zec/forwarding/sys/nfsserver/nfs_syscalls.c#2 integrate .. //depot/user/zec/forwarding/sys/opencrypto/crypto.c#2 integrate .. //depot/user/zec/forwarding/sys/opencrypto/cryptodev.c#2 integrate .. //depot/user/zec/forwarding/sys/pc98/cbus/sio.c#2 integrate .. //depot/user/zec/forwarding/sys/pc98/conf/GENERIC#3 integrate .. //depot/user/zec/forwarding/sys/pc98/pc98/machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/pci/agp.c#2 delete .. //depot/user/zec/forwarding/sys/pci/agp_ali.c#2 delete .. //depot/user/zec/forwarding/sys/pci/agp_amd.c#2 delete .. //depot/user/zec/forwarding/sys/pci/agp_amd64.c#2 delete .. //depot/user/zec/forwarding/sys/pci/agp_ati.c#2 delete .. //depot/user/zec/forwarding/sys/pci/agp_i810.c#3 delete .. //depot/user/zec/forwarding/sys/pci/agp_if.m#2 delete .. //depot/user/zec/forwarding/sys/pci/agp_intel.c#2 delete .. //depot/user/zec/forwarding/sys/pci/agp_nvidia.c#2 delete .. //depot/user/zec/forwarding/sys/pci/agp_sis.c#2 delete .. //depot/user/zec/forwarding/sys/pci/agp_via.c#3 delete .. //depot/user/zec/forwarding/sys/pci/agppriv.h#2 delete .. //depot/user/zec/forwarding/sys/pci/agpreg.h#2 delete .. //depot/user/zec/forwarding/sys/pci/agpvar.h#2 delete .. //depot/user/zec/forwarding/sys/pci/if_rl.c#2 integrate .. //depot/user/zec/forwarding/sys/pci/if_rlreg.h#2 integrate .. //depot/user/zec/forwarding/sys/pci/if_sf.c#2 integrate .. //depot/user/zec/forwarding/sys/pci/if_ste.c#2 integrate .. //depot/user/zec/forwarding/sys/pci/if_vr.c#2 integrate .. //depot/user/zec/forwarding/sys/pci/if_wb.c#2 integrate .. //depot/user/zec/forwarding/sys/pci/if_xl.c#2 integrate .. //depot/user/zec/forwarding/sys/pci/intpm.c#2 integrate .. //depot/user/zec/forwarding/sys/pci/nfsmb.c#2 integrate .. //depot/user/zec/forwarding/sys/pci/xrpu.c#2 delete .. //depot/user/zec/forwarding/sys/powerpc/conf/GENERIC#3 integrate .. //depot/user/zec/forwarding/sys/powerpc/include/atomic.h#2 integrate .. //depot/user/zec/forwarding/sys/powerpc/include/md_var.h#2 integrate .. //depot/user/zec/forwarding/sys/powerpc/powerpc/clock.c#2 integrate .. //depot/user/zec/forwarding/sys/powerpc/powerpc/genassym.c#2 integrate .. //depot/user/zec/forwarding/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/user/zec/forwarding/sys/powerpc/powerpc/mmu_oea.c#2 integrate .. //depot/user/zec/forwarding/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/user/zec/forwarding/sys/powerpc/powerpc/swtch.S#2 integrate .. //depot/user/zec/forwarding/sys/powerpc/powerpc/trap.c#2 integrate .. //depot/user/zec/forwarding/sys/powerpc/powerpc/vm_machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/security/audit/audit.c#2 integrate .. //depot/user/zec/forwarding/sys/security/audit/audit.h#2 integrate .. //depot/user/zec/forwarding/sys/security/audit/audit_bsm.c#2 integrate .. //depot/user/zec/forwarding/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/user/zec/forwarding/sys/security/audit/audit_pipe.c#2 integrate .. //depot/user/zec/forwarding/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/user/zec/forwarding/sys/security/audit/audit_worker.c#2 integrate .. //depot/user/zec/forwarding/sys/security/mac/mac_atalk.c#1 branch .. //depot/user/zec/forwarding/sys/security/mac/mac_audit.c#2 integrate .. //depot/user/zec/forwarding/sys/security/mac/mac_framework.h#3 integrate .. //depot/user/zec/forwarding/sys/security/mac/mac_inet.c#2 integrate .. //depot/user/zec/forwarding/sys/security/mac/mac_inet6.c#1 branch .. //depot/user/zec/forwarding/sys/security/mac/mac_internal.h#2 integrate .. //depot/user/zec/forwarding/sys/security/mac/mac_net.c#2 integrate .. //depot/user/zec/forwarding/sys/security/mac/mac_pipe.c#2 integrate .. //depot/user/zec/forwarding/sys/security/mac/mac_policy.h#3 integrate .. //depot/user/zec/forwarding/sys/security/mac/mac_posix_sem.c#2 integrate .. //depot/user/zec/forwarding/sys/security/mac/mac_process.c#2 integrate .. //depot/user/zec/forwarding/sys/security/mac/mac_socket.c#2 integrate .. //depot/user/zec/forwarding/sys/security/mac/mac_syscalls.c#2 integrate .. //depot/user/zec/forwarding/sys/security/mac/mac_system.c#2 integrate .. //depot/user/zec/forwarding/sys/security/mac/mac_sysv_msg.c#2 integrate .. //depot/user/zec/forwarding/sys/security/mac/mac_sysv_sem.c#2 integrate .. //depot/user/zec/forwarding/sys/security/mac/mac_sysv_shm.c#2 integrate .. //depot/user/zec/forwarding/sys/security/mac/mac_vfs.c#3 integrate .. //depot/user/zec/forwarding/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/user/zec/forwarding/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/user/zec/forwarding/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/user/zec/forwarding/sys/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/user/zec/forwarding/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/user/zec/forwarding/sys/security/mac_none/mac_none.c#2 integrate .. //depot/user/zec/forwarding/sys/security/mac_partition/mac_partition.c#2 integrate .. //depot/user/zec/forwarding/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/user/zec/forwarding/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/user/zec/forwarding/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/user/zec/forwarding/sys/security/mac_test/mac_test.c#3 integrate .. //depot/user/zec/forwarding/sys/sparc64/conf/DEFAULTS#2 integrate .. //depot/user/zec/forwarding/sys/sparc64/conf/GENERIC#3 integrate .. //depot/user/zec/forwarding/sys/sparc64/isa/isa.c#2 integrate .. //depot/user/zec/forwarding/sys/sparc64/pci/ofw_pcibus.c#3 integrate .. //depot/user/zec/forwarding/sys/sparc64/pci/psycho.c#3 integrate .. //depot/user/zec/forwarding/sys/sparc64/pci/psychovar.h#2 integrate .. //depot/user/zec/forwarding/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/sparc64/sparc64/intr_machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/user/zec/forwarding/sys/sparc64/sparc64/vm_machdep.c#3 integrate .. //depot/user/zec/forwarding/sys/sun4v/conf/GENERIC#3 integrate .. //depot/user/zec/forwarding/sys/sun4v/include/pcpu.h#2 integrate .. //depot/user/zec/forwarding/sys/sun4v/include/stdarg.h#2 integrate .. //depot/user/zec/forwarding/sys/sun4v/sun4v/machdep.c#2 integrate .. //depot/user/zec/forwarding/sys/sun4v/sun4v/pmap.c#2 integrate .. //depot/user/zec/forwarding/sys/sun4v/sun4v/simdisk.c#2 integrate .. //depot/user/zec/forwarding/sys/sun4v/sun4v/trap.c#2 integrate .. //depot/user/zec/forwarding/sys/sun4v/sun4v/vm_machdep.c#3 integrate .. //depot/user/zec/forwarding/sys/sys/_elf_solaris.h#2 delete .. //depot/user/zec/forwarding/sys/sys/_rmlock.h#1 branch .. //depot/user/zec/forwarding/sys/sys/apm.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/ata.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/callout.h#3 integrate .. //depot/user/zec/forwarding/sys/sys/elf.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/elf_common.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/eventhandler.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/gpt.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/kernel.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/kthread.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/linker.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/lock.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/lockmgr.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/malloc.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/mbuf.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/mutex.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/param.h#3 integrate .. //depot/user/zec/forwarding/sys/sys/pciio.h#3 integrate .. //depot/user/zec/forwarding/sys/sys/pcpu.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/priv.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/proc.h#3 integrate .. //depot/user/zec/forwarding/sys/sys/resource.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/rmlock.h#1 branch .. //depot/user/zec/forwarding/sys/sys/signal.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/signalvar.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/smp.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/stack.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/stat.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/sysctl.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/systm.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/time.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/types.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/umtx.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/vnode.h#2 integrate .. //depot/user/zec/forwarding/sys/sys/xrpuio.h#2 delete .. //depot/user/zec/forwarding/sys/ufs/ffs/ffs_alloc.c#3 integrate .. //depot/user/zec/forwarding/sys/ufs/ffs/ffs_balloc.c#2 integrate .. //depot/user/zec/forwarding/sys/ufs/ffs/ffs_inode.c#2 integrate .. //depot/user/zec/forwarding/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/user/zec/forwarding/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/user/zec/forwarding/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/user/zec/forwarding/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/user/zec/forwarding/sys/ufs/ufs/ufs_bmap.c#2 integrate .. //depot/user/zec/forwarding/sys/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/user/zec/forwarding/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/user/zec/forwarding/sys/vm/phys_pager.c#2 integrate .. //depot/user/zec/forwarding/sys/vm/pmap.h#2 integrate .. //depot/user/zec/forwarding/sys/vm/redzone.c#2 integrate .. //depot/user/zec/forwarding/sys/vm/swap_pager.c#2 integrate .. //depot/user/zec/forwarding/sys/vm/uma_core.c#2 integrate .. //depot/user/zec/forwarding/sys/vm/vm_contig.c#3 integrate .. //depot/user/zec/forwarding/sys/vm/vm_extern.h#2 integrate .. //depot/user/zec/forwarding/sys/vm/vm_fault.c#3 integrate .. //depot/user/zec/forwarding/sys/vm/vm_glue.c#3 integrate .. //depot/user/zec/forwarding/sys/vm/vm_kern.c#2 integrate .. //depot/user/zec/forwarding/sys/vm/vm_map.c#3 integrate .. //depot/user/zec/forwarding/sys/vm/vm_map.h#2 integrate .. //depot/user/zec/forwarding/sys/vm/vm_mmap.c#2 integrate .. //depot/user/zec/forwarding/sys/vm/vm_object.c#3 integrate .. //depot/user/zec/forwarding/sys/vm/vm_page.c#3 integrate .. //depot/user/zec/forwarding/sys/vm/vm_pageout.c#3 integrate .. //depot/user/zec/forwarding/sys/vm/vm_pageout.h#2 integrate .. //depot/user/zec/forwarding/sys/vm/vm_param.h#2 integrate .. //depot/user/zec/forwarding/sys/vm/vm_zeroidle.c#2 integrate .. //depot/user/zec/forwarding/sys/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/vimage/src/sys/dev/iwi/if_iwi.c#7 (text+ko) ==== @@ -35,6 +35,8 @@ * http://www.intel.com/network/connectivity/products/wireless/prowireless_mobile.htm */ +#include "opt_vimage.h" + #include #include #include @@ -55,6 +57,7 @@ #include #include #include +#include #include #include @@ -193,6 +196,7 @@ static int iwi_probe(device_t); static int iwi_attach(device_t); static int iwi_detach(device_t); +static void iwi_reassign(struct ifnet *, struct vnet *, char *); static int iwi_shutdown(device_t); static int iwi_suspend(device_t); static int iwi_resume(device_t); @@ -407,6 +411,9 @@ ieee80211_ifattach(ic); ic->ic_bmissthreshold = 10; /* override default */ /* override default methods */ +#ifdef VIMAGE + ifp->if_reassign = iwi_reassign; +#endif ic->ic_node_alloc = iwi_node_alloc; sc->sc_node_free = ic->ic_node_free; ic->ic_node_free = iwi_node_free; @@ -505,6 +512,28 @@ return 0; } +#ifdef VIMAGE +static void +iwi_reassign(struct ifnet *ifp, struct vnet *vnet, char *dname) +{ + struct iwi_softc *sc = ifp->if_softc; + struct ieee80211com *ic = &sc->sc_ic; + IWI_LOCK_DECL; + + IWI_LOCK(sc); + bpfdetach(ifp); + sc->sc_drvbpf = NULL; + ieee80211_reassign(ic, vnet, dname); + + CURVNET_SET_QUIET(vnet); + bpfattach2(ifp, DLT_IEEE802_11_RADIO, + sizeof (struct ieee80211_frame) + sizeof (sc->sc_txtap), + &sc->sc_drvbpf); + CURVNET_RESTORE(); + IWI_UNLOCK(sc); +} +#endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 2 11:18:07 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CECB716A468; Sun, 2 Dec 2007 11:18: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 6DBBA16A420 for ; Sun, 2 Dec 2007 11:18:06 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5DDD213C461 for ; Sun, 2 Dec 2007 11:18:06 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2BI6UW043498 for ; Sun, 2 Dec 2007 11:18:06 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB2BI6bs043495 for perforce@freebsd.org; Sun, 2 Dec 2007 11:18:06 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 11:18:06 GMT Message-Id: <200712021118.lB2BI6bs043495@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 129995 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 11:18:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=129995 Change 129995 by hselasky@hselasky_laptop001 on 2007/12/02 11:17:39 Typedefs should end by "_t". That makes the styling job easier, hence a full C-parse will then not be needed to understand whether an identifier is a type or not. [ -f src/$F ] && (cat src/$F | sed -e "s/usbd_status/usbd_status_t/g" > temp ) && ((diff -u src/$F temp) || (cat temp > src/$F)) Affected files ... .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#24 edit .. //depot/projects/usb/src/sys/dev/usb/README#23 edit .. //depot/projects/usb/src/sys/dev/usb/ehci.c#55 edit .. //depot/projects/usb/src/sys/dev/usb/ehci.h#24 edit .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#37 edit .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#38 edit .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#33 edit .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#35 edit .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#33 edit .. //depot/projects/usb/src/sys/dev/usb/if_rum.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#34 edit .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#41 edit .. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#23 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.c#45 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.h#20 edit .. //depot/projects/usb/src/sys/dev/usb/uark.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#30 edit .. //depot/projects/usb/src/sys/dev/usb/ubser.c#22 edit .. //depot/projects/usb/src/sys/dev/usb/ucycom.c#24 edit .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#30 edit .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#27 edit .. //depot/projects/usb/src/sys/dev/usb/ugen.c#29 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.c#48 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.h#20 edit .. //depot/projects/usb/src/sys/dev/usb/uhub.c#22 edit .. //depot/projects/usb/src/sys/dev/usb/uipaq.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#30 edit .. //depot/projects/usb/src/sys/dev/usb/umass.c#35 edit .. //depot/projects/usb/src/sys/dev/usb/umct.c#24 edit .. //depot/projects/usb/src/sys/dev/usb/umodem.c#33 edit .. //depot/projects/usb/src/sys/dev/usb/umoscom.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#31 edit .. //depot/projects/usb/src/sys/dev/usb/usb.c#24 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hid.h#10 edit .. //depot/projects/usb/src/sys/dev/usb/usb_requests.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#62 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#64 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#59 edit .. //depot/projects/usb/src/sys/dev/usb/uvisor.c#27 edit .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#30 edit Differences ... ==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#24 (text+ko) ==== @@ -408,7 +408,7 @@ static uint16_t uaudio_mixer_get(struct usbd_device *udev, uint8_t what, struct uaudio_mixer_node *mc); -static usbd_status +static usbd_status_t uaudio_set_speed(struct usbd_device *udev, uint8_t endpt, uint32_t speed); static int @@ -1354,7 +1354,7 @@ uint8_t endpoint; uint8_t iface_index; uint8_t alt_index; - usbd_status err; + usbd_status_t err; ch->buf = malloc(sc->sc_buffer_size, M_DEVBUF, M_WAITOK | M_ZERO); @@ -2949,7 +2949,7 @@ uint16_t val; uint16_t len = MIX_SIZE(mc->type); uint8_t data[4]; - usbd_status err; + usbd_status_t err; if (mc->wValue[0] == -1) { return (0); @@ -3057,7 +3057,7 @@ } } -static usbd_status +static usbd_status_t uaudio_set_speed(struct usbd_device *udev, uint8_t endpt, uint32_t speed) { usb_device_request_t req; ==== //depot/projects/usb/src/sys/dev/usb/README#23 (text+ko) ==== @@ -130,7 +130,7 @@ /*------------------------------------------------------------------------* - * usbd_status + * usbd_status_t * usbd_transfer_setup(udev, iface_index, pxfer, setup_start, * n_setup, priv_sc, priv_mtx) *------------------------------------------------------------------------*/ ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#55 (text+ko) ==== @@ -156,7 +156,7 @@ return; } -usbd_status +usbd_status_t ehci_init(ehci_softc_t *sc) { struct usbd_page_search buf_res; @@ -168,7 +168,7 @@ uint16_t x; uint16_t y; uint16_t bit; - usbd_status err = 0; + usbd_status_t err = 0; mtx_lock(&sc->sc_bus.mtx); @@ -1093,7 +1093,7 @@ return (last); } -static usbd_status +static usbd_status_t ehci_non_isoc_done_sub(struct usbd_xfer *xfer) { ehci_qtd_t *td; @@ -1190,12 +1190,12 @@ } static void - ehci_device_done(struct usbd_xfer *xfer, usbd_status error); + ehci_device_done(struct usbd_xfer *xfer, usbd_status_t error); static void ehci_non_isoc_done(struct usbd_xfer *xfer) { - usbd_status err = 0; + usbd_status_t err = 0; DPRINTFN(12, ("xfer=%p pipe=%p transfer done\n", xfer, xfer->pipe)); @@ -2146,7 +2146,7 @@ * from close and from interrupt */ static void -ehci_device_done(struct usbd_xfer *xfer, usbd_status error) +ehci_device_done(struct usbd_xfer *xfer, usbd_status_t error) { struct usbd_pipe_methods *methods = xfer->pipe->methods; ehci_softc_t *sc = xfer->usb_sc; ==== //depot/projects/usb/src/sys/dev/usb/ehci.h#24 (text+ko) ==== @@ -503,7 +503,7 @@ usbd_bus_mem_cb_t ehci_iterate_hw_softc; -usbd_status ehci_init(ehci_softc_t *sc); +usbd_status_t ehci_init(ehci_softc_t *sc); void ehci_detach(struct ehci_softc *sc); void ehci_suspend(struct ehci_softc *sc); void ehci_resume(struct ehci_softc *sc); ==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#37 (text+ko) ==== @@ -379,7 +379,7 @@ void *data) { uint16_t length; - usbd_status err; + usbd_status_t err; if (usbd_config_td_is_gone(&(sc->sc_config_td))) { goto error; ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#38 (text+ko) ==== @@ -331,7 +331,7 @@ uint16_t val, void *buf) { usb_device_request_t req; - usbd_status err; + usbd_status_t err; uint16_t length = AXE_CMD_LEN(cmd); req.bmRequestType = (AXE_CMD_IS_WRITE(cmd) ? @@ -580,7 +580,7 @@ static void axe_cfg_reset(struct axe_softc *sc) { - usbd_status err; + usbd_status_t err; err = usbreq_set_config(sc->sc_udev, &(sc->sc_mtx), AXE_CONFIG_NO); ==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#33 (text+ko) ==== @@ -232,7 +232,7 @@ void *data) { uint16_t length; - usbd_status err; + usbd_status_t err; if (usbd_config_td_is_gone(&(sc->sc_config_td))) { goto error; ==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#35 (text+ko) ==== @@ -274,7 +274,7 @@ void *data) { uint16_t length; - usbd_status err; + usbd_status_t err; if (usbd_config_td_is_gone(&(sc->sc_config_td))) { goto error; @@ -453,7 +453,7 @@ static void kue_cfg_reset(struct kue_softc *sc) { - usbd_status err; + usbd_status_t err; err = usbreq_set_config(sc->sc_udev, &(sc->sc_mtx), KUE_CONFIG_NO); ==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#33 (text+ko) ==== @@ -311,7 +311,7 @@ void *data) { uint16_t length; - usbd_status err; + usbd_status_t err; if (usbd_config_td_is_gone(&(sc->sc_config_td))) { goto error; @@ -633,7 +633,7 @@ static void rue_cfg_reset(struct rue_softc *sc) { - usbd_status err; + usbd_status_t err; uint16_t to; rue_cfg_csr_write_1(sc, RUE_CR, RUE_CR_SOFT_RST); ==== //depot/projects/usb/src/sys/dev/usb/if_rum.c#17 (text+ko) ==== @@ -554,7 +554,7 @@ void *data) { uint16_t length; - usbd_status err; + usbd_status_t err; repeat: ==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#34 (text+ko) ==== @@ -489,7 +489,7 @@ void *data) { uint16_t length; - usbd_status err; + usbd_status_t err; if (usbd_config_td_is_gone(&(sc->sc_config_td))) { goto error; @@ -711,7 +711,7 @@ static void udav_cfg_reset(struct udav_softc *sc) { - usbd_status err; + usbd_status_t err; uint16_t to; /* Select PHY */ ==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#41 (text+ko) ==== @@ -617,7 +617,7 @@ void *data) { uint16_t length; - usbd_status err; + usbd_status_t err; repeat: ==== //depot/projects/usb/src/sys/dev/usb/if_zyd.c#23 (text+ko) ==== @@ -380,7 +380,7 @@ uint16_t value, uint16_t index, uint16_t length, uint8_t *data) { usb_device_request_t req; - usbd_status err; + usbd_status_t err; req.bmRequestType = type; req.bRequest = request; @@ -429,7 +429,7 @@ static void zyd_cfg_reset(struct zyd_softc *sc) { - usbd_status err; + usbd_status_t err; err = usbreq_set_config(sc->sc_udev, &(sc->sc_mtx), ZYD_CONFIG_NO); ==== //depot/projects/usb/src/sys/dev/usb/ohci.c#45 (text+ko) ==== @@ -123,7 +123,7 @@ static usbd_config_td_command_t ohci_root_ctrl_task; static void ohci_root_ctrl_task_td(struct ohci_softc *sc, struct thread *ctd); static void ohci_do_poll(struct usbd_bus *bus); -static void ohci_device_done(struct usbd_xfer *xfer, usbd_status error); +static void ohci_device_done(struct usbd_xfer *xfer, usbd_status_t error); static usbd_std_root_transfer_func_t ohci_root_intr_done; static usbd_std_root_transfer_func_t ohci_root_ctrl_task_td_sub; @@ -172,7 +172,7 @@ return; } -static usbd_status +static usbd_status_t ohci_controller_init(ohci_softc_t *sc) { struct usbd_page_search buf_res; @@ -324,7 +324,7 @@ return (ed); } -usbd_status +usbd_status_t ohci_init(ohci_softc_t *sc) { struct usbd_page_search buf_res; @@ -848,7 +848,7 @@ #endif -static usbd_status +static usbd_status_t ohci_non_isoc_done_sub(struct usbd_xfer *xfer) { ohci_td_t *td; @@ -936,7 +936,7 @@ static void ohci_non_isoc_done(struct usbd_xfer *xfer) { - usbd_status err = 0; + usbd_status_t err = 0; DPRINTFN(12, ("xfer=%p pipe=%p transfer done\n", xfer, xfer->pipe)); @@ -1728,7 +1728,7 @@ * from close and from interrupt */ static void -ohci_device_done(struct usbd_xfer *xfer, usbd_status error) +ohci_device_done(struct usbd_xfer *xfer, usbd_status_t error) { struct usbd_pipe_methods *methods = xfer->pipe->methods; ohci_softc_t *sc = xfer->usb_sc; ==== //depot/projects/usb/src/sys/dev/usb/ohci.h#20 (text+ko) ==== @@ -356,7 +356,7 @@ usbd_bus_mem_cb_t ohci_iterate_hw_softc; -usbd_status ohci_init(ohci_softc_t *sc); +usbd_status_t ohci_init(ohci_softc_t *sc); void ohci_detach(struct ohci_softc *sc); void ohci_suspend(ohci_softc_t *sc); void ohci_resume(ohci_softc_t *sc); ==== //depot/projects/usb/src/sys/dev/usb/uark.c#13 (text+ko) ==== @@ -485,7 +485,7 @@ uark_cfg_write(struct uark_softc *sc, uint16_t index, uint16_t value) { usb_device_request_t req; - usbd_status err; + usbd_status_t err; if (ucom_cfg_is_gone(&(sc->sc_ucom))) { return; ==== //depot/projects/usb/src/sys/dev/usb/ubsa.c#30 (text+ko) ==== @@ -415,7 +415,7 @@ ubsa_cfg_request(struct ubsa_softc *sc, uint8_t index, uint16_t value) { usb_device_request_t req; - usbd_status err; + usbd_status_t err; if (ucom_cfg_is_gone(&(sc->sc_ucom))) { return; ==== //depot/projects/usb/src/sys/dev/usb/ubser.c#22 (text+ko) ==== @@ -543,7 +543,7 @@ struct ubser_softc *sc = ucom->sc_parent; uint8_t x = ucom->sc_portno; usb_device_request_t req; - usbd_status err; + usbd_status_t err; if (onoff) { ==== //depot/projects/usb/src/sys/dev/usb/ucycom.c#24 (text+ko) ==== @@ -453,7 +453,7 @@ { usb_device_request_t req; uint16_t len; - usbd_status err; + usbd_status_t err; len = sc->sc_flen; if (len > sizeof(sc->sc_temp_cfg)) { ==== //depot/projects/usb/src/sys/dev/usb/ufoma.c#30 (text+ko) ==== @@ -479,7 +479,7 @@ void *data) { uint16_t length; - usbd_status err; + usbd_status_t err; if (ucom_cfg_is_gone(&(sc->sc_ucom))) { goto error; ==== //depot/projects/usb/src/sys/dev/usb/uftdi.c#27 (text+ko) ==== @@ -469,7 +469,7 @@ void *data) { uint16_t length; - usbd_status err; + usbd_status_t err; if (ucom_cfg_is_gone(&(sc->sc_ucom))) { goto error; ==== //depot/projects/usb/src/sys/dev/usb/ugen.c#29 (text+ko) ==== @@ -313,7 +313,7 @@ return; } -static usbd_status +static usbd_status_t ugen_allocate_blocks(struct ugen_softc *sc, struct ugen_endpoint *sce, struct ugen_frame_ring *ufr, @@ -360,7 +360,7 @@ return; } -static usbd_status +static usbd_status_t __usbd_transfer_setup(struct ugen_softc *sc, struct ugen_endpoint *sce, uint16_t context_bit, @@ -374,7 +374,7 @@ { struct usbd_xfer *temp[n_setup]; - usbd_status error; + usbd_status_t error; if ((n_out_frames > 0) && (n_in_frames > 0)) { /* should not happen */ @@ -584,7 +584,7 @@ static int ugen_open_pipe_write(struct ugen_softc *sc, struct ugen_endpoint *sce) { - usbd_status err; + usbd_status_t err; mtx_assert(&sc->sc_mtx, MA_OWNED); @@ -669,7 +669,7 @@ static int ugen_open_pipe_read(struct ugen_softc *sc, struct ugen_endpoint *sce) { - usbd_status err; + usbd_status_t err; mtx_assert(&sc->sc_mtx, MA_OWNED); ==== //depot/projects/usb/src/sys/dev/usb/uhci.c#48 (text+ko) ==== @@ -160,7 +160,7 @@ static usbd_config_td_command_t uhci_root_ctrl_task; static void uhci_root_ctrl_task_td(struct uhci_softc *sc, struct thread *ctd); static void uhci_do_poll(struct usbd_bus *bus); -static void uhci_device_done(struct usbd_xfer *xfer, usbd_status error); +static void uhci_device_done(struct usbd_xfer *xfer, usbd_status_t error); void uhci_iterate_hw_softc(struct usbd_bus *bus, usbd_bus_mem_sub_cb_t *cb) @@ -423,7 +423,7 @@ return (td); } -usbd_status +usbd_status_t uhci_init(uhci_softc_t *sc) { uint16_t bit; @@ -1110,7 +1110,7 @@ return (need_delay); } -static usbd_status +static usbd_status_t uhci_non_isoc_done_sub(struct usbd_xfer *xfer) { struct usbd_page_search res; @@ -1226,7 +1226,7 @@ static void uhci_non_isoc_done(struct usbd_xfer *xfer) { - usbd_status err = 0; + usbd_status_t err = 0; DPRINTFN(12, ("xfer=%p pipe=%p transfer done\n", xfer, xfer->pipe)); @@ -1942,7 +1942,7 @@ */ static void -uhci_device_done(struct usbd_xfer *xfer, usbd_status error) +uhci_device_done(struct usbd_xfer *xfer, usbd_status_t error) { struct usbd_pipe_methods *methods = xfer->pipe->methods; uhci_softc_t *sc = xfer->usb_sc; @@ -2562,7 +2562,7 @@ * outstanding "port enable change" and "connection status change" * events have been reset. */ -static usbd_status +static usbd_status_t uhci_portreset(uhci_softc_t *sc, uint16_t index, uint8_t use_polling) { uint16_t port; ==== //depot/projects/usb/src/sys/dev/usb/uhci.h#20 (text+ko) ==== @@ -311,7 +311,7 @@ usbd_bus_mem_cb_t uhci_iterate_hw_softc; -usbd_status uhci_init(uhci_softc_t *sc); +usbd_status_t uhci_init(uhci_softc_t *sc); void uhci_suspend(uhci_softc_t *sc); void uhci_resume(uhci_softc_t *sc); void uhci_reset(uhci_softc_t *sc); ==== //depot/projects/usb/src/sys/dev/usb/uhub.c#22 (text+ko) ==== @@ -214,12 +214,12 @@ return (udev->bus->devices[up->device_addr]); } -static usbd_status +static usbd_status_t uhub_explore_sub(device_t dev, struct usbd_device *udev, struct usbd_port *up) { struct usbd_device *child; uint8_t refcount = usb_driver_added_refcount; - usbd_status err = 0; + usbd_status_t err = 0; child = uhub_port_to_sub_device(udev, up); @@ -241,14 +241,14 @@ return (err); } -static usbd_status +static usbd_status_t uhub_explore(struct usbd_device *udev) { usb_hub_descriptor_t *hd = &udev->hub->hubdesc; struct uhub_softc *sc = udev->hub->hubsoftc; struct usbd_device *child; struct usbd_port *up; - usbd_status err; + usbd_status_t err; uint16_t change; uint16_t status; uint8_t portno; @@ -455,7 +455,7 @@ uint8_t nports; uint8_t portno; uint8_t removable; - usbd_status err; + usbd_status_t err; if (sc == NULL) { return (ENOMEM); ==== //depot/projects/usb/src/sys/dev/usb/uipaq.c#13 (text+ko) ==== @@ -305,7 +305,7 @@ void *data) { uint16_t length; - usbd_status err; + usbd_status_t err; if (ucom_cfg_is_gone(&(sc->sc_ucom))) { goto error; ==== //depot/projects/usb/src/sys/dev/usb/ukbd.c#30 (text+ko) ==== @@ -608,7 +608,7 @@ struct usb_attach_arg *uaa = device_get_ivars(dev); int32_t unit = device_get_unit(dev); keyboard_t *kbd = &(sc->sc_kbd); - usbd_status err; + usbd_status_t err; uint16_t n; if (sc == NULL) { ==== //depot/projects/usb/src/sys/dev/usb/umass.c#35 (text+ko) ==== @@ -1630,7 +1630,7 @@ umass_init_shuttle(struct umass_softc *sc) { usb_device_request_t req; - usbd_status err; + usbd_status_t err; uint8_t status[2] = {0, 0}; /* @@ -2161,7 +2161,7 @@ umass_bbb_get_max_lun(struct umass_softc *sc) { usb_device_request_t req; - usbd_status err; + usbd_status_t err; uint8_t buf = 0; /* The Get Max Lun command is a class-specific request. */ ==== //depot/projects/usb/src/sys/dev/usb/umct.c#24 (text+ko) ==== @@ -357,7 +357,7 @@ uint16_t len, uint32_t value) { usb_device_request_t req; - usbd_status err; + usbd_status_t err; uint8_t temp[4]; if (ucom_cfg_is_gone(&(sc->sc_ucom))) { ==== //depot/projects/usb/src/sys/dev/usb/umodem.c#33 (text+ko) ==== @@ -183,7 +183,7 @@ static void umodem_cfg_set_rts(struct ucom_softc *ucom, uint8_t onoff); static void umodem_cfg_set_break(struct ucom_softc *ucom, uint8_t onoff); static void *umodem_get_desc(struct usb_attach_arg *uaa, uint8_t type, uint8_t subtype); -static usbd_status umodem_set_comm_feature(struct usbd_device *udev, uint8_t iface_no, uint16_t feature, uint16_t state); +static usbd_status_t umodem_set_comm_feature(struct usbd_device *udev, uint8_t iface_no, uint16_t feature, uint16_t state); static void umodem_cfg_do_request(struct umodem_softc *sc, usb_device_request_t *req, void *data); static const struct usbd_config umodem_config_data[UMODEM_N_DATA_TRANSFER] = { @@ -879,7 +879,7 @@ type, 0 - 1, subtype, 0 - 1); } -static usbd_status +static usbd_status_t umodem_set_comm_feature(struct usbd_device *udev, uint8_t iface_no, uint16_t feature, uint16_t state) { @@ -921,7 +921,7 @@ void *data) { uint16_t length; - usbd_status err; + usbd_status_t err; if (ucom_cfg_is_gone(&(sc->sc_ucom))) { goto error; ==== //depot/projects/usb/src/sys/dev/usb/umoscom.c#11 (text+ko) ==== @@ -584,7 +584,7 @@ void *data) { uint16_t length; - usbd_status err; + usbd_status_t err; if (ucom_cfg_is_gone(&(sc->sc_ucom))) goto error; ==== //depot/projects/usb/src/sys/dev/usb/uplcom.c#31 (text+ko) ==== @@ -168,7 +168,7 @@ static const struct uplcom_product *uplcom_find_up(struct usb_attach_arg *uaa); -static usbd_status uplcom_reset(struct uplcom_softc *sc, struct usbd_device *udev); +static usbd_status_t uplcom_reset(struct uplcom_softc *sc, struct usbd_device *udev); static int uplcom_pl2303x_init(struct usbd_device *udev); static void uplcom_cfg_set_dtr(struct ucom_softc *ucom, uint8_t onoff); static void uplcom_cfg_set_rts(struct ucom_softc *ucom, uint8_t onoff); @@ -516,7 +516,7 @@ return (0); } -static usbd_status +static usbd_status_t uplcom_reset(struct uplcom_softc *sc, struct usbd_device *udev) { usb_device_request_t req; @@ -559,7 +559,7 @@ uplcom_pl2303x_init(struct usbd_device *udev) { usb_device_request_t req; - usbd_status err; + usbd_status_t err; int i; for (i = 0; i < N_PL2302X_INIT; i++) { @@ -968,7 +968,7 @@ void *data) { uint16_t length; - usbd_status err; + usbd_status_t err; if (ucom_cfg_is_gone(&(sc->sc_ucom))) { goto error; ==== //depot/projects/usb/src/sys/dev/usb/usb.c#24 (text+ko) ==== @@ -302,7 +302,7 @@ usb_attach_sub(device_t dev, struct usbd_bus *bus) { dev_clone_fn usb_clone_ptr = &usb_clone; - usbd_status err; + usbd_status_t err; uint8_t speed; PRINTF(("\n")); ==== //depot/projects/usb/src/sys/dev/usb/usb_hid.c#10 (text+ko) ==== @@ -488,14 +488,14 @@ return (NULL); } -usbd_status +usbd_status_t hid_read_report_desc_from_usb(struct usbd_device *udev, struct mtx *mtx, void **descp, uint16_t *sizep, usb_malloc_type mem, uint8_t iface_index) { struct usbd_interface *iface = usbd_get_iface(udev, iface_index); usb_hid_descriptor_t *hid; - usbd_status err; + usbd_status_t err; if ((iface == NULL) || (iface->idesc == NULL)) { return (USBD_INVAL); ==== //depot/projects/usb/src/sys/dev/usb/usb_hid.h#10 (text+ko) ==== @@ -236,7 +236,7 @@ u_long hid_get_data(const u_char *buf, uint32_t len, struct hid_location *loc); int hid_is_collection(const void *desc, int size, uint32_t usage); usb_hid_descriptor_t *hid_get_descriptor_from_usb(usb_config_descriptor_t *cd, usb_interface_descriptor_t *id); -usbd_status hid_read_report_desc_from_usb(struct usbd_device *udev, struct mtx *mtx, void **descp, uint16_t *sizep, usb_malloc_type mem, uint8_t iface_index); +usbd_status_t hid_read_report_desc_from_usb(struct usbd_device *udev, struct mtx *mtx, void **descp, uint16_t *sizep, usb_malloc_type mem, uint8_t iface_index); #endif ==== //depot/projects/usb/src/sys/dev/usb/usb_requests.c#11 (text+ko) ==== @@ -53,12 +53,12 @@ /*------------------------------------------------------------------------* * usbreq_reset_port *------------------------------------------------------------------------*/ -usbd_status +usbd_status_t usbreq_reset_port(struct usbd_device *udev, struct mtx *mtx, usb_port_status_t *ps, uint8_t port) { usb_device_request_t req; - usbd_status err; + usbd_status_t err; uint8_t n; req.bmRequestType = UT_WRITE_CLASS_OTHER; @@ -116,7 +116,7 @@ /*------------------------------------------------------------------------* * usbreq_get_desc *------------------------------------------------------------------------*/ -usbd_status +usbd_status_t usbreq_get_desc(struct usbd_device *udev, struct mtx *mtx, void *desc, uint16_t min_len, uint16_t max_len, uint16_t id, uint8_t type, uint8_t index, @@ -124,7 +124,7 @@ { usb_device_request_t req; uint8_t *buf; - usbd_status err; + usbd_status_t err; PRINTFN(3, ("id=%d, type=%d, index=%d, max_len=%d\n", id, type, index, max_len)); @@ -195,7 +195,7 @@ * the terminating zero. The "len" argument should be twice as * big pluss 2 bytes, compared with the actual maximum string length ! *------------------------------------------------------------------------*/ -usbd_status +usbd_status_t usbreq_get_string_any(struct usbd_device *udev, struct mtx *mtx, char *buf, uint16_t len, uint8_t string_index) { @@ -205,7 +205,7 @@ uint16_t n; uint16_t c; uint8_t swap; - usbd_status err; + usbd_status_t err; if (len == 0) { /* should not happen */ @@ -275,7 +275,7 @@ * If you don't know the language ID, consider using * "usbreq_get_string_any()". *------------------------------------------------------------------------*/ -usbd_status +usbd_status_t usbreq_get_string_desc(struct usbd_device *udev, struct mtx *mtx, void *sdesc, uint16_t max_len, uint16_t lang_id, uint8_t string_index) @@ -287,11 +287,11 @@ /*------------------------------------------------------------------------* * usbreq_get_config_desc *------------------------------------------------------------------------*/ -usbd_status +usbd_status_t usbreq_get_config_desc(struct usbd_device *udev, struct mtx *mtx, usb_config_descriptor_t *d, uint8_t conf_index) { - usbd_status err; + usbd_status_t err; PRINTFN(3, ("confidx=%d\n", conf_index)); @@ -310,7 +310,7 @@ /*------------------------------------------------------------------------* * usbreq_get_config_desc_full *------------------------------------------------------------------------*/ -usbd_status +usbd_status_t usbreq_get_config_desc_full(struct usbd_device *udev, struct mtx *mtx, void *d, uint16_t size, uint8_t conf_index) { @@ -322,7 +322,7 @@ /*------------------------------------------------------------------------* * usbreq_get_device_desc *------------------------------------------------------------------------*/ -usbd_status +usbd_status_t usbreq_get_device_desc(struct usbd_device *udev, struct mtx *mtx, usb_device_descriptor_t *d) { @@ -334,7 +334,7 @@ /*------------------------------------------------------------------------* * usbreq_get_alt_interface_no *------------------------------------------------------------------------*/ -usbd_status +usbd_status_t usbreq_get_alt_interface_no(struct usbd_device *udev, struct mtx *mtx, uint8_t *alt_iface_no, uint8_t iface_index) { @@ -356,7 +356,7 @@ /*------------------------------------------------------------------------* * usbreq_set_alt_interface_no *------------------------------------------------------------------------*/ -usbd_status +usbd_status_t usbreq_set_alt_interface_no(struct usbd_device *udev, struct mtx *mtx, uint8_t iface_index, uint8_t alt_no) { @@ -379,7 +379,7 @@ /*------------------------------------------------------------------------* * usbreq_get_device_status *------------------------------------------------------------------------*/ -usbd_status +usbd_status_t usbreq_get_device_status(struct usbd_device *udev, struct mtx *mtx, usb_status_t *st) { @@ -396,7 +396,7 @@ /*------------------------------------------------------------------------* * usbreq_get_hub_descriptor *------------------------------------------------------------------------*/ -usbd_status +usbd_status_t usbreq_get_hub_descriptor(struct usbd_device *udev, struct mtx *mtx, usb_hub_descriptor_t *hd) { @@ -413,7 +413,7 @@ /*------------------------------------------------------------------------* * usbreq_get_hub_status *------------------------------------------------------------------------*/ -usbd_status +usbd_status_t usbreq_get_hub_status(struct usbd_device *udev, struct mtx *mtx, usb_hub_status_t *st) { @@ -430,7 +430,7 @@ /*------------------------------------------------------------------------* * usbreq_set_address *------------------------------------------------------------------------*/ -usbd_status +usbd_status_t usbreq_set_address(struct usbd_device *udev, struct mtx *mtx, uint16_t addr) { usb_device_request_t req; @@ -448,7 +448,7 @@ /*------------------------------------------------------------------------* * usbreq_get_port_status *------------------------------------------------------------------------*/ -usbd_status +usbd_status_t usbreq_get_port_status(struct usbd_device *udev, struct mtx *mtx, usb_port_status_t *ps, uint8_t port) { @@ -466,7 +466,7 @@ /*------------------------------------------------------------------------* * usbreq_clear_hub_feature *------------------------------------------------------------------------*/ -usbd_status +usbd_status_t usbreq_clear_hub_feature(struct usbd_device *udev, struct mtx *mtx, uint16_t sel) { @@ -483,7 +483,7 @@ /*------------------------------------------------------------------------* * usbreq_set_hub_feature *------------------------------------------------------------------------*/ -usbd_status +usbd_status_t usbreq_set_hub_feature(struct usbd_device *udev, struct mtx *mtx, uint16_t sel) { @@ -500,7 +500,7 @@ /*------------------------------------------------------------------------* * usbreq_clear_port_feature *------------------------------------------------------------------------*/ -usbd_status +usbd_status_t usbreq_clear_port_feature(struct usbd_device *udev, struct mtx *mtx, uint8_t port, uint16_t sel) { @@ -518,7 +518,7 @@ /*------------------------------------------------------------------------* * usbreq_set_port_feature *------------------------------------------------------------------------*/ -usbd_status >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 2 11:25:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4682016A420; Sun, 2 Dec 2007 11:25: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 023A316A41A for ; Sun, 2 Dec 2007 11:25:30 +0000 (UTC) (envelope-from zec@imunes.net) Received: from xaqua.tel.fer.hr (xaqua.tel.fer.hr [161.53.19.25]) by mx1.freebsd.org (Postfix) with ESMTP id 8D14C13C447 for ; Sun, 2 Dec 2007 11:25:29 +0000 (UTC) (envelope-from zec@imunes.net) Received: by xaqua.tel.fer.hr (Postfix, from userid 20006) id 2B2719B648; Sun, 2 Dec 2007 12:25:29 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on xaqua.tel.fer.hr X-Spam-Level: X-Spam-Status: No, score=-4.3 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.7 Received: from [192.168.200.100] (zec2.tel.fer.hr [161.53.19.79]) by xaqua.tel.fer.hr (Postfix) with ESMTP id B175C9B649 for ; Sun, 2 Dec 2007 12:25:27 +0100 (CET) From: Marko Zec To: Perforce Change Reviews Date: Sun, 2 Dec 2007 12:25:16 +0100 User-Agent: KMail/1.9.7 References: <200712021113.lB2BDefa043362@repoman.freebsd.org> In-Reply-To: <200712021113.lB2BDefa043362@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-2" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Message-Id: <200712021225.16846.zec@imunes.net> Cc: Subject: Re: PERFORCE change 129994 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 11:25:30 -0000 On Sunday 02 December 2007 12:13:40 Marko Zec wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D129994 > > Change 129994 by zec@zec_tpx32 on 2007/12/02 11:13:11 > > IFC > > Affected files ... > > .. //depot/projects/vimage/src/sys/dev/iwi/if_iwi.c#7 edit > .. //depot/projects/vimage/src/sys/net80211/ieee80211.c#8 edit > .. //depot/projects/vimage/src/sys/net80211/ieee80211_var.h#7 edit Ahm, those three changes that unintentionally slipped into an IFC for a=20 private branch were actually intended to provide capability for moving=20 80211 ifnets among vnets. =A0This doesn't work quite properly yet, and the= =20 biggest issue here is that for the first time we are pushing stack=20 virtualization hacks into device driver level, something that I think=20 should be avoided like a plaque in general. Marko > .. //depot/user/zec/forwarding/sys/amd64/amd64/busdma_machdep.c#2 =2E.. > Differences ... > > =3D=3D=3D=3D //depot/projects/vimage/src/sys/dev/iwi/if_iwi.c#7 (text+ko) > =3D=3D=3D=3D > > @@ -35,6 +35,8 @@ > * > http://www.intel.com/network/connectivity/products/wireless/prowirele >ss_mobile.htm */ > > +#include "opt_vimage.h" > + > #include > #include > #include > @@ -55,6 +57,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -193,6 +196,7 @@ > static int iwi_probe(device_t); > static int iwi_attach(device_t); > static int iwi_detach(device_t); > +static void iwi_reassign(struct ifnet *, struct vnet *, char *); > static int iwi_shutdown(device_t); > static int iwi_suspend(device_t); > static int iwi_resume(device_t); > @@ -407,6 +411,9 @@ > ieee80211_ifattach(ic); > ic->ic_bmissthreshold =3D 10; /* override default */ > /* override default methods */ > +#ifdef VIMAGE > + ifp->if_reassign =3D iwi_reassign; > +#endif > ic->ic_node_alloc =3D iwi_node_alloc; > sc->sc_node_free =3D ic->ic_node_free; > ic->ic_node_free =3D iwi_node_free; > @@ -505,6 +512,28 @@ > return 0; > } > > +#ifdef VIMAGE > +static void > +iwi_reassign(struct ifnet *ifp, struct vnet *vnet, char *dname) > +{ > + struct iwi_softc *sc =3D ifp->if_softc; > + struct ieee80211com *ic =3D &sc->sc_ic; > + IWI_LOCK_DECL; > + > + IWI_LOCK(sc); > + bpfdetach(ifp); > + sc->sc_drvbpf =3D NULL; > + ieee80211_reassign(ic, vnet, dname); > + > + CURVNET_SET_QUIET(vnet); > + bpfattach2(ifp, DLT_IEEE802_11_RADIO, > + sizeof (struct ieee80211_frame) + sizeof (sc->sc_txtap), > + &sc->sc_drvbpf); > + CURVNET_RESTORE(); > + IWI_UNLOCK(sc); > +} > +#endif > > >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 2 11:51:43 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B57E16A41A; Sun, 2 Dec 2007 11:51:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AF66716A417 for ; Sun, 2 Dec 2007 11:51:42 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8912513C45A for ; Sun, 2 Dec 2007 11:51:42 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2BpgOR048535 for ; Sun, 2 Dec 2007 11:51:42 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB2BpgAi048532 for perforce@freebsd.org; Sun, 2 Dec 2007 11:51:42 GMT (envelope-from raj@freebsd.org) Date: Sun, 2 Dec 2007 11:51:42 GMT Message-Id: <200712021151.lB2BpgAi048532@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 130000 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 11:51:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=130000 Change 130000 by raj@raj_mimi on 2007/12/02 11:51:28 Add WITH_UBOOT description (for the src.conf(5) manual) Affected files ... .. //depot/projects/e500/tools/build/options/WITH_UBOOT#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 2 11:51:43 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7352316A500; Sun, 2 Dec 2007 11:51:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1929016A418 for ; Sun, 2 Dec 2007 11:51:43 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E68AB13C45B for ; Sun, 2 Dec 2007 11:51:42 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2Bpg2E048541 for ; Sun, 2 Dec 2007 11:51:42 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB2Bpgrr048538 for perforce@freebsd.org; Sun, 2 Dec 2007 11:51:42 GMT (envelope-from raj@freebsd.org) Date: Sun, 2 Dec 2007 11:51:42 GMT Message-Id: <200712021151.lB2Bpgrr048538@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 130001 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 11:51:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=130001 Change 130001 by raj@raj_mimi on 2007/12/02 11:51:35 Build OpenFirmware-based loader(8) with -msoft-float to be consistent with other pieces that already do this (ficl, libstand) Affected files ... .. //depot/projects/e500/sys/boot/powerpc/ofw/Makefile#2 edit Differences ... ==== //depot/projects/e500/sys/boot/powerpc/ofw/Makefile#2 (text+ko) ==== @@ -61,7 +61,7 @@ CLEANFILES+= vers.c loader.help -CFLAGS+= -ffreestanding +CFLAGS+= -ffreestanding -msoft-float # load address. set in linker script RELOC?= 0x1C00000 CFLAGS+= -DRELOC=${RELOC} From owner-p4-projects@FreeBSD.ORG Sun Dec 2 11:52:44 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7137A16A420; Sun, 2 Dec 2007 11:52:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C69216A417 for ; Sun, 2 Dec 2007 11:52:44 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0DC5713C44B for ; Sun, 2 Dec 2007 11:52:44 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2BqhCx048848 for ; Sun, 2 Dec 2007 11:52:43 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB2BqhKG048845 for perforce@freebsd.org; Sun, 2 Dec 2007 11:52:43 GMT (envelope-from raj@freebsd.org) Date: Sun, 2 Dec 2007 11:52:43 GMT Message-Id: <200712021152.lB2BqhKG048845@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 130002 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 11:52:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=130002 Change 130002 by raj@raj_mimi on 2007/12/02 11:51:43 Minor style cleanups and cosmetic changes Affected files ... .. //depot/projects/e500/sys/dev/tsec/if_tsec.c#3 edit .. //depot/projects/e500/sys/powerpc/booke/trap_subr.S#3 edit Differences ... ==== //depot/projects/e500/sys/dev/tsec/if_tsec.c#3 (text+ko) ==== @@ -25,6 +25,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* + * Freescale integrated Three-Speed Ethernet Controller (TSEC) driver. + */ + #include #include #include @@ -237,7 +241,7 @@ */ /* - * XXX kluge - use circumstancial evidence to program ECNTRL + * XXX kludge - use circumstancial evidence to program ECNTRL * correctly. Ideally we need some board information to guide * us here. */ @@ -308,7 +312,7 @@ /* Step 16: Initialize FIFO_PAUSE_CTRL */ TSEC_WRITE(sc, TSEC_REG_FIFO_PAUSE_CTRL, TSEC_FIFO_PAUSE_CTRL_EN); - + /* * Step 17: Initialize transmit/receive descriptor rings. * Initialize TBASE and RBASE. @@ -351,12 +355,12 @@ /* Step 21: Mask all CAM interrupts */ TSEC_WRITE(sc, TSEC_REG_MON_CAM1, 0xffffffff); TSEC_WRITE(sc, TSEC_REG_MON_CAM2, 0xffffffff); - + /* Step 22: Enable Rx and Tx */ val = TSEC_READ(sc, TSEC_REG_MACCFG1); val |= (TSEC_MACCFG1_RX_EN | TSEC_MACCFG1_TX_EN); TSEC_WRITE(sc, TSEC_REG_MACCFG1, val); - + /* Step 23: Reset TSEC counters for Tx and Rx rings */ TSEC_TX_RX_COUNTERS_INIT(sc); @@ -377,7 +381,7 @@ char *macbufp; char *curmac; int i; - + TSEC_GLOBAL_LOCK_ASSERT(sc); KASSERT((ETHER_ADDR_LEN <= sizeof(macbuf)), @@ -812,7 +816,7 @@ (*vaddr) = NULL; return (ENXIO); } - + error = bus_dmamem_alloc(*dtag, vaddr, BUS_DMA_NOWAIT | BUS_DMA_ZERO, dmap); if (error) { @@ -822,7 +826,7 @@ (*vaddr) = NULL; return (ENXIO); } - + error = bus_dmamap_load(*dtag, *dmap, *vaddr, dsize, tsec_map_dma_addr, raddr, BUS_DMA_NOWAIT); if (error) { @@ -891,7 +895,7 @@ if (id == 0) return (ENXIO); - device_set_desc(dev, "eTSEC ethernet controller"); + device_set_desc(dev, "TSEC Ethernet Controller"); return (BUS_PROBE_DEFAULT); } @@ -935,7 +939,7 @@ /* Stop DMA engine if enabled by firmware */ tsec_dma_ctl(sc, 0); - + /* Reset MAC */ tsec_reset_mac(sc); @@ -1275,14 +1279,14 @@ TSEC_GLOBAL_LOCK_ASSERT(sc); ifp = sc->tsec_ifp; - + /* Stop PHY tick engine */ callout_stop(&sc->tsec_tick_ch); /* Disable interface and watchdog timer */ ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); ifp->if_timer = 0; - + /* Disable all interrupts and stop DMA */ tsec_intrs_ctl(sc, 0); tsec_dma_ctl(sc, 0); @@ -1298,7 +1302,7 @@ TSEC_FREE_TX_MAP(sc, mapp); m_freem(m0); } - + /* Disable Rx and Tx */ tmpval = TSEC_READ(sc, TSEC_REG_MACCFG1); tmpval &= ~(TSEC_MACCFG1_RX_EN | TSEC_MACCFG1_TX_EN); @@ -1338,7 +1342,7 @@ for (count = 0; /* count < TSEC_RX_NUM_DESC */; count++) { rx_desc = TSEC_GET_CUR_RX_DESC(sc); flags = rx_desc->flags; - + /* Check if there is anything to receive */ if ((flags & TSEC_RXBD_E) || (count >= TSEC_RX_NUM_DESC)) { @@ -1370,7 +1374,7 @@ /* Ok... process frame */ length = rx_desc->length - ETHER_CRC_LEN; i = TSEC_GET_CUR_RX_DESC_CNT(sc); - + m = rx_data[i].mbuf; if (tsec_new_rxbuf(sc->tsec_rx_mtag, rx_data[i].map, @@ -1395,7 +1399,7 @@ bus_dmamap_sync(sc->tsec_rx_dtag, sc->tsec_rx_dmap, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); - + TSEC_RECEIVE_UNLOCK(sc); /* Push it now */ @@ -1497,7 +1501,7 @@ if (eflags & TSEC_IEVENT_EBERR) if_printf(ifp, "System bus error occurred during" " a DMA transaction (flags: 0x%x)\n", eflags); - + /* Check transmitter errors */ if (eflags & TSEC_IEVENT_TXE) { ifp->if_oerrors++; @@ -1587,7 +1591,7 @@ device_printf(dev, "Trying to write to an alien PHY(%d)\n", phy); sc = tsec0_sc; - + TSEC_WRITE(sc, TSEC_REG_MIIMADD, (phy << 8) | reg); TSEC_WRITE(sc, TSEC_REG_MIIMCON, value); @@ -1643,7 +1647,7 @@ } TSEC_WRITE(sc, TSEC_REG_MACCFG2, tmp); - /* XXX kluge - use circumstantial evidence for reduced mode. */ + /* XXX kludge - use circumstantial evidence for reduced mode. */ id = TSEC_READ(sc, TSEC_REG_ID2); if (id & 0xffff) { ecntrl = TSEC_READ(sc, TSEC_REG_ECNTRL) & ~TSEC_ECNTRL_R100M; ==== //depot/projects/e500/sys/powerpc/booke/trap_subr.S#3 (text+ko) ==== @@ -65,7 +65,7 @@ * NOTICE: This is not a standalone file. to use it, #include it in * your port's locore.S, like so: * - * #include + * #include */ /* From owner-p4-projects@FreeBSD.ORG Sun Dec 2 12:00:53 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4517716A468; Sun, 2 Dec 2007 12:00: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 D474416A41B for ; Sun, 2 Dec 2007 12:00: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 C53CA13C468 for ; Sun, 2 Dec 2007 12:00:52 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2C0qqq051199 for ; Sun, 2 Dec 2007 12:00:52 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB2C0qbe051196 for perforce@freebsd.org; Sun, 2 Dec 2007 12:00:52 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 12:00:52 GMT Message-Id: <200712021200.lB2C0qbe051196@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 130003 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 12:00:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=130003 Change 130003 by hselasky@hselasky_laptop001 on 2007/12/02 12:00:36 Enable zero-copy for the Linux USB API by default. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#13 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#13 (text+ko) ==== @@ -761,6 +761,16 @@ cfg[0].bufsize = 0; /* use wMaxPacketSize */ cfg[0].frames = usb_max_isoc_frames(dev); cfg[0].flags.proxy_buffer = 1; +#if 0 + /* + * The Linux USB API allows non back-to-back + * isochronous frames which we do not support. If the + * isochronous frames are not back-to-back we need to + * do a copy, and then we need a buffer for + * that. Enable this at your own risk. + */ + cfg[0].flags.ext_buffer = 1; +#endif cfg[0].flags.short_xfer_ok = 1; bcopy(cfg + 0, cfg + 1, sizeof(*cfg)); @@ -768,8 +778,7 @@ /* Allocate and setup two generic FreeBSD USB transfers */ if (usbd_transfer_setup(dev->bsd_udev, uhe->bsd_iface_index, - uhe->bsd_xfer, cfg, 2, uhe, - &usb_global_lock)) { + uhe->bsd_xfer, cfg, 2, uhe, &usb_global_lock)) { return -EINVAL; } } else { @@ -784,12 +793,12 @@ cfg[0].direction = addr & (UE_DIR_OUT | UE_DIR_IN); cfg[0].callback = &usb_linux_non_isoc_callback; cfg[0].bufsize = bufsize; + cfg[0].flags.ext_buffer = 1; /* enable zero-copy */ cfg[0].flags.proxy_buffer = 1; cfg[0].flags.short_xfer_ok = 1; if (usbd_transfer_setup(dev->bsd_udev, uhe->bsd_iface_index, - uhe->bsd_xfer, cfg, 1, uhe, - &usb_global_lock)) { + uhe->bsd_xfer, cfg, 1, uhe, &usb_global_lock)) { return -EINVAL; } } @@ -1286,9 +1295,11 @@ uipd = urb->iso_frame_desc + x; uipd->actual_length = xfer->frlengths[x]; uipd->status = 0; - usbd_copy_out(xfer->frbuffers + 0, offset, - ((uint8_t *)(urb->transfer_buffer)) + uipd->offset, - uipd->actual_length); + if (!xfer->flags.ext_buffer) { + usbd_copy_out(xfer->frbuffers + 0, offset, + USBD_ADD_BYTES(urb->transfer_buffer, + uipd->offset), uipd->actual_length); + } offset += max_frame; } } else { @@ -1354,9 +1365,11 @@ for (x = 0; x < urb->number_of_packets; x++) { uipd = urb->iso_frame_desc + x; xfer->frlengths[x] = uipd->length; - usbd_copy_in(xfer->frbuffers + 0, offset, - ((uint8_t *)(urb->transfer_buffer)) + uipd->offset, - uipd->length); + if (!xfer->flags.ext_buffer) { + usbd_copy_in(xfer->frbuffers + 0, offset, + USBD_ADD_BYTES(urb->transfer_buffer, + uipd->offset), uipd->length); + } offset += uipd->length; } } else { @@ -1376,6 +1389,11 @@ } } + if (xfer->flags.ext_buffer) { + /* set virtual address to load */ + usbd_set_frame_data(xfer, + urb->transfer_buffer, 0); + } xfer->priv_fifo = urb; xfer->flags.force_short_xfer = 0; xfer->timeout = urb->timeout; @@ -1441,7 +1459,7 @@ xfer->frlengths[0] = 0; } - if (urb->bsd_isread) { + if (urb->bsd_isread && (!xfer->flags.ext_buffer)) { /* copy in data with regard to the URB */ usbd_copy_out(xfer->frbuffers + data_frame, 0, urb->bsd_data_ptr, xfer->frlengths[data_frame]); @@ -1495,8 +1513,14 @@ * USB control transfers need special handling. * First copy in the header, then copy in data! */ - usbd_copy_in(xfer->frbuffers + 0, 0, - urb->setup_packet, REQ_SIZE); + if (!xfer->flags.ext_buffer) { + usbd_copy_in(xfer->frbuffers + 0, 0, + urb->setup_packet, REQ_SIZE); + } else { + /* set virtual address to load */ + usbd_set_frame_data(xfer, + urb->setup_packet, 0); + } xfer->frlengths[0] = REQ_SIZE; @@ -1528,7 +1552,11 @@ } /* check if we need to copy in data */ - if (!(urb->bsd_isread)) { + if (xfer->flags.ext_buffer) { + /* set virtual address to load */ + usbd_set_frame_data(xfer, urb->bsd_data_ptr, + data_frame); + } else if (!urb->bsd_isread) { /* copy out data with regard to the URB */ usbd_copy_in(xfer->frbuffers + data_frame, 0, urb->bsd_data_ptr, max_bulk); From owner-p4-projects@FreeBSD.ORG Sun Dec 2 12:43:39 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9A3D16A421; Sun, 2 Dec 2007 12:43:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 77BAF16A419 for ; Sun, 2 Dec 2007 12:43:38 +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 6933F13C4D3 for ; Sun, 2 Dec 2007 12:43:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2ChcEG062195 for ; Sun, 2 Dec 2007 12:43:38 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB2ChcQR062192 for perforce@freebsd.org; Sun, 2 Dec 2007 12:43:38 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 12:43:38 GMT Message-Id: <200712021243.lB2ChcQR062192@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 130004 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 12:43:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=130004 Change 130004 by hselasky@hselasky_laptop001 on 2007/12/02 12:43:01 Factor out initialization and destruction of the USB lock. Affected files ... .. //depot/projects/usb/src/sys/arm/at91/ohci_atmelarm.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#28 edit .. //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#28 edit .. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#27 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#63 edit Differences ... ==== //depot/projects/usb/src/sys/arm/at91/ohci_atmelarm.c#10 (text) ==== @@ -84,9 +84,6 @@ sc->iclk = at91_pmc_clock_ref("ohci_clk"); sc->fclk = at91_pmc_clock_ref("uhpck"); - mtx_init(&(sc->sc_ohci.sc_bus.mtx), "usb lock", - NULL, MTX_DEF | MTX_RECURSE); - sc->sc_ohci.sc_dev = dev; rid = MEM_RID; @@ -204,8 +201,6 @@ usbd_bus_mem_free_all(&(sc->sc_bus), &ohci_iterate_hw_softc); - mtx_destroy(&(sc->sc_ohci.sc_bus.mtx)); - return (0); } ==== //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#28 (text+ko) ==== @@ -224,9 +224,6 @@ if (usbd_bus_mem_alloc_all(&(sc->sc_bus), &ehci_iterate_hw_softc)) { return ENOMEM; } - mtx_init(&sc->sc_bus.mtx, "usb lock", - NULL, MTX_DEF | MTX_RECURSE); - sc->sc_dev = self; pci_enable_busmaster(self); @@ -407,8 +404,6 @@ usbd_bus_mem_free_all(&(sc->sc_bus), &ehci_iterate_hw_softc); - mtx_destroy(&sc->sc_bus.mtx); - return (0); } ==== //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#28 (text+ko) ==== @@ -205,9 +205,6 @@ if (usbd_bus_mem_alloc_all(&(sc->sc_bus), &ohci_iterate_hw_softc)) { return ENOMEM; } - mtx_init(&sc->sc_bus.mtx, "usb lock", - NULL, MTX_DEF | MTX_RECURSE); - sc->sc_dev = self; pci_enable_busmaster(self); @@ -364,8 +361,6 @@ usbd_bus_mem_free_all(&(sc->sc_bus), &ohci_iterate_hw_softc); - mtx_destroy(&sc->sc_bus.mtx); - return (0); } ==== //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#27 (text+ko) ==== @@ -221,9 +221,6 @@ if (usbd_bus_mem_alloc_all(&(sc->sc_bus), &uhci_iterate_hw_softc)) { return ENOMEM; } - mtx_init(&sc->sc_bus.mtx, "usb lock", - NULL, MTX_DEF | MTX_RECURSE); - sc->sc_dev = self; pci_enable_busmaster(self); @@ -390,8 +387,6 @@ usbd_bus_mem_free_all(&(sc->sc_bus), &uhci_iterate_hw_softc); - mtx_destroy(&sc->sc_bus.mtx); - return (0); } ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#63 (text+ko) ==== @@ -2922,6 +2922,9 @@ { bus->alloc_failed = 0; + mtx_init(&(bus->mtx), "USB lock", + NULL, MTX_DEF | MTX_RECURSE); + cb(bus, &usbd_bus_mem_alloc_all_cb); if (bus->alloc_failed) { @@ -2951,6 +2954,8 @@ usbd_dma_tag_unsetup(bus->dma_tags, USB_BUS_DMA_TAG_MAX); + mtx_destroy(&(bus->mtx)); + return; } From owner-p4-projects@FreeBSD.ORG Sun Dec 2 13:27:27 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EAA616A468; Sun, 2 Dec 2007 13:27:27 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EAEEE16A47C for ; Sun, 2 Dec 2007 13:27:26 +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 C511613C45A for ; Sun, 2 Dec 2007 13:27:26 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2DRQdC078322 for ; Sun, 2 Dec 2007 13:27:26 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB2DRQmr078319 for perforce@freebsd.org; Sun, 2 Dec 2007 13:27:26 GMT (envelope-from gonzo@FreeBSD.org) Date: Sun, 2 Dec 2007 13:27:26 GMT Message-Id: <200712021327.lB2DRQmr078319@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 130010 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 13:27:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=130010 Change 130010 by gonzo@gonzo_jeeves on 2007/12/02 13:26:26 o Add high-level uart stuff to get userland output working. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips32/idt/files.idt#4 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips32/idt/files.idt#4 (text+ko) ==== @@ -5,4 +5,4 @@ mips/mips32/idt/obio.c standard mips/mips32/idt/idtpci.c optional pci mips/mips32/idt/uart_cpu_rc32434.c optional uart -# mips/mips32/idt/uart_bus_rc32434.c optional uart +mips/mips32/idt/uart_bus_rc32434.c optional uart From owner-p4-projects@FreeBSD.ORG Sun Dec 2 13:29:29 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 625C216A41B; Sun, 2 Dec 2007 13:29: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 1DFCB16A41A for ; Sun, 2 Dec 2007 13:29: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 0FFCF13C448 for ; Sun, 2 Dec 2007 13:29:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2DTSOI078376 for ; Sun, 2 Dec 2007 13:29:28 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB2DTSZG078373 for perforce@freebsd.org; Sun, 2 Dec 2007 13:29:28 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 13:29:28 GMT Message-Id: <200712021329.lB2DTSZG078373@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 130011 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 13:29:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=130011 Change 130011 by hselasky@hselasky_laptop001 on 2007/12/02 13:29:09 Compile fixes for ARM. Affected files ... .. //depot/projects/usb/src/sys/arm/at91/ohci_atmelarm.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/ucom.c#23 edit .. //depot/projects/usb/src/sys/dev/usb/uipaq.c#14 edit Differences ... ==== //depot/projects/usb/src/sys/arm/at91/ohci_atmelarm.c#11 (text) ==== @@ -73,7 +73,7 @@ } /* store parent DMA tag */ - sc->sc_ohci.sc_bus.dma_tag_parent = device_get_dma_tag(self); + sc->sc_ohci.sc_bus.dma_tag_parent = device_get_dma_tag(dev); /* get all DMA memory */ @@ -197,9 +197,9 @@ sc->sc_ohci.sc_io_res); sc->sc_ohci.sc_io_res = NULL; } - usbd_config_td_unsetup(&(sc->sc_config_td)); + usbd_config_td_unsetup(&(sc->sc_ohci.sc_config_td)); - usbd_bus_mem_free_all(&(sc->sc_bus), &ohci_iterate_hw_softc); + usbd_bus_mem_free_all(&(sc->sc_ohci.sc_bus), &ohci_iterate_hw_softc); return (0); } ==== //depot/projects/usb/src/sys/dev/usb/ucom.c#23 (text+ko) ==== @@ -1164,7 +1164,6 @@ } } -done: if ((sc->sc_flag & UCOM_FLAG_RTS_IFLOW) && (!(sc->sc_mcr & SER_RTS)) && (!(tp->t_state & TS_TBLOCK))) { ==== //depot/projects/usb/src/sys/dev/usb/uipaq.c#14 (text+ko) ==== @@ -116,7 +116,7 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .bufsize = UIPAQ_BUF_SIZE, - .flags = {.pipe_bof = 1,.force_short_xfer_ok = 1,}, + .flags = {.pipe_bof = 1,.force_short_xfer = 1,}, .callback = &uipaq_write_callback, }, @@ -310,8 +310,7 @@ if (ucom_cfg_is_gone(&(sc->sc_ucom))) { goto error; } - err = usbd_do_request_flags_mtx(sc->sc_udev, &Giant, req, - data, 0, NULL, 1000); + err = usbd_do_request(sc->sc_udev, &Giant, req, data); if (err) { From owner-p4-projects@FreeBSD.ORG Sun Dec 2 13:33:34 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D996316A420; Sun, 2 Dec 2007 13:33:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94EC316A417 for ; Sun, 2 Dec 2007 13:33:33 +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 6E58F13C4CC for ; Sun, 2 Dec 2007 13:33:33 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2DXXwp079666 for ; Sun, 2 Dec 2007 13:33:33 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB2DXXnL079663 for perforce@freebsd.org; Sun, 2 Dec 2007 13:33:33 GMT (envelope-from gonzo@FreeBSD.org) Date: Sun, 2 Dec 2007 13:33:33 GMT Message-Id: <200712021333.lB2DXXnL079663@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 130012 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 13:33:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=130012 Change 130012 by gonzo@gonzo_jeeves on 2007/12/02 13:32:34 o Add uart to list of hinted devices Affected files ... .. //depot/projects/mips2/src/sys/mips/conf/IDT.hints#4 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/conf/IDT.hints#4 (text+ko) ==== @@ -12,4 +12,6 @@ # uart0 hint.uart.0.at="obio0" -hint.uart.0.maddr=0xb8058000 +hint.uart.0.maddr=0x18058000 +hint.uart.0.msize=0x1C +hint.uart.0.irq=104 From owner-p4-projects@FreeBSD.ORG Sun Dec 2 13:33:34 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A635E16A51E; Sun, 2 Dec 2007 13:33: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 BC74A16A418 for ; Sun, 2 Dec 2007 13:33:33 +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 9679513C4EB for ; Sun, 2 Dec 2007 13:33:33 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2DXXp4079672 for ; Sun, 2 Dec 2007 13:33:33 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB2DXXTM079669 for perforce@freebsd.org; Sun, 2 Dec 2007 13:33:33 GMT (envelope-from gonzo@FreeBSD.org) Date: Sun, 2 Dec 2007 13:33:33 GMT Message-Id: <200712021333.lB2DXXTM079669@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 130013 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 13:33:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=130013 Change 130013 by gonzo@gonzo_jeeves on 2007/12/02 13:33:20 o Use physical addresses in hints Affected files ... .. //depot/projects/mips2/src/sys/mips/mips32/idt/uart_cpu_rc32434.c#2 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips32/idt/uart_cpu_rc32434.c#2 (text+ko) ==== @@ -80,6 +80,6 @@ di->parity = UART_PARITY_NONE; uart_bus_space_io = NULL; uart_bus_space_mem = NULL; - di->bas.bsh = maddr; + di->bas.bsh = MIPS_PHYS_TO_KSEG1(maddr); return (0); } From owner-p4-projects@FreeBSD.ORG Sun Dec 2 13:37:39 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E1E716A420; Sun, 2 Dec 2007 13:37: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 C9A6916A419 for ; Sun, 2 Dec 2007 13:37: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 BC0E713C4D1 for ; Sun, 2 Dec 2007 13:37:38 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2DbcVx079906 for ; Sun, 2 Dec 2007 13:37:38 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB2DbctX079903 for perforce@freebsd.org; Sun, 2 Dec 2007 13:37:38 GMT (envelope-from gonzo@FreeBSD.org) Date: Sun, 2 Dec 2007 13:37:38 GMT Message-Id: <200712021337.lB2DbctX079903@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 130014 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 13:37:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=130014 Change 130014 by gonzo@gonzo_jeeves on 2007/12/02 13:37:23 o Take into consideration only start/end variables while checking if allocation is requested for hinted device. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips32/idt/obio.c#5 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips32/idt/obio.c#5 (text+ko) ==== @@ -137,7 +137,7 @@ struct rman *rm; int isdefault, needactivate, passthrough; - isdefault = (start == 0UL && end == ~0UL && count == 1); + isdefault = (start == 0UL && end == ~0UL); needactivate = flags & RF_ACTIVE; passthrough = (device_get_parent(child) != bus); rle = NULL; From owner-p4-projects@FreeBSD.ORG Sun Dec 2 14:57:06 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AC1116A41B; Sun, 2 Dec 2007 14:57: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 3A60616A418 for ; Sun, 2 Dec 2007 14:57:06 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 28E3613C447 for ; Sun, 2 Dec 2007 14:57:06 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2Ev6mT092825 for ; Sun, 2 Dec 2007 14:57:06 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB2Ev5rv092822 for perforce@freebsd.org; Sun, 2 Dec 2007 14:57:05 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 14:57:05 GMT Message-Id: <200712021457.lB2Ev5rv092822@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 130019 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 14:57:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=130019 Change 130019 by hselasky@hselasky_laptop001 on 2007/12/02 14:56:17 UCOM cannot use "usbd_get_page()". Use "usbd_get_buffer()" instead. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ucom.c#24 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ucom.c#24 (text+ko) ==== @@ -1023,10 +1023,8 @@ ucom_get_data(struct ucom_softc *sc, struct usbd_page_cache *pc, uint32_t offset, uint32_t len, uint32_t *actlen) { - struct usbd_page_search res; struct tty *tp = sc->sc_tty; uint32_t cnt; - uint32_t offset_orig; mtx_assert(sc->sc_parent_mtx, MA_OWNED); @@ -1056,28 +1054,11 @@ DPRINTF(0, "stopped\n"); goto done; } - offset_orig = offset; - while (len > 0) { + cnt = q_to_b(&(tp->t_outq), usbd_get_buffer(pc,offset), len); - usbd_get_page(pc, offset, &res); - - if (res.length > len) { - res.length = len; - } - cnt = q_to_b(&(tp->t_outq), res.buffer, res.length); + actlen[0] = cnt; - offset += cnt; - len -= cnt; - - if (cnt < res.length) { - /* end of buffer */ - break; - } - } - - actlen[0] = offset - offset_orig; - DPRINTF(0, "cnt=%d\n", actlen[0]); if (actlen[0] == 0) { @@ -1099,8 +1080,8 @@ ucom_put_data(struct ucom_softc *sc, struct usbd_page_cache *pc, uint32_t offset, uint32_t len) { - struct usbd_page_search res; struct tty *tp = sc->sc_tty; + uint8_t *buf; uint32_t cnt; mtx_assert(sc->sc_parent_mtx, MA_OWNED); @@ -1111,27 +1092,19 @@ } /* set a flag to prevent recursation ? */ - while (len > 0) { - - usbd_get_page(pc, offset, &res); - - if (res.length > len) { - res.length = len; - } - len -= res.length; - offset += res.length; + buf = usbd_get_buffer(pc, offset); if (tp->t_state & TS_CAN_BYPASS_L_RINT) { - if (((tp->t_rawq.c_cc + res.length) > tp->t_ihiwat) && + if (((tp->t_rawq.c_cc + len) > tp->t_ihiwat) && ((sc->sc_flag & UCOM_FLAG_RTS_IFLOW) || (tp->t_iflag & IXOFF)) && (!(tp->t_state & TS_TBLOCK))) { ttyblock(tp); } - cnt = b_to_q(res.buffer, res.length, &(tp->t_rawq)); + cnt = b_to_q(buf, len, &(tp->t_rawq)); - tp->t_rawcc += res.length; + tp->t_rawcc += len; ttwakeup(tp); @@ -1150,19 +1123,18 @@ /* pass characters to tty layer */ - for (cnt = 0; cnt < res.length; cnt++) { + for (cnt = 0; cnt != len; cnt++) { - if (ttyld_rint(tp, ((uint8_t *)res.buffer)[cnt]) == -1) { + if (ttyld_rint(tp, buf[cnt]) == -1) { /* XXX what should we do? */ DPRINTF(0, "tp=%p, lost %d " - "chars\n", tp, res.length - cnt); + "chars\n", tp, len - cnt); break; } } } - } if ((sc->sc_flag & UCOM_FLAG_RTS_IFLOW) && (!(sc->sc_mcr & SER_RTS)) && From owner-p4-projects@FreeBSD.ORG Sun Dec 2 14:57:07 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D70B016A510; Sun, 2 Dec 2007 14:57: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 5DDF416A419 for ; Sun, 2 Dec 2007 14:57:06 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4CDC413C458 for ; Sun, 2 Dec 2007 14:57:06 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2Ev6jU092831 for ; Sun, 2 Dec 2007 14:57:06 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB2Ev6RS092828 for perforce@freebsd.org; Sun, 2 Dec 2007 14:57:06 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 14:57:06 GMT Message-Id: <200712021457.lB2Ev6RS092828@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 130020 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 14:57:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=130020 Change 130020 by hselasky@hselasky_laptop001 on 2007/12/02 14:56:51 Style "ucom.c" using "usb_style.sh". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ucom.c#25 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ucom.c#25 (text+ko) ==== @@ -1054,8 +1054,7 @@ DPRINTF(0, "stopped\n"); goto done; } - - cnt = q_to_b(&(tp->t_outq), usbd_get_buffer(pc,offset), len); + cnt = q_to_b(&(tp->t_outq), usbd_get_buffer(pc, offset), len); actlen[0] = cnt; @@ -1094,47 +1093,47 @@ buf = usbd_get_buffer(pc, offset); - if (tp->t_state & TS_CAN_BYPASS_L_RINT) { + if (tp->t_state & TS_CAN_BYPASS_L_RINT) { - if (((tp->t_rawq.c_cc + len) > tp->t_ihiwat) && - ((sc->sc_flag & UCOM_FLAG_RTS_IFLOW) || - (tp->t_iflag & IXOFF)) && - (!(tp->t_state & TS_TBLOCK))) { - ttyblock(tp); - } - cnt = b_to_q(buf, len, &(tp->t_rawq)); + if (((tp->t_rawq.c_cc + len) > tp->t_ihiwat) && + ((sc->sc_flag & UCOM_FLAG_RTS_IFLOW) || + (tp->t_iflag & IXOFF)) && + (!(tp->t_state & TS_TBLOCK))) { + ttyblock(tp); + } + cnt = b_to_q(buf, len, &(tp->t_rawq)); - tp->t_rawcc += len; + tp->t_rawcc += len; - ttwakeup(tp); + ttwakeup(tp); - if ((tp->t_state & TS_TTSTOP) && - ((tp->t_iflag & IXANY) || - (tp->t_cc[VSTART] == tp->t_cc[VSTOP]))) { - tp->t_state &= ~TS_TTSTOP; - tp->t_lflag &= ~FLUSHO; - ucom_start_write(tp); - } - if (cnt > 0) { - DPRINTF(0, "tp=%p, lost %d " - "chars\n", tp, cnt); - } - } else { + if ((tp->t_state & TS_TTSTOP) && + ((tp->t_iflag & IXANY) || + (tp->t_cc[VSTART] == tp->t_cc[VSTOP]))) { + tp->t_state &= ~TS_TTSTOP; + tp->t_lflag &= ~FLUSHO; + ucom_start_write(tp); + } + if (cnt > 0) { + DPRINTF(0, "tp=%p, lost %d " + "chars\n", tp, cnt); + } + } else { - /* pass characters to tty layer */ + /* pass characters to tty layer */ - for (cnt = 0; cnt != len; cnt++) { + for (cnt = 0; cnt != len; cnt++) { - if (ttyld_rint(tp, buf[cnt]) == -1) { + if (ttyld_rint(tp, buf[cnt]) == -1) { - /* XXX what should we do? */ + /* XXX what should we do? */ - DPRINTF(0, "tp=%p, lost %d " - "chars\n", tp, len - cnt); - break; - } + DPRINTF(0, "tp=%p, lost %d " + "chars\n", tp, len - cnt); + break; } } + } if ((sc->sc_flag & UCOM_FLAG_RTS_IFLOW) && (!(sc->sc_mcr & SER_RTS)) && From owner-p4-projects@FreeBSD.ORG Sun Dec 2 14:59:09 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1207716A46C; Sun, 2 Dec 2007 14:59: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 B7E9816A41B for ; Sun, 2 Dec 2007 14:59:08 +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 A6AC013C461 for ; Sun, 2 Dec 2007 14:59:08 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2Ex8Qk092907 for ; Sun, 2 Dec 2007 14:59:08 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB2Ex8Ym092904 for perforce@freebsd.org; Sun, 2 Dec 2007 14:59:08 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 14:59:08 GMT Message-Id: <200712021459.lB2Ex8Ym092904@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 130021 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 14:59:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=130021 Change 130021 by hselasky@hselasky_laptop001 on 2007/12/02 14:58:29 Add new helper function go get virtual buffer given a page cache. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#64 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#65 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#64 (text+ko) ==== @@ -1817,6 +1817,15 @@ } /*------------------------------------------------------------------------* + * usbd_get_buffer + *------------------------------------------------------------------------*/ +void * +usbd_get_buffer(struct usbd_page_cache *pc, uint32_t offset) +{ + return (USBD_ADD_BYTES(pc->buffer, offset)); +} + +/*------------------------------------------------------------------------* * usbd_copy_in - copy directly to DMA-able memory *------------------------------------------------------------------------*/ void ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#65 (text+ko) ==== @@ -691,6 +691,7 @@ void usbd_set_desc(device_t dev, struct usbd_device *udev); void *usbd_alloc_mbufs(struct malloc_type *type, struct usbd_ifqueue *ifq, uint32_t block_size, uint16_t block_number); void usbd_get_page(struct usbd_page_cache *cache, uint32_t offset, struct usbd_page_search *res); +void *usbd_get_buffer(struct usbd_page_cache *pc, uint32_t offset); void usbd_copy_in(struct usbd_page_cache *cache, uint32_t offset, const void *ptr, uint32_t len); void usbd_m_copy_in(struct usbd_page_cache *cache, uint32_t dst_offset, struct mbuf *m, uint32_t src_offset, uint32_t src_len); int usbd_uiomove(struct usbd_page_cache *pc, struct uio *uio, uint32_t pc_offset, uint32_t len); From owner-p4-projects@FreeBSD.ORG Sun Dec 2 15:28:41 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 64DF616A421; Sun, 2 Dec 2007 15:28: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 120E316A46E for ; Sun, 2 Dec 2007 15:28:41 +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 F411D13C478 for ; Sun, 2 Dec 2007 15:28:40 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2FSeSc099744 for ; Sun, 2 Dec 2007 15:28:40 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB2FSe23099741 for perforce@freebsd.org; Sun, 2 Dec 2007 15:28:40 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 15:28:40 GMT Message-Id: <200712021528.lB2FSe23099741@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 130024 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 15:28:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=130024 Change 130024 by hselasky@hselasky_laptop001 on 2007/12/02 15:28:01 Fix compiler warnings. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#60 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#60 (text+ko) ==== @@ -2215,13 +2215,13 @@ { struct usbd_xfer *xfer; struct usbd_config uc[1]; - uint32_t level; + uint32_t level = 0; uint32_t start_ticks; uint32_t delta_ticks; uint32_t max_ticks; uint16_t length; uint16_t temp; - usbd_status_t err; + usbd_status_t err = 0; if (timeout < 50) { /* timeout is too small */ From owner-p4-projects@FreeBSD.ORG Sun Dec 2 22:27:45 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B085E16A468; Sun, 2 Dec 2007 22:27: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 C14A716A418 for ; Sun, 2 Dec 2007 22:27:44 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AFDFB13C459 for ; Sun, 2 Dec 2007 22:27:44 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2MRi98099296 for ; Sun, 2 Dec 2007 22:27:44 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB2MRQrU099289 for perforce@freebsd.org; Sun, 2 Dec 2007 22:27:26 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 22:27:26 GMT Message-Id: <200712022227.lB2MRQrU099289@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 130054 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 22:27:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=130054 Change 130054 by hselasky@hselasky_laptop001 on 2007/12/02 22:27:00 IFC @ 130030 Affected files ... .. //depot/projects/usb/src/sys/amd64/amd64/busdma_machdep.c#6 integrate .. //depot/projects/usb/src/sys/amd64/amd64/cpu_switch.S#5 integrate .. //depot/projects/usb/src/sys/amd64/amd64/db_trace.c#4 integrate .. //depot/projects/usb/src/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/usb/src/sys/amd64/amd64/genassym.c#5 integrate .. //depot/projects/usb/src/sys/amd64/amd64/intr_machdep.c#7 integrate .. //depot/projects/usb/src/sys/amd64/amd64/legacy.c#3 integrate .. //depot/projects/usb/src/sys/amd64/amd64/local_apic.c#6 integrate .. //depot/projects/usb/src/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#8 integrate .. //depot/projects/usb/src/sys/amd64/amd64/msi.c#4 integrate .. //depot/projects/usb/src/sys/amd64/amd64/nexus.c#6 integrate .. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/usb/src/sys/amd64/amd64/prof_machdep.c#4 integrate .. //depot/projects/usb/src/sys/amd64/amd64/support.S#6 integrate .. //depot/projects/usb/src/sys/amd64/amd64/trap.c#6 integrate .. //depot/projects/usb/src/sys/amd64/amd64/uma_machdep.c#3 integrate .. //depot/projects/usb/src/sys/amd64/amd64/vm_machdep.c#6 integrate .. //depot/projects/usb/src/sys/amd64/conf/DEFAULTS#5 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#8 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC.hints#3 integrate .. //depot/projects/usb/src/sys/amd64/conf/NOTES#8 integrate .. //depot/projects/usb/src/sys/amd64/include/asm.h#2 integrate .. //depot/projects/usb/src/sys/amd64/include/asmacros.h#3 integrate .. //depot/projects/usb/src/sys/amd64/include/clock.h#3 integrate .. //depot/projects/usb/src/sys/amd64/include/legacyvar.h#2 integrate .. //depot/projects/usb/src/sys/amd64/include/pc/bios.h#2 integrate .. //depot/projects/usb/src/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/usb/src/sys/amd64/include/smp.h#4 integrate .. //depot/projects/usb/src/sys/amd64/include/specialreg.h#6 integrate .. //depot/projects/usb/src/sys/amd64/include/vmparam.h#5 integrate .. //depot/projects/usb/src/sys/amd64/isa/clock.c#5 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux.h#5 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_proto.h#5 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_syscall.h#5 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysent.c#5 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#7 integrate .. //depot/projects/usb/src/sys/amd64/linux32/syscalls.master#5 integrate .. //depot/projects/usb/src/sys/amd64/pci/pci_bus.c#5 integrate .. //depot/projects/usb/src/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/usb/src/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/usb/src/sys/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/usb/src/sys/arm/arm/busdma_machdep.c#7 integrate .. //depot/projects/usb/src/sys/arm/arm/cpufunc.c#5 integrate .. //depot/projects/usb/src/sys/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/projects/usb/src/sys/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/projects/usb/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/projects/usb/src/sys/arm/arm/cpufunc_asm_xscale_c3.S#1 branch .. //depot/projects/usb/src/sys/arm/arm/elf_trampoline.c#5 integrate .. //depot/projects/usb/src/sys/arm/arm/genassym.c#4 integrate .. //depot/projects/usb/src/sys/arm/arm/identcpu.c#4 integrate .. //depot/projects/usb/src/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/usb/src/sys/arm/arm/intr.c#5 integrate .. //depot/projects/usb/src/sys/arm/arm/locore.S#4 integrate .. //depot/projects/usb/src/sys/arm/arm/nexus_io.c#3 delete .. //depot/projects/usb/src/sys/arm/arm/nexus_io_asm.S#2 delete .. //depot/projects/usb/src/sys/arm/arm/pmap.c#8 integrate .. //depot/projects/usb/src/sys/arm/arm/support.S#3 integrate .. //depot/projects/usb/src/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/usb/src/sys/arm/arm/trap.c#6 integrate .. //depot/projects/usb/src/sys/arm/arm/vm_machdep.c#5 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_mci.c#3 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_mcireg.h#2 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_pmc.c#4 integrate .. //depot/projects/usb/src/sys/arm/at91/at91rm92reg.h#3 integrate .. //depot/projects/usb/src/sys/arm/at91/if_ate.c#6 integrate .. //depot/projects/usb/src/sys/arm/at91/kb920x_machdep.c#6 integrate .. //depot/projects/usb/src/sys/arm/at91/ohci_atmelarm.c#12 edit .. //depot/projects/usb/src/sys/arm/at91/std.at91#4 integrate .. //depot/projects/usb/src/sys/arm/at91/std.kb920x#4 integrate .. //depot/projects/usb/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#4 integrate .. //depot/projects/usb/src/sys/arm/conf/AVILA#4 integrate .. //depot/projects/usb/src/sys/arm/conf/BWCT#2 integrate .. //depot/projects/usb/src/sys/arm/conf/CRB#1 branch .. //depot/projects/usb/src/sys/arm/conf/EP80219#4 integrate .. //depot/projects/usb/src/sys/arm/conf/HL200#1 branch .. //depot/projects/usb/src/sys/arm/conf/IQ31244#5 integrate .. //depot/projects/usb/src/sys/arm/conf/KB920X#5 integrate .. //depot/projects/usb/src/sys/arm/conf/SIMICS#5 integrate .. //depot/projects/usb/src/sys/arm/conf/SKYEYE#4 integrate .. //depot/projects/usb/src/sys/arm/include/armreg.h#4 integrate .. //depot/projects/usb/src/sys/arm/include/asm.h#4 integrate .. //depot/projects/usb/src/sys/arm/include/asmacros.h#2 integrate .. //depot/projects/usb/src/sys/arm/include/atomic.h#3 integrate .. //depot/projects/usb/src/sys/arm/include/cpuconf.h#4 integrate .. //depot/projects/usb/src/sys/arm/include/cpufunc.h#5 integrate .. //depot/projects/usb/src/sys/arm/include/endian.h#2 integrate .. //depot/projects/usb/src/sys/arm/include/pmap.h#6 integrate .. //depot/projects/usb/src/sys/arm/include/pte.h#3 integrate .. //depot/projects/usb/src/sys/arm/include/vmparam.h#5 integrate .. //depot/projects/usb/src/sys/arm/sa11x0/assabet_machdep.c#4 integrate .. //depot/projects/usb/src/sys/arm/sa11x0/files.sa11x0#2 integrate .. //depot/projects/usb/src/sys/arm/sa11x0/uart_dev_sa1110.c#5 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/ep80219_machdep.c#5 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/i80321.c#3 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/i80321_pci.c#4 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/i80321_timer.c#4 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/i80321_wdog.c#4 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/i80321var.h#3 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/iq31244_machdep.c#6 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/obio.c#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/i8134x/crb_machdep.c#1 branch .. //depot/projects/usb/src/sys/arm/xscale/i8134x/files.crb#1 branch .. //depot/projects/usb/src/sys/arm/xscale/i8134x/files.i81342#1 branch .. //depot/projects/usb/src/sys/arm/xscale/i8134x/i81342.c#1 branch .. //depot/projects/usb/src/sys/arm/xscale/i8134x/i81342_mcu.c#1 branch .. //depot/projects/usb/src/sys/arm/xscale/i8134x/i81342_pci.c#1 branch .. //depot/projects/usb/src/sys/arm/xscale/i8134x/i81342_space.c#1 branch .. //depot/projects/usb/src/sys/arm/xscale/i8134x/i81342reg.h#1 branch .. //depot/projects/usb/src/sys/arm/xscale/i8134x/i81342var.h#1 branch .. //depot/projects/usb/src/sys/arm/xscale/i8134x/iq81342_7seg.c#1 branch .. //depot/projects/usb/src/sys/arm/xscale/i8134x/iq81342reg.h#1 branch .. //depot/projects/usb/src/sys/arm/xscale/i8134x/iq81342var.h#1 branch .. //depot/projects/usb/src/sys/arm/xscale/i8134x/obio.c#1 branch .. //depot/projects/usb/src/sys/arm/xscale/i8134x/obio_space.c#1 branch .. //depot/projects/usb/src/sys/arm/xscale/i8134x/obiovar.h#1 branch .. //depot/projects/usb/src/sys/arm/xscale/i8134x/std.crb#1 branch .. //depot/projects/usb/src/sys/arm/xscale/i8134x/std.i81342#1 branch .. //depot/projects/usb/src/sys/arm/xscale/i8134x/uart_bus_i81342.c#1 branch .. //depot/projects/usb/src/sys/arm/xscale/i8134x/uart_cpu_i81342.c#1 branch .. //depot/projects/usb/src/sys/arm/xscale/ixp425/avila_machdep.c#5 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_npe.c#4 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_npevar.h#3 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_pci.c#3 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#3 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/boot2/boot2.c#4 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/Makefile#6 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/eeprom.c#4 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/emac.c#6 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/emac_init.c#3 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/lib.h#4 integrate .. //depot/projects/usb/src/sys/boot/common/loader.8#6 integrate .. //depot/projects/usb/src/sys/boot/common/module.c#2 integrate .. //depot/projects/usb/src/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/usb/src/sys/boot/ficl/Makefile#3 integrate .. //depot/projects/usb/src/sys/boot/forth/loader.conf#6 integrate .. //depot/projects/usb/src/sys/boot/i386/Makefile#3 integrate .. //depot/projects/usb/src/sys/boot/i386/boot2/boot2.c#3 integrate .. //depot/projects/usb/src/sys/boot/i386/cdboot/cdboot.s#3 integrate .. //depot/projects/usb/src/sys/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/usb/src/sys/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/usb/src/sys/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/usb/src/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/bioscd.c#3 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/biosdisk.c#4 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/biossmap.c#3 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/devicename.c#3 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/usb/src/sys/boot/i386/loader/main.c#5 integrate .. //depot/projects/usb/src/sys/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/usb/src/sys/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/usb/src/sys/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/boot.c#4 integrate .. //depot/projects/usb/src/sys/boot/pc98/cdboot/cdboot.s#3 integrate .. //depot/projects/usb/src/sys/boot/pc98/libpc98/bioscd.c#3 integrate .. //depot/projects/usb/src/sys/boot/pc98/libpc98/biosdisk.c#3 integrate .. //depot/projects/usb/src/sys/boot/pc98/loader/main.c#4 integrate .. //depot/projects/usb/src/sys/bsm/audit.h#5 integrate .. //depot/projects/usb/src/sys/bsm/audit_internal.h#5 integrate .. //depot/projects/usb/src/sys/bsm/audit_kevents.h#5 integrate .. //depot/projects/usb/src/sys/bsm/audit_record.h#5 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt.c#7 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_all.h#4 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_cd.c#6 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#6 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/usb/src/sys/compat/ia32/ia32_sysvec.c#5 integrate .. //depot/projects/usb/src/sys/compat/linprocfs/linprocfs.c#7 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_file.c#6 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_getcwd.c#3 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.h#3 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_misc.c#7 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_socket.c#5 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_stats.c#5 integrate .. //depot/projects/usb/src/sys/compat/ndis/ndis_var.h#3 integrate .. //depot/projects/usb/src/sys/compat/ndis/ntoskrnl_var.h#3 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_ndis.c#5 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_ntoskrnl.c#5 integrate .. //depot/projects/usb/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate .. //depot/projects/usb/src/sys/compat/opensolaris/rpc/xdr.h#2 integrate .. //depot/projects/usb/src/sys/compat/opensolaris/sys/atomic.h#2 integrate .. //depot/projects/usb/src/sys/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/usb/src/sys/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/usb/src/sys/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/usb/src/sys/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/usb/src/sys/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/usb/src/sys/compat/opensolaris/sys/kcondvar.h#2 integrate .. //depot/projects/usb/src/sys/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/usb/src/sys/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/usb/src/sys/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/usb/src/sys/compat/opensolaris/sys/mutex.h#3 integrate .. //depot/projects/usb/src/sys/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/usb/src/sys/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/usb/src/sys/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/usb/src/sys/compat/opensolaris/sys/proc.h#2 integrate .. //depot/projects/usb/src/sys/compat/opensolaris/sys/rwlock.h#3 integrate .. //depot/projects/usb/src/sys/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/usb/src/sys/compat/opensolaris/sys/time.h#2 integrate .. //depot/projects/usb/src/sys/compat/opensolaris/sys/types.h#2 integrate .. //depot/projects/usb/src/sys/compat/pecoff/imgact_pecoff.c#3 integrate .. //depot/projects/usb/src/sys/compat/svr4/imgact_svr4.c#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_fcntl.c#4 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_misc.c#6 integrate .. //depot/projects/usb/src/sys/conf/Makefile.arm#4 integrate .. //depot/projects/usb/src/sys/conf/NOTES#10 integrate .. //depot/projects/usb/src/sys/conf/files#19 integrate .. //depot/projects/usb/src/sys/conf/files.amd64#6 integrate .. //depot/projects/usb/src/sys/conf/files.arm#5 integrate .. //depot/projects/usb/src/sys/conf/files.i386#6 integrate .. //depot/projects/usb/src/sys/conf/files.ia64#6 integrate .. //depot/projects/usb/src/sys/conf/files.pc98#6 integrate .. //depot/projects/usb/src/sys/conf/files.powerpc#6 integrate .. //depot/projects/usb/src/sys/conf/files.sun4v#3 integrate .. //depot/projects/usb/src/sys/conf/kern.pre.mk#7 integrate .. //depot/projects/usb/src/sys/conf/kmod.mk#7 integrate .. //depot/projects/usb/src/sys/conf/newvers.sh#2 integrate .. //depot/projects/usb/src/sys/conf/options#7 integrate .. //depot/projects/usb/src/sys/conf/options.amd64#4 integrate .. //depot/projects/usb/src/sys/conf/options.arm#6 integrate .. //depot/projects/usb/src/sys/conf/options.i386#4 integrate .. //depot/projects/usb/src/sys/conf/options.ia64#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/evmisc.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/evxface.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#1 branch .. //depot/projects/usb/src/sys/contrib/dev/npe/LICENSE#1 branch .. //depot/projects/usb/src/sys/contrib/dev/wpi/LICENSE#1 branch .. //depot/projects/usb/src/sys/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu#1 branch .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/fil.c#4 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_auth.c#4 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_compat.h#4 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_fil.h#4 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#5 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_frag.c#4 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_htable.c#3 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_log.c#4 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_lookup.c#3 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_lookup.h#3 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_nat.c#4 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_nat.h#3 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_pool.c#3 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_pool.h#3 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_proxy.c#4 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#3 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_scan.c#4 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_state.c#5 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_state.h#3 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_sync.c#4 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ipl.h#4 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#4 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/usb/src/sys/contrib/opensolaris/common/avl/avl.c#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/procset.h#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/vfs.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#2 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/if_pfsync.c#6 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf.c#5 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf_if.c#3 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf_ioctl.c#5 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf_table.c#3 integrate .. //depot/projects/usb/src/sys/ddb/db_examine.c#3 integrate .. //depot/projects/usb/src/sys/ddb/db_ps.c#4 integrate .. //depot/projects/usb/src/sys/dev/aac/aac.c#3 integrate .. //depot/projects/usb/src/sys/dev/aac/aac_cam.c#6 integrate .. //depot/projects/usb/src/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/usb/src/sys/dev/aac/aac_pci.c#4 integrate .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_ibm.c#4 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi.c#8 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_battery.c#4 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_cpu.c#5 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_ec.c#4 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_hpet.c#6 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_pci.c#3 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_pci_link.c#5 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_pcib_acpi.c#4 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_thermal.c#4 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_timer.c#4 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpivar.h#7 integrate .. //depot/projects/usb/src/sys/dev/adlink/adlink.c#3 integrate .. //depot/projects/usb/src/sys/dev/agp/agp.c#1 branch .. //depot/projects/usb/src/sys/dev/agp/agp_ali.c#1 branch .. //depot/projects/usb/src/sys/dev/agp/agp_amd.c#1 branch .. //depot/projects/usb/src/sys/dev/agp/agp_amd64.c#1 branch .. //depot/projects/usb/src/sys/dev/agp/agp_ati.c#1 branch .. //depot/projects/usb/src/sys/dev/agp/agp_i810.c#1 branch .. //depot/projects/usb/src/sys/dev/agp/agp_if.m#1 branch .. //depot/projects/usb/src/sys/dev/agp/agp_intel.c#1 branch .. //depot/projects/usb/src/sys/dev/agp/agp_nvidia.c#1 branch .. //depot/projects/usb/src/sys/dev/agp/agp_sis.c#1 branch .. //depot/projects/usb/src/sys/dev/agp/agp_via.c#1 branch .. //depot/projects/usb/src/sys/dev/agp/agppriv.h#1 branch .. //depot/projects/usb/src/sys/dev/agp/agpreg.h#1 branch .. //depot/projects/usb/src/sys/dev/agp/agpvar.h#1 branch .. //depot/projects/usb/src/sys/dev/aic7xxx/aic7xxx.c#3 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aic_osm_lib.c#3 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aic_osm_lib.h#3 integrate .. //depot/projects/usb/src/sys/dev/amr/amr.c#4 integrate .. //depot/projects/usb/src/sys/dev/amr/amr_cam.c#5 integrate .. //depot/projects/usb/src/sys/dev/an/if_an.c#4 integrate .. //depot/projects/usb/src/sys/dev/an/if_anreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/arcmsr/arcmsr.c#6 integrate .. //depot/projects/usb/src/sys/dev/asmc/asmc.c#1 branch .. //depot/projects/usb/src/sys/dev/asmc/asmcvar.h#1 branch .. //depot/projects/usb/src/sys/dev/ata/ata-all.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.h#5 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-disk.c#8 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-dma.c#4 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.c#4 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-raid.c#5 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-cd.c#5 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-cd.h#3 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-fd.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-tape.c#3 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_rate/amrr/amrr.c#4 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_rate/onoe/onoe.c#4 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath_pci.c#6 integrate .. //depot/projects/usb/src/sys/dev/awi/awi.c#4 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bce.c#7 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bcefw.h#3 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bcereg.h#5 integrate .. //depot/projects/usb/src/sys/dev/bfe/if_bfe.c#5 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/usb/src/sys/dev/bktr/msp34xx.c#2 integrate .. //depot/projects/usb/src/sys/dev/cardbus/cardbus.c#6 integrate .. //depot/projects/usb/src/sys/dev/ce/if_ce.c#4 integrate .. //depot/projects/usb/src/sys/dev/ciss/ciss.c#7 integrate .. //depot/projects/usb/src/sys/dev/cm/smc90cx6.c#4 integrate .. //depot/projects/usb/src/sys/dev/coretemp/coretemp.c#1 branch .. //depot/projects/usb/src/sys/dev/cp/if_cp.c#4 integrate .. //depot/projects/usb/src/sys/dev/ctau/if_ct.c#4 integrate .. //depot/projects/usb/src/sys/dev/cx/if_cx.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_ctl_defs.h#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_mc5.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_sge_defs.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_vsc7323.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_vsc8211.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_include.h#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_ioctl.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_l2t.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_l2t.h#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_lro.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_offload.h#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_osdep.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/sys/mvec.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/t3fw-4.1.0.bin.gz.uu#2 delete .. //depot/projects/usb/src/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#1 branch .. //depot/projects/usb/src/sys/dev/dc/dcphy.c#3 integrate .. //depot/projects/usb/src/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/usb/src/sys/dev/dc/if_dcreg.h#4 integrate .. //depot/projects/usb/src/sys/dev/dcons/dcons_os.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/drmP.h#4 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_agpsupport.c#3 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_dma.c#4 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_80003es2lan.c#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_80003es2lan.h#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_82540.c#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_82541.c#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_82541.h#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_82542.c#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_82543.c#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_82543.h#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_82571.c#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_82571.h#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_82575.c#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_82575.h#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_api.c#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_api.h#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_defines.h#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_hw.h#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_ich8lan.c#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_ich8lan.h#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_mac.c#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_mac.h#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_manage.c#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_manage.h#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_nvm.c#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_nvm.h#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_osdep.h#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_phy.c#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_phy.h#2 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_regs.h#2 integrate .. //depot/projects/usb/src/sys/dev/em/if_em.c#7 integrate .. //depot/projects/usb/src/sys/dev/em/if_em.h#5 integrate .. //depot/projects/usb/src/sys/dev/esp/esp_sbus.c#5 integrate .. //depot/projects/usb/src/sys/dev/fdc/fdc.c#5 integrate .. //depot/projects/usb/src/sys/dev/firewire/firewire.c#5 integrate .. //depot/projects/usb/src/sys/dev/firewire/firewirereg.h#5 integrate .. //depot/projects/usb/src/sys/dev/flash/at45d.c#2 integrate .. //depot/projects/usb/src/sys/dev/gem/if_gem.c#6 integrate .. //depot/projects/usb/src/sys/dev/gem/if_gem_pci.c#4 integrate .. //depot/projects/usb/src/sys/dev/gem/if_gemreg.h#3 integrate .. //depot/projects/usb/src/sys/dev/gem/if_gemvar.h#5 integrate .. //depot/projects/usb/src/sys/dev/hptmv/entry.c#5 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_logging.c#3 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/projects/usb/src/sys/dev/ichsmb/ichsmb_pci.c#3 integrate .. //depot/projects/usb/src/sys/dev/ichwd/ichwd.c#4 integrate .. //depot/projects/usb/src/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/usb/src/sys/dev/idt/idt_pci.c#3 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/usb/src/sys/dev/ipmi/ipmi_isa.c#2 integrate .. //depot/projects/usb/src/sys/dev/ipmi/ipmi_kcs.c#2 integrate .. //depot/projects/usb/src/sys/dev/ipmi/ipmi_smic.c#2 integrate .. //depot/projects/usb/src/sys/dev/ipmi/ipmi_ssif.c#3 integrate .. //depot/projects/usb/src/sys/dev/ipw/if_ipw.c#5 integrate .. //depot/projects/usb/src/sys/dev/ipw/if_ipwreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/ipw/if_ipwvar.h#4 integrate .. //depot/projects/usb/src/sys/dev/iscsi/initiator/isc_cam.c#1 branch .. //depot/projects/usb/src/sys/dev/iscsi/initiator/isc_sm.c#1 branch .. //depot/projects/usb/src/sys/dev/iscsi/initiator/isc_soc.c#1 branch .. //depot/projects/usb/src/sys/dev/iscsi/initiator/isc_subr.c#1 branch .. //depot/projects/usb/src/sys/dev/iscsi/initiator/iscsi.c#1 branch .. //depot/projects/usb/src/sys/dev/iscsi/initiator/iscsi.h#1 branch .. //depot/projects/usb/src/sys/dev/iscsi/initiator/iscsi_subr.c#1 branch .. //depot/projects/usb/src/sys/dev/iscsi/initiator/iscsivar.h#1 branch .. //depot/projects/usb/src/sys/dev/isp/isp_freebsd.c#7 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_freebsd.h#7 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_sbus.c#6 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_target.c#5 integrate .. //depot/projects/usb/src/sys/dev/iwi/if_iwi.c#6 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.c#2 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.h#2 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_82598.c#2 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_api.c#2 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_api.h#2 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_common.c#2 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_common.h#2 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_osdep.h#2 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_phy.c#2 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_phy.h#2 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_type.h#2 integrate .. //depot/projects/usb/src/sys/dev/lge/if_lge.c#4 integrate .. //depot/projects/usb/src/sys/dev/md/md.c#4 integrate .. //depot/projects/usb/src/sys/dev/mfi/mfi.c#7 integrate .. //depot/projects/usb/src/sys/dev/mfi/mfi_cam.c#3 integrate .. //depot/projects/usb/src/sys/dev/mfi/mfi_disk.c#5 integrate .. //depot/projects/usb/src/sys/dev/mfi/mfi_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/mfi/mfireg.h#5 integrate .. //depot/projects/usb/src/sys/dev/mfi/mfivar.h#6 integrate .. //depot/projects/usb/src/sys/dev/mii/amphy.c#4 integrate .. //depot/projects/usb/src/sys/dev/mii/e1000phy.c#4 integrate .. //depot/projects/usb/src/sys/dev/mii/e1000phyreg.h#3 integrate .. //depot/projects/usb/src/sys/dev/mii/gentbi.c#3 integrate .. //depot/projects/usb/src/sys/dev/mii/miidevs#6 integrate .. //depot/projects/usb/src/sys/dev/mii/nsphy.c#4 integrate .. //depot/projects/usb/src/sys/dev/mii/rgephy.c#4 integrate .. //depot/projects/usb/src/sys/dev/mii/rgephyreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/mii/rlphy.c#6 integrate .. //depot/projects/usb/src/sys/dev/mii/tdkphy.c#4 integrate .. //depot/projects/usb/src/sys/dev/mii/ukphy_subr.c#2 integrate .. //depot/projects/usb/src/sys/dev/mmc/mmcsd.c#4 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt.c#6 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt.h#7 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_cam.c#7 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_pci.c#6 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_raid.c#5 integrate .. //depot/projects/usb/src/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/usb/src/sys/dev/msk/if_mskreg.h#4 integrate .. //depot/projects/usb/src/sys/dev/mxge/eth_z8e.dat.gz.uu#6 delete .. //depot/projects/usb/src/sys/dev/mxge/eth_z8e.h#1 branch .. //depot/projects/usb/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#6 delete .. //depot/projects/usb/src/sys/dev/mxge/ethp_z8e.h#1 branch .. //depot/projects/usb/src/sys/dev/mxge/if_mxge.c#6 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge_var.h#5 integrate .. //depot/projects/usb/src/sys/dev/mxge/mxge_eth_z8e.c#1 branch .. //depot/projects/usb/src/sys/dev/mxge/mxge_ethp_z8e.c#1 branch .. //depot/projects/usb/src/sys/dev/mxge/mxge_mcp.h#5 integrate .. //depot/projects/usb/src/sys/dev/my/if_my.c#5 integrate .. //depot/projects/usb/src/sys/dev/nfe/if_nfe.c#5 integrate .. //depot/projects/usb/src/sys/dev/nfe/if_nfevar.h#4 integrate .. //depot/projects/usb/src/sys/dev/nge/if_nge.c#5 integrate .. //depot/projects/usb/src/sys/dev/nmdm/nmdm.c#3 integrate .. //depot/projects/usb/src/sys/dev/nve/if_nve.c#5 integrate .. //depot/projects/usb/src/sys/dev/nvram/nvram.c#1 branch .. //depot/projects/usb/src/sys/dev/nxge/if_nxge.c#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/if_nxge.h#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/include/build-version.h#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/include/version.h#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/include/xge-debug.h#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/include/xge-defs.h#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/include/xge-list.h#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/include/xge-os-pal.h#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/include/xge-os-template.h#2 delete .. //depot/projects/usb/src/sys/dev/nxge/include/xge-queue.h#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/include/xgehal-channel.h#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/include/xgehal-config.h#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/include/xgehal-device.h#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/include/xgehal-driver.h#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/include/xgehal-event.h#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/include/xgehal-fifo.h#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/include/xgehal-mgmt.h#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/include/xgehal-mgmtaux.h#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/include/xgehal-mm.h#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/include/xgehal-regs.h#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/include/xgehal-ring.h#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/include/xgehal-stats.h#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/include/xgehal-types.h#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/include/xgehal.h#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/xge-osdep.h#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/xgehal/xge-queue.c#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/xgehal/xgehal-channel-fp.c#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/xgehal/xgehal-channel.c#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/xgehal/xgehal-config.c#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/xgehal/xgehal-device-fp.c#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/xgehal/xgehal-device.c#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/xgehal/xgehal-driver.c#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/xgehal/xgehal-fifo-fp.c#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/xgehal/xgehal-fifo.c#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/xgehal/xgehal-mgmt.c#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/xgehal/xgehal-mgmtaux.c#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/xgehal/xgehal-mm.c#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/xgehal/xgehal-ring-fp.c#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/xgehal/xgehal-ring.c#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/xgehal/xgehal-stats.c#2 integrate .. //depot/projects/usb/src/sys/dev/nxge/xgell-version.h#2 integrate .. //depot/projects/usb/src/sys/dev/ofw/ofw_disk.c#2 integrate .. //depot/projects/usb/src/sys/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/usb/src/sys/dev/pccard/pccarddevs#5 integrate .. //depot/projects/usb/src/sys/dev/pccbb/pccbb.c#7 integrate .. //depot/projects/usb/src/sys/dev/pccbb/pccbb_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/pccbb/pccbbvar.h#5 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#7 integrate .. //depot/projects/usb/src/sys/dev/pci/pci_pci.c#6 integrate .. //depot/projects/usb/src/sys/dev/pci/pci_private.h#4 integrate .. //depot/projects/usb/src/sys/dev/pci/pci_user.c#3 integrate .. //depot/projects/usb/src/sys/dev/pci/pcib_private.h#4 integrate .. //depot/projects/usb/src/sys/dev/pci/pcireg.h#6 integrate .. //depot/projects/usb/src/sys/dev/pci/pcivar.h#6 integrate .. //depot/projects/usb/src/sys/dev/puc/puc_pci.c#3 integrate .. //depot/projects/usb/src/sys/dev/ral/rt2560.c#6 integrate .. //depot/projects/usb/src/sys/dev/ral/rt2661.c#6 integrate .. //depot/projects/usb/src/sys/dev/random/harvest.c#2 integrate .. //depot/projects/usb/src/sys/dev/random/randomdev_soft.c#4 integrate .. //depot/projects/usb/src/sys/dev/random/yarrow.c#3 integrate .. //depot/projects/usb/src/sys/dev/ray/if_ray.c#4 integrate .. //depot/projects/usb/src/sys/dev/re/if_re.c#6 integrate .. //depot/projects/usb/src/sys/dev/safe/safe.c#4 integrate .. //depot/projects/usb/src/sys/dev/si/si_pci.c#3 integrate .. //depot/projects/usb/src/sys/dev/sio/sio.c#4 integrate .. //depot/projects/usb/src/sys/dev/sio/sio_isa.c#2 integrate .. //depot/projects/usb/src/sys/dev/sio/sio_puc.c#2 integrate .. //depot/projects/usb/src/sys/dev/sk/if_sk.c#7 integrate .. //depot/projects/usb/src/sys/dev/sound/isa/ad1816.c#4 integrate .. //depot/projects/usb/src/sys/dev/sound/isa/ad1816.h#3 integrate .. //depot/projects/usb/src/sys/dev/sound/midi/sequencer.c#5 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/atiixp.c#5 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/atiixp.h#3 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/emu10kx-midi.c#2 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/emu10kx-pcm.c#5 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/emu10kx.c#7 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/emu10kx.h#3 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/envy24.c#6 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/envy24ht.c#5 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#5 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/t4dwave.c#4 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/ac97.c#5 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/ac97_patch.c#5 integrate .. //depot/projects/usb/src/sys/dev/sound/sbus/cs4231.c#5 integrate .. //depot/projects/usb/src/sys/dev/stge/if_stge.c#5 integrate .. //depot/projects/usb/src/sys/dev/streams/streams.c#4 integrate .. //depot/projects/usb/src/sys/dev/sym/sym_hipd.c#5 integrate .. //depot/projects/usb/src/sys/dev/syscons/syscons.c#5 integrate .. //depot/projects/usb/src/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/usb/src/sys/dev/ti/if_ti.c#5 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_cl_init.c#3 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_cl_intr.c#3 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_cl_io.c#3 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_cl_misc.c#3 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_cl_share.h#3 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_osl.h#4 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_osl_cam.c#6 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_osl_freebsd.c#5 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_osl_share.h#5 integrate .. //depot/projects/usb/src/sys/dev/txp/if_txp.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/ehci.c#56 edit .. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#29 edit .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#39 edit .. //depot/projects/usb/src/sys/dev/usb/if_axereg.h#18 edit .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#35 edit .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#42 edit .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#31 edit .. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#28 edit .. //depot/projects/usb/src/sys/dev/usb/uipaq.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#31 edit .. //depot/projects/usb/src/sys/dev/usb/umodem.c#34 edit .. //depot/projects/usb/src/sys/dev/usb/ums.c#30 edit .. //depot/projects/usb/src/sys/dev/usb/usb.c#25 edit .. //depot/projects/usb/src/sys/dev/usb/usb_port.h#21 edit .. //depot/projects/usb/src/sys/dev/usb/usb_quirks.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#65 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#15 integrate .. //depot/projects/usb/src/sys/dev/usb/uscanner.c#17 edit .. //depot/projects/usb/src/sys/dev/utopia/utopia.c#2 integrate .. //depot/projects/usb/src/sys/dev/vge/if_vge.c#5 integrate .. //depot/projects/usb/src/sys/dev/vx/if_vx_pci.c#3 integrate .. //depot/projects/usb/src/sys/dev/wi/if_wi.c#6 integrate .. //depot/projects/usb/src/sys/dev/wpi/if_wpi.c#1 branch .. //depot/projects/usb/src/sys/dev/wpi/if_wpireg.h#1 branch .. //depot/projects/usb/src/sys/dev/wpi/if_wpivar.h#1 branch .. //depot/projects/usb/src/sys/fs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/usb/src/sys/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/usb/src/sys/fs/coda/coda_vnops.c#2 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_devs.c#5 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/usb/src/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate .. //depot/projects/usb/src/sys/fs/fifofs/fifo_vnops.c#4 integrate .. //depot/projects/usb/src/sys/fs/hpfs/hpfs_vfsops.c#4 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/denode.h#4 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/direntry.h#3 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_conv.c#3 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_denode.c#4 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_fat.c#4 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_fileno.c#2 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_iconv.c#2 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_lookup.c#2 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_vfsops.c#6 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_vnops.c#5 integrate .. //depot/projects/usb/src/sys/fs/ntfs/ntfs_ihash.c#2 integrate .. //depot/projects/usb/src/sys/fs/ntfs/ntfs_vfsops.c#4 integrate .. //depot/projects/usb/src/sys/fs/nullfs/null_subr.c#3 integrate .. //depot/projects/usb/src/sys/fs/nullfs/null_vfsops.c#6 integrate .. //depot/projects/usb/src/sys/fs/nullfs/null_vnops.c#6 integrate .. //depot/projects/usb/src/sys/fs/nwfs/nwfs_vfsops.c#3 integrate .. //depot/projects/usb/src/sys/fs/portalfs/portal_vfsops.c#4 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs_status.c#4 integrate .. //depot/projects/usb/src/sys/fs/pseudofs/pseudofs.c#3 integrate .. //depot/projects/usb/src/sys/fs/pseudofs/pseudofs_vnops.c#5 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_vfsops.c#4 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/usb/src/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/usb/src/sys/fs/unionfs/union.h#4 integrate .. //depot/projects/usb/src/sys/fs/unionfs/union_subr.c#5 integrate .. //depot/projects/usb/src/sys/fs/unionfs/union_vfsops.c#4 integrate .. //depot/projects/usb/src/sys/fs/unionfs/union_vnops.c#7 integrate .. //depot/projects/usb/src/sys/geom/bde/g_bde.c#2 integrate .. //depot/projects/usb/src/sys/geom/bde/g_bde_work.c#3 integrate .. //depot/projects/usb/src/sys/geom/eli/g_eli.c#6 integrate .. //depot/projects/usb/src/sys/geom/eli/g_eli.h#4 integrate .. //depot/projects/usb/src/sys/geom/eli/g_eli_crypto.c#3 integrate .. //depot/projects/usb/src/sys/geom/geom_event.c#3 integrate .. //depot/projects/usb/src/sys/geom/geom_io.c#6 integrate .. //depot/projects/usb/src/sys/geom/journal/g_journal.c#4 integrate .. //depot/projects/usb/src/sys/geom/label/g_label_reiserfs.c#2 integrate .. //depot/projects/usb/src/sys/geom/mirror/g_mirror.c#5 integrate .. //depot/projects/usb/src/sys/geom/multipath/g_multipath.c#2 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.c#4 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.h#4 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_apm.c#4 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_gpt.c#4 integrate .. //depot/projects/usb/src/sys/geom/raid3/g_raid3.c#5 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_init.c#2 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/projects/usb/src/sys/geom/virstor/binstream.c#1 branch .. //depot/projects/usb/src/sys/geom/virstor/binstream.h#1 branch .. //depot/projects/usb/src/sys/geom/virstor/g_virstor.c#1 branch .. //depot/projects/usb/src/sys/geom/virstor/g_virstor.h#1 branch .. //depot/projects/usb/src/sys/geom/virstor/g_virstor_md.c#1 branch .. //depot/projects/usb/src/sys/geom/virstor/g_virstor_md.h#1 branch .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate .. //depot/projects/usb/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#5 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#6 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#3 integrate .. //depot/projects/usb/src/sys/i386/acpica/madt.c#5 integrate .. //depot/projects/usb/src/sys/i386/bios/apm.c#3 integrate .. //depot/projects/usb/src/sys/i386/conf/DEFAULTS#5 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC#7 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC.hints#2 integrate .. //depot/projects/usb/src/sys/i386/conf/NOTES#7 integrate .. //depot/projects/usb/src/sys/i386/conf/PAE#5 integrate .. //depot/projects/usb/src/sys/i386/conf/XBOX#3 integrate .. //depot/projects/usb/src/sys/i386/i386/busdma_machdep.c#6 integrate .. //depot/projects/usb/src/sys/i386/i386/genassym.c#4 integrate .. //depot/projects/usb/src/sys/i386/i386/geode.c#3 integrate .. //depot/projects/usb/src/sys/i386/i386/in_cksum.c#2 integrate .. //depot/projects/usb/src/sys/i386/i386/intr_machdep.c#7 integrate .. //depot/projects/usb/src/sys/i386/i386/legacy.c#3 integrate .. //depot/projects/usb/src/sys/i386/i386/local_apic.c#6 integrate .. //depot/projects/usb/src/sys/i386/i386/locore.s#4 integrate .. //depot/projects/usb/src/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/usb/src/sys/i386/i386/mp_machdep.c#7 integrate .. //depot/projects/usb/src/sys/i386/i386/msi.c#4 integrate .. //depot/projects/usb/src/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/usb/src/sys/i386/i386/support.s#6 integrate .. //depot/projects/usb/src/sys/i386/i386/swtch.s#4 integrate .. //depot/projects/usb/src/sys/i386/i386/trap.c#6 integrate .. //depot/projects/usb/src/sys/i386/i386/vm_machdep.c#6 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_misc.c#5 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/imgact_coff.c#4 integrate .. //depot/projects/usb/src/sys/i386/include/asm.h#2 integrate .. //depot/projects/usb/src/sys/i386/include/asmacros.h#3 integrate .. //depot/projects/usb/src/sys/i386/include/bootinfo.h#2 integrate .. //depot/projects/usb/src/sys/i386/include/clock.h#3 integrate .. //depot/projects/usb/src/sys/i386/include/cpufunc.h#2 integrate .. //depot/projects/usb/src/sys/i386/include/in_cksum.h#2 integrate .. //depot/projects/usb/src/sys/i386/include/legacyvar.h#2 integrate .. //depot/projects/usb/src/sys/i386/include/pc/bios.h#2 integrate .. //depot/projects/usb/src/sys/i386/include/pmap.h#5 integrate .. //depot/projects/usb/src/sys/i386/include/smp.h#4 integrate .. //depot/projects/usb/src/sys/i386/include/specialreg.h#6 integrate .. //depot/projects/usb/src/sys/i386/include/vmparam.h#5 integrate .. //depot/projects/usb/src/sys/i386/isa/clock.c#6 integrate .. //depot/projects/usb/src/sys/i386/isa/isa.c#3 integrate .. //depot/projects/usb/src/sys/i386/isa/prof_machdep.c#4 integrate .. //depot/projects/usb/src/sys/i386/linux/imgact_linux.c#3 integrate .. //depot/projects/usb/src/sys/i386/linux/linux.h#5 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_machdep.c#7 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_proto.h#5 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_ptrace.c#2 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_syscall.h#5 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_sysent.c#5 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/usb/src/sys/i386/linux/syscalls.master#5 integrate .. //depot/projects/usb/src/sys/i386/pci/pci_bus.c#5 integrate .. //depot/projects/usb/src/sys/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/usb/src/sys/i4b/layer1/isic/i4b_avm_a1.c#4 integrate .. //depot/projects/usb/src/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#4 integrate .. //depot/projects/usb/src/sys/i4b/layer1/isic/i4b_isic.c#3 integrate .. //depot/projects/usb/src/sys/i4b/layer1/isic/i4b_itk_ix1.c#4 integrate .. //depot/projects/usb/src/sys/i4b/layer1/isic/i4b_tel_s016.c#4 integrate .. //depot/projects/usb/src/sys/i4b/layer1/isic/i4b_tel_s0163.c#4 integrate .. //depot/projects/usb/src/sys/i4b/layer1/isic/i4b_tel_s08.c#4 integrate .. //depot/projects/usb/src/sys/ia64/conf/GENERIC#6 integrate .. //depot/projects/usb/src/sys/ia64/disasm/disasm.h#3 integrate .. //depot/projects/usb/src/sys/ia64/ia64/busdma_machdep.c#6 integrate .. //depot/projects/usb/src/sys/ia64/ia64/clock.c#3 integrate .. //depot/projects/usb/src/sys/ia64/ia64/db_machdep.c#4 integrate .. //depot/projects/usb/src/sys/ia64/ia64/exception.S#4 integrate .. //depot/projects/usb/src/sys/ia64/ia64/interrupt.c#5 integrate .. //depot/projects/usb/src/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/usb/src/sys/ia64/ia64/mp_machdep.c#4 integrate .. //depot/projects/usb/src/sys/ia64/ia64/nexus.c#4 integrate .. //depot/projects/usb/src/sys/ia64/ia64/pmap.c#9 integrate .. //depot/projects/usb/src/sys/ia64/ia64/sapic.c#2 integrate .. //depot/projects/usb/src/sys/ia64/ia64/support.S#4 integrate .. //depot/projects/usb/src/sys/ia64/ia64/syscall.S#2 integrate .. //depot/projects/usb/src/sys/ia64/ia64/trap.c#6 integrate .. //depot/projects/usb/src/sys/ia64/ia64/uma_machdep.c#3 integrate .. //depot/projects/usb/src/sys/ia64/ia64/vm_machdep.c#3 integrate .. //depot/projects/usb/src/sys/ia64/include/atomic.h#2 integrate .. //depot/projects/usb/src/sys/ia64/include/ia64_cpu.h#3 integrate .. //depot/projects/usb/src/sys/ia64/include/intr.h#3 integrate .. //depot/projects/usb/src/sys/ia64/include/md_var.h#3 integrate .. //depot/projects/usb/src/sys/ia64/include/sapicvar.h#2 integrate .. //depot/projects/usb/src/sys/ia64/include/vmparam.h#6 integrate .. //depot/projects/usb/src/sys/kern/imgact_aout.c#2 integrate .. //depot/projects/usb/src/sys/kern/imgact_elf.c#4 integrate .. //depot/projects/usb/src/sys/kern/imgact_gzip.c#2 integrate .. //depot/projects/usb/src/sys/kern/init_main.c#7 integrate .. //depot/projects/usb/src/sys/kern/init_sysent.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_acct.c#6 integrate .. //depot/projects/usb/src/sys/kern/kern_alq.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_clock.c#6 integrate .. //depot/projects/usb/src/sys/kern/kern_cpu.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_descrip.c#7 integrate .. //depot/projects/usb/src/sys/kern/kern_environment.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_exec.c#7 integrate .. //depot/projects/usb/src/sys/kern/kern_exit.c#7 integrate .. //depot/projects/usb/src/sys/kern/kern_fork.c#7 integrate .. //depot/projects/usb/src/sys/kern/kern_idle.c#4 integrate .. //depot/projects/usb/src/sys/kern/kern_intr.c#7 integrate .. //depot/projects/usb/src/sys/kern/kern_jail.c#4 integrate .. //depot/projects/usb/src/sys/kern/kern_kse.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_kthread.c#4 integrate .. //depot/projects/usb/src/sys/kern/kern_ktrace.c#6 integrate .. //depot/projects/usb/src/sys/kern/kern_linker.c#6 integrate .. //depot/projects/usb/src/sys/kern/kern_lock.c#6 integrate .. //depot/projects/usb/src/sys/kern/kern_lockf.c#3 integrate .. //depot/projects/usb/src/sys/kern/kern_mbuf.c#6 integrate .. //depot/projects/usb/src/sys/kern/kern_mutex.c#7 integrate .. //depot/projects/usb/src/sys/kern/kern_poll.c#4 integrate .. //depot/projects/usb/src/sys/kern/kern_proc.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_prot.c#6 integrate .. //depot/projects/usb/src/sys/kern/kern_resource.c#7 integrate .. //depot/projects/usb/src/sys/kern/kern_rmlock.c#1 branch .. //depot/projects/usb/src/sys/kern/kern_rwlock.c#7 integrate .. //depot/projects/usb/src/sys/kern/kern_shutdown.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_sig.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_switch.c#6 integrate .. //depot/projects/usb/src/sys/kern/kern_sx.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_synch.c#7 integrate .. //depot/projects/usb/src/sys/kern/kern_sysctl.c#6 integrate .. //depot/projects/usb/src/sys/kern/kern_thr.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_thread.c#7 integrate .. //depot/projects/usb/src/sys/kern/kern_timeout.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_umtx.c#6 integrate .. //depot/projects/usb/src/sys/kern/link_elf.c#6 integrate .. //depot/projects/usb/src/sys/kern/link_elf_obj.c#5 integrate .. //depot/projects/usb/src/sys/kern/linker_if.m#2 integrate .. //depot/projects/usb/src/sys/kern/p1003_1b.c#3 integrate .. //depot/projects/usb/src/sys/kern/sched_4bsd.c#6 integrate .. //depot/projects/usb/src/sys/kern/sched_ule.c#6 integrate .. //depot/projects/usb/src/sys/kern/subr_bus.c#8 integrate .. //depot/projects/usb/src/sys/kern/subr_clock.c#3 integrate .. //depot/projects/usb/src/sys/kern/subr_kdb.c#3 integrate .. //depot/projects/usb/src/sys/kern/subr_lock.c#6 integrate .. //depot/projects/usb/src/sys/kern/subr_param.c#2 integrate .. //depot/projects/usb/src/sys/kern/subr_pcpu.c#2 integrate .. //depot/projects/usb/src/sys/kern/subr_sleepqueue.c#5 integrate .. //depot/projects/usb/src/sys/kern/subr_smp.c#4 integrate .. //depot/projects/usb/src/sys/kern/subr_stack.c#3 integrate .. //depot/projects/usb/src/sys/kern/subr_taskqueue.c#4 integrate .. //depot/projects/usb/src/sys/kern/subr_trap.c#6 integrate .. //depot/projects/usb/src/sys/kern/subr_turnstile.c#6 integrate .. //depot/projects/usb/src/sys/kern/subr_witness.c#6 integrate .. //depot/projects/usb/src/sys/kern/sys_generic.c#7 integrate .. //depot/projects/usb/src/sys/kern/sys_pipe.c#6 integrate .. //depot/projects/usb/src/sys/kern/sys_process.c#6 integrate .. //depot/projects/usb/src/sys/kern/sys_socket.c#5 integrate .. //depot/projects/usb/src/sys/kern/syscalls.c#5 integrate .. //depot/projects/usb/src/sys/kern/syscalls.master#5 integrate .. //depot/projects/usb/src/sys/kern/systrace_args.c#4 integrate .. //depot/projects/usb/src/sys/kern/sysv_msg.c#6 integrate .. //depot/projects/usb/src/sys/kern/sysv_sem.c#6 integrate .. //depot/projects/usb/src/sys/kern/sysv_shm.c#5 integrate .. //depot/projects/usb/src/sys/kern/tty.c#5 integrate .. //depot/projects/usb/src/sys/kern/tty_pty.c#4 integrate .. //depot/projects/usb/src/sys/kern/uipc_domain.c#4 integrate .. //depot/projects/usb/src/sys/kern/uipc_mbuf.c#6 integrate .. //depot/projects/usb/src/sys/kern/uipc_mbuf2.c#3 integrate .. //depot/projects/usb/src/sys/kern/uipc_sem.c#5 integrate .. //depot/projects/usb/src/sys/kern/uipc_sockbuf.c#5 integrate .. //depot/projects/usb/src/sys/kern/uipc_socket.c#7 integrate .. //depot/projects/usb/src/sys/kern/uipc_syscalls.c#7 integrate .. //depot/projects/usb/src/sys/kern/uipc_usrreq.c#7 integrate .. //depot/projects/usb/src/sys/kern/vfs_acl.c#2 integrate .. //depot/projects/usb/src/sys/kern/vfs_aio.c#6 integrate .. //depot/projects/usb/src/sys/kern/vfs_bio.c#7 integrate .. //depot/projects/usb/src/sys/kern/vfs_cache.c#5 integrate .. //depot/projects/usb/src/sys/kern/vfs_extattr.c#2 integrate .. //depot/projects/usb/src/sys/kern/vfs_lookup.c#6 integrate .. //depot/projects/usb/src/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/usb/src/sys/kern/vfs_syscalls.c#7 integrate .. //depot/projects/usb/src/sys/kern/vfs_vnops.c#7 integrate .. //depot/projects/usb/src/sys/libkern/arm/ffs.S#2 integrate .. //depot/projects/usb/src/sys/modules/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/acpi/acpi/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/agp/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/asmc/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/coretemp/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/cxgb/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/geom/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/geom/geom_virstor/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/iscsi/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/iscsi/initiator/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/ixgbe/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/mxge/mxge_eth_z8e/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/mxge/mxge_ethp_z8e/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/netgraph/bluetooth/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/nvram/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/nxge/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/sound/driver/emu10kx/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/uchcom/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/wpi/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/wpifw/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/zfs/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/zyd/Makefile#1 branch .. //depot/projects/usb/src/sys/net/bpf.c#6 integrate .. //depot/projects/usb/src/sys/net/bpf.h#4 integrate .. //depot/projects/usb/src/sys/net/bpf_filter.c#3 integrate .. //depot/projects/usb/src/sys/net/bpfdesc.h#5 integrate .. //depot/projects/usb/src/sys/net/bridgestp.c#6 integrate .. //depot/projects/usb/src/sys/net/bridgestp.h#4 integrate .. //depot/projects/usb/src/sys/net/bsd_comp.c#3 integrate .. //depot/projects/usb/src/sys/net/ethernet.h#6 integrate .. //depot/projects/usb/src/sys/net/ieee8023ad_lacp.c#5 integrate .. //depot/projects/usb/src/sys/net/if.c#6 integrate .. //depot/projects/usb/src/sys/net/if_atmsubr.c#4 integrate .. //depot/projects/usb/src/sys/net/if_bridge.c#6 integrate .. //depot/projects/usb/src/sys/net/if_bridgevar.h#5 integrate .. //depot/projects/usb/src/sys/net/if_disc.c#4 integrate .. //depot/projects/usb/src/sys/net/if_enc.c#3 integrate .. //depot/projects/usb/src/sys/net/if_ethersubr.c#6 integrate .. //depot/projects/usb/src/sys/net/if_fddisubr.c#3 integrate .. //depot/projects/usb/src/sys/net/if_fwsubr.c#6 integrate .. //depot/projects/usb/src/sys/net/if_gif.c#4 integrate .. //depot/projects/usb/src/sys/net/if_iso88025subr.c#3 integrate .. //depot/projects/usb/src/sys/net/if_lagg.c#5 integrate .. //depot/projects/usb/src/sys/net/if_lagg.h#4 integrate .. //depot/projects/usb/src/sys/net/if_loop.c#5 integrate .. //depot/projects/usb/src/sys/net/if_media.h#5 integrate .. //depot/projects/usb/src/sys/net/if_ppp.c#6 integrate .. //depot/projects/usb/src/sys/net/if_stf.c#4 integrate .. //depot/projects/usb/src/sys/net/if_tun.c#5 integrate .. //depot/projects/usb/src/sys/net/if_vlan.c#5 integrate .. //depot/projects/usb/src/sys/net/netisr.c#3 integrate .. //depot/projects/usb/src/sys/net/pfil.c#2 integrate .. //depot/projects/usb/src/sys/net/pfil.h#3 integrate .. //depot/projects/usb/src/sys/net/route.c#5 integrate .. //depot/projects/usb/src/sys/net/rtsock.c#5 integrate .. //depot/projects/usb/src/sys/net80211/_ieee80211.h#5 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211.c#6 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211.h#5 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.c#5 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.h#6 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ht.h#2 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_input.c#6 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.c#6 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.h#4 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_node.c#6 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_node.h#4 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_output.c#6 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_power.c#2 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_proto.c#6 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_proto.h#6 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_regdomain.c#2 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_scan.c#2 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_scan_ap.c#2 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_var.h#6 integrate .. //depot/projects/usb/src/sys/netatalk/aarp.c#3 integrate .. //depot/projects/usb/src/sys/netatalk/ddp_input.c#3 integrate .. //depot/projects/usb/src/sys/netatalk/ddp_output.c#3 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/h4/TODO#2 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#4 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h#2 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h#2 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#5 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#4 integrate .. //depot/projects/usb/src/sys/netgraph/netflow/netflow.c#3 integrate .. //depot/projects/usb/src/sys/netgraph/netgraph.h#4 integrate .. //depot/projects/usb/src/sys/netgraph/ng_base.c#6 integrate .. //depot/projects/usb/src/sys/netgraph/ng_bpf.c#2 integrate .. //depot/projects/usb/src/sys/netgraph/ng_cisco.c#2 integrate .. //depot/projects/usb/src/sys/netgraph/ng_eiface.c#4 integrate .. //depot/projects/usb/src/sys/netgraph/ng_l2tp.c#3 integrate .. //depot/projects/usb/src/sys/netgraph/ng_ppp.c#5 integrate .. //depot/projects/usb/src/sys/netgraph/ng_ppp.h#3 integrate .. //depot/projects/usb/src/sys/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/usb/src/sys/netgraph/ng_socket.c#5 integrate .. //depot/projects/usb/src/sys/netinet/accf_data.c#2 integrate .. //depot/projects/usb/src/sys/netinet/accf_http.c#2 integrate .. //depot/projects/usb/src/sys/netinet/icmp_var.h#2 integrate .. //depot/projects/usb/src/sys/netinet/if_ether.c#6 integrate .. //depot/projects/usb/src/sys/netinet/igmp.c#3 integrate .. //depot/projects/usb/src/sys/netinet/in.c#6 integrate .. //depot/projects/usb/src/sys/netinet/in_cksum.c#3 integrate .. //depot/projects/usb/src/sys/netinet/in_gif.c#4 integrate .. //depot/projects/usb/src/sys/netinet/in_mcast.c#2 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.c#7 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.h#6 integrate .. //depot/projects/usb/src/sys/netinet/in_proto.c#5 integrate .. //depot/projects/usb/src/sys/netinet/in_rmx.c#4 integrate .. //depot/projects/usb/src/sys/netinet/ip.h#4 integrate .. //depot/projects/usb/src/sys/netinet/ip_carp.c#6 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 2 22:36:55 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88D4216A421; Sun, 2 Dec 2007 22:36:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E7B2A16A41A for ; Sun, 2 Dec 2007 22:36:54 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D9A7213C46A for ; Sun, 2 Dec 2007 22:36:54 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2Mas7P000848 for ; Sun, 2 Dec 2007 22:36:54 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB2MasBK000845 for perforce@freebsd.org; Sun, 2 Dec 2007 22:36:54 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 22:36:54 GMT Message-Id: <200712022236.lB2MasBK000845@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 130056 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 22:36:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=130056 Change 130056 by hselasky@hselasky_laptop001 on 2007/12/02 22:35:58 Update "if_rum.c" according to "if_ural.c" in change 130054 . Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_rum.c#18 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_rum.c#18 (text+ko) ==== @@ -1320,6 +1320,8 @@ uint32_t temp_len; uint8_t align; + ic->ic_lastdata = ticks; + if (m->m_pkthdr.len > MCLBYTES) { DPRINTF(sc, 0, "data overflow, %u bytes\n", m->m_pkthdr.len); @@ -1425,6 +1427,17 @@ wh = mtod(m, struct ieee80211_frame *); + if (wh->i_fc[1] & IEEE80211_FC1_WEP) { + k = ieee80211_crypto_encap(ic, ni, m); + if (k == NULL) { + goto error; + } + /* + * packet header may have moved, reset our + * local pointer + */ + wh = mtod(m, struct ieee80211_frame *); + } if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) { flags |= RT2573_TX_NEED_ACK; @@ -1455,6 +1468,12 @@ if (m) { + /* + * Cancel any background scan. + */ + if (ic->ic_flags & IEEE80211_F_SCAN) { + ieee80211_cancel_scan(ic); + } if (m->m_len < sizeof(struct ether_header)) { m = m_pullup(m, sizeof(struct ether_header)); @@ -2677,7 +2696,6 @@ struct rum_config_copy *cc, uint16_t refcount) { struct rum_tx_desc desc; - struct ieee80211com *ic = &(sc->sc_ic); struct ieee80211_node *ni = sc->sc_ic.ic_bss; struct mbuf *m; uint16_t rate; @@ -2685,7 +2703,7 @@ if ((sc->sc_flags & RUM_FLAG_LL_READY) && (sc->sc_flags & RUM_FLAG_HL_READY)) { - m = ieee80211_beacon_alloc(ic, ic->ic_bss, &sc->sc_bo); + m = ieee80211_beacon_alloc(ni, &sc->sc_bo); if (m == NULL) { return; } From owner-p4-projects@FreeBSD.ORG Sun Dec 2 22:58:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9AA1A16A46E; Sun, 2 Dec 2007 22:58: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 4394116A468 for ; Sun, 2 Dec 2007 22:58:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 34D6E13C457 for ; Sun, 2 Dec 2007 22:58:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2MwNf8003782 for ; Sun, 2 Dec 2007 22:58:23 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB2MwHZC003779 for perforce@freebsd.org; Sun, 2 Dec 2007 22:58:17 GMT (envelope-from jb@freebsd.org) Date: Sun, 2 Dec 2007 22:58:17 GMT Message-Id: <200712022258.lB2MwHZC003779@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130058 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 22:58:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=130058 Change 130058 by jb@jb_freebsd1 on 2007/12/02 22:57:28 IFC Affected files ... .. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/cutting-edge/chapter.sgml#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/CHANGES#8 integrate .. //depot/projects/dtrace/src/contrib/bind9/COPYRIGHT#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/FAQ#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/FAQ.xml#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/Makefile.in#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/README#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/check/check-tool.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/check/named-checkconf.8#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/check/named-checkconf.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/check/named-checkconf.html#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/check/named-checkzone.8#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/check/named-checkzone.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/check/named-checkzone.docbook#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/check/named-checkzone.html#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/dig.1#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/dig.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/dig.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/dig.html#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/dighost.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/host.1#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/host.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/host.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/host.html#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/include/dig/dig.h#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/nslookup.1#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/nslookup.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/nslookup.docbook#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dig/nslookup.html#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/client.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/config.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/control.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/lwresd.8#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/lwresd.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/lwresd.html#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/named.8#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/named.conf.5#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/named.conf.docbook#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/named.conf.html#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/named.docbook#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/named.html#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/query.c#8 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/server.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/update.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/nsupdate/nsupdate.8#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/nsupdate/nsupdate.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/nsupdate/nsupdate.html#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/rndc/Makefile.in#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/rndc/rndc.8#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/rndc/rndc.conf.5#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/rndc/rndc.conf.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/rndc/rndc.conf.html#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/rndc/rndc.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/rndc/rndc.html#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/configure.in#7 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM.html#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM.pdf#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Makefile.in#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/man.dig.html#2 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/man.host.html#2 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/man.named.html#2 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/arm/man.rndc.html#2 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#2 delete .. //depot/projects/dtrace/src/contrib/bind9/doc/misc/Makefile.in#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/misc/migration#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/rfc/index#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/doc/rfc/rfc4398.txt#1 branch .. //depot/projects/dtrace/src/contrib/bind9/doc/rfc/rfc4408.txt#1 branch .. //depot/projects/dtrace/src/contrib/bind9/doc/rfc/rfc4470.txt#1 branch .. //depot/projects/dtrace/src/contrib/bind9/doc/rfc/rfc4634.txt#1 branch .. //depot/projects/dtrace/src/contrib/bind9/doc/rfc/rfc4641.txt#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/api#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/config.h.in#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/configure#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/configure.in#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/dst/dst_api.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/dst/hmac_link.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/irs/gai_strerror.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/irs/irs_data.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/isc/ctl_clnt.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/make/rules.in#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/nameser/ns_parse.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/port_before.h.in#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/resolv/res_data.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind/resolv/res_init.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind9/api#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/bind9/check.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/adb.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/api#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/dispatch.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/dnssec.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/include/dns/db.h#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/include/dns/dispatch.h#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/include/dns/validator.h#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/journal.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/lookup.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/master.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/message.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/openssl_link.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/openssldh_link.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/openssldsa_link.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/rbtdb.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#3 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/rdata/generic/ds_43.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/rdataslab.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/resolver.c#8 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/rootns.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/sdb.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/sdlz.c#2 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/tsig.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/validator.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/view.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/xfrin.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/zone.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/Makefile.in#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/alpha/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/alpha/include/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/api#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/hmacsha.c#2 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/ia64/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/ia64/include/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/include/isc/platform.h.in#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/include/isc/string.h#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/mem.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/mips/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/mips/include/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/noatomic/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/noatomic/include/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/powerpc/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/powerpc/include/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#2 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/sparc64/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/sparc64/include/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/timer.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/unix/net.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/unix/socket.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/unix/syslog.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/x86_32/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/x86_32/include/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/x86_64/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/x86_64/include/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in#1 branch .. //depot/projects/dtrace/src/contrib/bind9/lib/isccc/symtab.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isccfg/api#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/api#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/context.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/getaddrinfo.c#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/getipnode.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/lwres_gnba.c#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_config.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_context.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_noop.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_packet.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/make/rules.in#6 integrate .. //depot/projects/dtrace/src/contrib/bind9/version#8 integrate .. //depot/projects/dtrace/src/lib/bind/bind/Makefile#5 integrate .. //depot/projects/dtrace/src/lib/bind/bind/config.h#6 integrate .. //depot/projects/dtrace/src/lib/bind/bind/port_before.h#6 integrate .. //depot/projects/dtrace/src/lib/bind/config.h#6 integrate .. //depot/projects/dtrace/src/lib/bind/config.mk#5 integrate .. //depot/projects/dtrace/src/lib/bind/isc/isc/platform.h#5 integrate .. //depot/projects/dtrace/src/lib/bind/lwres/Makefile#5 integrate .. //depot/projects/dtrace/src/share/man/man9/stack.9#5 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/db_trace.c#9 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#27 integrate .. //depot/projects/dtrace/src/sys/amd64/include/stack.h#1 branch .. //depot/projects/dtrace/src/sys/arm/arm/db_trace.c#5 integrate .. //depot/projects/dtrace/src/sys/arm/arm/nexus_io.c#6 delete .. //depot/projects/dtrace/src/sys/arm/arm/nexus_io_asm.S#4 delete .. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#22 integrate .. //depot/projects/dtrace/src/sys/arm/arm/stack_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/arm/conf/AVILA#4 integrate .. //depot/projects/dtrace/src/sys/arm/conf/BWCT#2 integrate .. //depot/projects/dtrace/src/sys/arm/conf/CRB#2 integrate .. //depot/projects/dtrace/src/sys/arm/conf/EP80219#5 integrate .. //depot/projects/dtrace/src/sys/arm/conf/HL200#2 integrate .. //depot/projects/dtrace/src/sys/arm/conf/IQ31244#7 integrate .. //depot/projects/dtrace/src/sys/arm/conf/KB920X#9 integrate .. //depot/projects/dtrace/src/sys/arm/conf/SIMICS#7 integrate .. //depot/projects/dtrace/src/sys/arm/conf/SKYEYE#7 integrate .. //depot/projects/dtrace/src/sys/arm/include/asmacros.h#6 integrate .. //depot/projects/dtrace/src/sys/arm/include/atomic.h#9 integrate .. //depot/projects/dtrace/src/sys/arm/include/stack.h#1 branch .. //depot/projects/dtrace/src/sys/arm/sa11x0/files.sa11x0#4 integrate .. //depot/projects/dtrace/src/sys/compat/ndis/ndis_var.h#5 integrate .. //depot/projects/dtrace/src/sys/compat/ndis/ntoskrnl_var.h#5 integrate .. //depot/projects/dtrace/src/sys/compat/ndis/subr_ndis.c#5 integrate .. //depot/projects/dtrace/src/sys/compat/ndis/subr_ntoskrnl.c#8 integrate .. //depot/projects/dtrace/src/sys/conf/NOTES#33 integrate .. //depot/projects/dtrace/src/sys/conf/files#55 integrate .. //depot/projects/dtrace/src/sys/conf/files.amd64#23 integrate .. //depot/projects/dtrace/src/sys/conf/files.arm#10 integrate .. //depot/projects/dtrace/src/sys/conf/files.i386#27 integrate .. //depot/projects/dtrace/src/sys/conf/files.ia64#9 integrate .. //depot/projects/dtrace/src/sys/conf/files.powerpc#12 integrate .. //depot/projects/dtrace/src/sys/conf/files.sparc64#8 integrate .. //depot/projects/dtrace/src/sys/conf/files.sun4v#13 integrate .. //depot/projects/dtrace/src/sys/conf/options#32 integrate .. //depot/projects/dtrace/src/sys/dev/amr/amr.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/amr/amr_cam.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/amr/amr_pci.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndis.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hdac.c#15 integrate .. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#25 integrate .. //depot/projects/dtrace/src/sys/i386/i386/db_trace.c#9 integrate .. //depot/projects/dtrace/src/sys/i386/i386/stack_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/i386/include/stack.h#1 branch .. //depot/projects/dtrace/src/sys/ia64/conf/GENERIC#11 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/db_machdep.c#7 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/stack_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/kern/kern_descrip.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/kern_proc.c#13 integrate .. //depot/projects/dtrace/src/sys/kern/subr_stack.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_bio.c#13 integrate .. //depot/projects/dtrace/src/sys/modules/amr/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_input.c#11 integrate .. //depot/projects/dtrace/src/sys/pc98/conf/GENERIC#13 integrate .. //depot/projects/dtrace/src/sys/powerpc/conf/GENERIC#12 integrate .. //depot/projects/dtrace/src/sys/powerpc/include/stack.h#1 branch .. //depot/projects/dtrace/src/sys/powerpc/powerpc/db_trace.c#5 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/stack_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/sparc64/conf/GENERIC#15 integrate .. //depot/projects/dtrace/src/sys/sparc64/include/stack.h#1 branch .. //depot/projects/dtrace/src/sys/sparc64/sparc64/db_trace.c#5 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/stack_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/conf/GENERIC#19 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/stack.h#1 branch .. //depot/projects/dtrace/src/sys/sun4v/sun4v/db_trace.c#6 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/stack_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/sys/stack.h#5 integrate .. //depot/projects/dtrace/src/sys/sys/sysctl.h#13 integrate .. //depot/projects/dtrace/src/sys/sys/user.h#6 integrate .. //depot/projects/dtrace/src/sys/vm/vm_page.c#25 integrate .. //depot/projects/dtrace/www/en/cgi/man.cgi#6 integrate .. //depot/projects/dtrace/www/share/sgml/release.ent#15 integrate Differences ... ==== //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/cutting-edge/chapter.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -614,124 +614,108 @@ §ó·s <filename>/etc</filename> ¤ºªº³]©wÀÉ - The /etc directory contains a large part - of your system's configuration information, as well as scripts - that are run at system startup. Some of these scripts change from - version to version of FreeBSD. + ¦b /etc ¥Ø¿ý·|¦³¨t²Îªº¬ÛÃö³]©wÀÉ¡A + ¥H¤Î¶}¾÷®Éªº¦U¶µªA°È±Ò°Ê script¡C ¦³¨Ç script ÀH FreeBSD + ª©¥»ªº¤£¦P¦Ó¦³¨Ç®t²§¡C - Some of the configuration files are also used in the day to - day running of the system. In particular, - /etc/group. + ¨ä¤¤¦³¨Ç³]©wÀÉ·|¦b¨C¤é¹B§@ªº¨t²Î¸Ì¤]·|¥Î¨ì¡C ¤×¨ä¬O + /etc/group¡C - There have been occasions when the installation part of - make installworld has expected certain usernames or groups - to exist. When performing an upgrade it is likely that these - users or groups did not exist. This caused problems when upgrading. - In some cases make buildworld will check to see if - these users or groups exist. + ¦³®É­Ô¦b make installworld ¦w¸Ë¹Lµ{¤¤¡A + ·|»Ý­n¥ý«Ø¥ß¬Y¨Ç¯S©w±b¸¹©Î¸s²Õ¡C ¦b¶i¦æ¤É¯Å¤§«e¡A¥¦­Ì¥i¯à¨Ã¤£¦s¦b¡A + ¦]¦¹¤É¯Å®É´N·|³y¦¨°ÝÃD¡C ¦³®É­Ô make buildworld + ·|¥ýÀˬd³o¨Ç©Ò»Ýªº±b¸¹©Î¸s²Õ¬O§_¤w¦³¦s¦b¡C - An example of this is when the - smmsp user was added. Users had the - installation process fail for them when - &man.mtree.8; was trying to create - /var/spool/clientmqueue. + Á|­Ó³o¼Ëªº¨Ò¤l¡A¹³¬O¬Y¦¸¤É¯Å¤§«á¥²¶··s¼W smmsp + ±b¸¹¡C ­Y¨Ï¥ÎªÌ©|¥¼·s¼W¸Ó±b¸¹´N­n§¹¦¨¤É¯Å¾Þ§@ªº¸Ü¡A + ·|¦b &man.mtree.8; ¹Á¸Õ«Ø¥ß /var/spool/clientmqueue + ®Éµo¥Í¥¢±Ñ¡C - The solution is to run &man.mergemaster.8; in - pre-buildworld mode by providing the option. - This will compare only those files that are essential for the success - of buildworld or - installworld. If your old version of - mergemaster does not support , - use the new version in the source tree when running for the first - time: + ¸Ñªk¬O¦b buildworld ¶¥¬q¤§«e¡A¥ý°õ¦æ &man.mergemaster.8; ¨Ã·f°t + ¿ï¶µ¡C ¥¦·|¤ñ¹ï¨º¨Ç°õ¦æ + buildworld ©Î + installworld ©Ò»Ý¤§ÃöÁä³]©wÀÉ¡C + ­Y§A©Ò¥Îªº¬O¦­´Á¤´¥¼¤ä´© ªº + mergemaster ª©¥»¡A¨º»òª½±µ¨Ï¥Î source tree + ¤ºªº·sª©§Y¥i¡G &prompt.root; cd /usr/src/usr.sbin/mergemaster &prompt.root; ./mergemaster.sh -p - If you are feeling particularly paranoid, you can check your - system to see which files are owned by the group you are - renaming or deleting: + ­Y±z¬O°¾°õ¨g(paranoid)¡A + ¥i¥H¹³¤U­±³o¼Ë¥h¸ÕµÛÀˬd¨t²Î¤W¦³­þ¨ÇÀÉ®×ÄÝ©ó¤w§ï¦W©Î³Q§R°£ªº¸s²Õ + ¡G &prompt.root; find / -group GID -print - will show all files owned by group - GID (which can be either a group name - or a numeric group ID). + ³o·|Åã¥Ü©Ò¦³²Å¦X­n§äªº GID ¸s²Õ + (¥i¥H¬O¸s²Õ¦WºÙ¡A©ÎªÌ¬O¸s²Õªº¼Æ¦r¥N¸¹)ªº©Ò¦³ÀɮסC - Drop to Single User Mode + ¤Á´«¨ì Single User ¼Ò¦¡ single-user mode - You may want to compile the system in single user mode. Apart - from the obvious benefit of making things go slightly faster, - reinstalling the system will touch a lot of important system - files, all the standard system binaries, libraries, include files - and so on. Changing these on a running system (particularly if - you have active users on the system at the time) is asking for - trouble. + ±z¥i¯à·|·Q¦b single user ¼Ò¦¡¤U½sĶ¨t²Î¡C + °£¤F¥i¥H©úÅã§ó§Ö§¹¦¨¤§¥~¡A¦w¸Ë¹Lµ{¤¤±N·|²o¯A³\¦h­«­nªº¨t²ÎÀɮסA + ¥]¬A©Ò¦³¨t²Î binaries¡Blibraries¡Binclude ÀÉ®×µ¥¡C + ­Y¦b¹B§@¤¤ªº¨t²Î(¤×¨ä¦³³\¦h¨Ï¥ÎªÌ¦b¥Îªº®É­Ô)¤º§ó§ï³o¨ÇÀɮסA + ¨ºÂ²ª½¬O¦Û§ä³Â·Ðªº§@ªk¡C multi-user mode - Another method is to compile the system in multi-user mode, and - then drop into single user mode for the installation. If you would - like to do it this way, simply hold off on the following steps until - the build has completed. You can postpone dropping to single user - mode until you have to installkernel or - installworld. + ¥t¤@ºØ¼Ò¦¡¬O¥ý¦b multi-user ¼Ò¦¡¤U½sĶ¦n¨t²Î¡AµM«á¦A¤Á¨ì single user + ¼Ò¦¡¥h¦w¸Ë¡C ­Y±z¤ñ¸û³ßÅw³oºØ¤è¦¡¡A¥u»Ý¦b build(½sĶ¹Lµ{) §¹¦¨¤§«á¡A + ¦A¥h°õ¦æ¤U­±ªº¨BÆJ§Y¥i¡C ¤@ª½¨ì¥i¤Á´« single user ¼Ò¦¡®É¡A¦A¥h°õ¦æ + installkernel ©Î + installworld §Y¥i¡C - As the superuser, you can execute: + ¤Á´«¬° root ¨­¥÷¥´¡G &prompt.root; shutdown now - from a running system, which will drop it to single user - mode. + ³o¼Ë´N·|±q­ì¥»ªº multi-user ¼Ò¦¡¤Á´«¨ì single user ¼Ò¦¡¡C - Alternatively, reboot the system, and at the boot prompt, - select the single user option. The system will then boot - single user. At the shell prompt you should then run: + °£¦¹¤§¥~¤]¥i¥H­«¶}¾÷¡A±µµÛ¦b¶}¾÷¿ï³æ³B¿ï¾Ü + single user ¿ï¶µ¡C ¦p¦¹¤@¨Ó´N·|¶i¤J single user ¼Ò¦¡¡A + µM«á¦b shell ´£¥Ü²Å¸¹³B¿é¤J¡G &prompt.root; fsck -p &prompt.root; mount -u / &prompt.root; mount -a -t ufs &prompt.root; swapon -a - This checks the file systems, remounts / - read/write, mounts all the other UFS file systems referenced in - /etc/fstab and then turns swapping on. + ³o¼Ë·|¥ýÀˬdÀɮרt²Î¡A¨Ã­«·s±N / + §ï¥H¥iŪ¼gªº¼Ò¦¡±¾¸ü¡A¥H¤Î /etc/fstab + ¤º©Ò³]©wªº¨ä¥L UFS Àɮרt²Î¡A³Ì«á±Ò¥Î swap ºÏ°Ï¡C - If your CMOS clock is set to local time and not to GMT - (this is true if the output of the &man.date.1; command - does not show the correct time and zone), - you may also need to run the following command: + ­Y CMOS ®ÉÄÁ¬O³]¬°·í¦a®É¶¡¡A¦Ó«D GMT ®É°Ï(­Y &man.date.1; + «ü¥O¨SÅã¥Ü¥¿½Tªº®É¶¡¡B®É°Ï)¡A¨º¥i¯à»Ý­n¦A¿é¤J¤U¦C«ü¥O¡G &prompt.root; adjkerntz -i - This will make sure that your local time-zone settings - get set up correctly — without this, you may later run into some - problems. - + ³o¨BÆJ¥i¥H½T»{±zªº·í¦a®É°Ï³]©w¬O§_¥¿½T — + §_«h¤é«á·|³y¦¨¤@¨Ç°ÝÃD¡C - Remove <filename>/usr/obj</filename> + ²¾°£ <filename>/usr/obj</filename> - As parts of the system are rebuilt they are placed in - directories which (by default) go under - /usr/obj. The directories shadow those under - /usr/src. + ¦b­«·s½sĶ¨t²Îªº¹Lµ{¤¤¡A½sĶµ²ªG·|©ñ¨ì(¹w³]±¡ªp) + /usr/obj ¤º¡C ³o¸Ì­±ªº¥Ø¿ý·|¹ïÀ³¨ì + /usr/src ªº¥Ø¿ýµ²ºc¡C - You can speed up the make buildworld process, and - possibly save yourself some dependency headaches by removing this - directory as well. + ¬å±¼³o¥Ø¿ý¡A¥i¥HÅý¥H«áªº make buildworld + ¹Lµ{§ó§Ö¤@¨Ç¡A¦Ó¥B¥iÁקK¥H«e½sĶªºªF¦è¸ò²{¦bªº²V²c¦b¤@°_ªº¬Û¨Ì¿ù¶Ã + ¡C - Some files below /usr/obj may have the - immutable flag set (see &man.chflags.1; for more information) - which must be removed first. + ¦Ó¦³¨Ç /usr/obj ¤ºªºÀÉ®×¥i¯à·|³]©w¤£¥i§ó°Êªº + flag(²Ó¸`½Ð°Ñ¾\ &man.chflags.1;)¡A¦Ó¥²¶·¥ý®³±¼³o¨Ç flag ³]©w¤~¦æ + ¡C &prompt.root; cd /usr/obj &prompt.root; chflags -R noschg * @@ -739,22 +723,20 @@ - Recompile the Base System + ­«·s½sĶ Base System - Saving the Output + «O¯d½sĶªº¬ö¿ý - It is a good idea to save the output you get from running - &man.make.1; to another file. If something goes wrong you will - have a copy of the error message. While this might not help you - in diagnosing what has gone wrong, it can help others if you post - your problem to one of the &os; mailing lists. + «Øij¾i¦¨¦n²ßºD¡A§â°õ¦æ &man.make.1; ®É²£¥Íªº¬ö¿ý¦s°_¨Ó¡C + ³o¼Ë­Y¦³­þÃä¥X¿ù¡A´N·|¦³¿ù»~°T®§ªº¬ö¿ý¡C ÁöµM³æ³æ³o¼Ë¡A + §A¥i¯à¤£ª¾¹D¦p¦ó¤ÀªR¬O­þÃä¥X¤F§Ã¡A¦ý­Y§â§A°ÝÃD°O¿ý¶K¨ì &os; ¬ÛÃöªº + mailing list ´N¥i¥H¦³¤H¥i¥HÀ°¦£¬Ý¬O«ç»ò¤@¦^¨Æ±¡¡C - The easiest way to do this is to use the &man.script.1; - command, with a parameter that specifies the name of the file to - save all output to. You would do this immediately before - rebuilding the world, and then type exit - when the process has finished. + ³Ì²³æªº¤è¬O´N¬O¥Î &man.script.1; «ü¥O¡A¨Ã¥[¤W°Ñ¼Æ + (§A·Q¦s©ñ°O¿ýªºÀɮצì¸m¡BÀɦW)§Y¥i¡C + ³o¨BÆJÀ³¸Ó¦b­«·s½sĶ¨t²Î®É´N­n§@¡AµM«á¦b§¹¦¨½sĶ«á¿é¤J + exit §Y¥iÂ÷¶}¡C &prompt.root; script /var/tmp/mw.out Script started, output file is /var/tmp/mw.out @@ -763,60 +745,54 @@ &prompt.root; exit Script done, … - If you do this, do not save the output - in /tmp. This directory may be cleared - next time you reboot. A better place to store it is in - /var/tmp (as in the previous example) or - in root's home directory. + ¹ï¤F¡AÁÙ¦³¤@ÂI¾¨¶q§O§âÀɮצs¨ì + /tmp ¥Ø¿ý¤º¡C ¦]¬°­«¶}¾÷¤§«á¡A + ³o¥Ø¿ý¤ºªºªF¦è³£·|³Q²MªÅ¡C ¤ñ¸û§´µ½ªº¦a¤è¬O + /var/tmp (¦p¤W¨Ò©Ò¥Ü) ©ÎªÌ¬O + root ªº®a¥Ø¿ý¡C - Compile the Base System + ½sĶ Base System - You must be in the /usr/src - directory: + ­º¥ý½Ð¥ý¤Á´«¨ì /usr/src ¥Ø¿ý¡G &prompt.root; cd /usr/src - (unless, of course, your source code is elsewhere, in which - case change to that directory instead). + (·íµM¡A°£«D§A§â source code ©ñ¨ì¨ä¥L¦a¤è¡A­Y¯u¬O³o¼Ë¡A + ´N¤Á´«¨ì¨º­Ó¥Ø¿ý§Y¥i)¡C make - To rebuild the world you use the &man.make.1; command. This - command reads instructions from the Makefile, - which describes how the programs that comprise &os; should be - rebuilt, the order in which they should be built, and so on. + ¨Ï¥Î &man.make.1; «ü¥O¨Ó­«·s½sĶ world¡C + ³o«ü¥O·|±q Makefile ÀÉ(³oÀÉ·|¼g &os; + ªºµ{¦¡¸Ó¦p¦ó­«·s½sĶ¡B¥H­þ¨Ç¶¶§Ç¨Ó½sĶµ¥µ¥)¥hŪ¨ú¬ÛÃö«ü¥O¡C - The general format of the command line you will type is as - follows: + ¤@¯ë¤U«ü¥Oªº®æ¦¡¦p¤U¡G &prompt.root; make -x -DVARIABLE target - In this example, - is an option that you would pass to &man.make.1;. See the - &man.make.1; manual page for an example of the options you can - pass. + ¦b³o­Ó¨Ò¤l¡A + ¬O§A·Q¶Çµ¹ &man.make.1; ªº¿ï¶µ¡A²Ó¸`»¡©ú½Ð°Ñ¾\ &man.make.1; »¡©ú¡A + ¸Ì­±¦³¬ÛÃö½d¨Ò»¡©ú¡C - passes a variable to the Makefile. The - behavior of the Makefile is controlled by - these variables. These are the same variables as are set in - /etc/make.conf, and this provides another - way of setting them. + «h¬O§âÅܼƳ]©w¶Çµ¹ Makefile¡C ³o¨ÇÅܼƷ|±±¨î + Makefile ªº¦æ¬°¡C ³o¨Ç³]©w»P + /etc/make.conf ªºÅܼƳ]©w¬O¤@¼Ë¡A + ¥u¬O¥t¤@ºØ³]©w¤è¦¡¦Ó¤w¡C &prompt.root; make -DNO_PROFILE target - is another way of specifying that profiled libraries should - not be built, and corresponds with the + ¤W­±ªº¨Ò¤l«h¬O¥t¤@ºØ³]©w¤è¦¡¡A¤]´N¬O­þ¨Ç¤£­n¡C + ³o­Ó¨Ò¤l¤¤ªº·N«ä¬O¤£¥h½sĶ profiled libraries¡A®ÄªG´N¦p¦P³]©w¦b + /etc/make.conf ªº NO_PROFILE= true # Avoid compiling profiled libraries - line in /etc/make.conf. - - target tells &man.make.1; what - you want to do. Each Makefile defines a - number of different targets, and your choice of - target determines what happens. + target «h¬O§i¶D &man.make.1; + ¸Ó¥h°µ­þ¨Ç¡C ¨C­Ó Makefile ³£·|©w¸q¤£¦Pªº + targets¡AµM«á¨Ì±z©Òµ¹ªº target ´N·|¨M©w·|°µ­þ¨Ç°Ê§@ + ¡C Some targets are listed in the Makefile, but are not meant for you to run. ==== //depot/projects/dtrace/src/contrib/bind9/CHANGES#8 (text+ko) ==== @@ -1,5 +1,117 @@ - --- 9.4.1-P1 released --- + --- 9.4.2 released --- + --- 9.4.2rc2 released --- + +2259. [bug] Reverse incorrect LIBINTERFACE bump of libisc + in 9.4.2rc1. Applications built against 9.4.2rc1 + will need to be rebuilt. + +2258. [bug] Fallback from IXFR/TSIG to SOA/AXFR/TSIG broken. + [RT #17241] + +2257. [bug] win32: Use the full path to vcredist_x86.exe when + calling it. [RT #17222] + +2256. [bug] win32: Correctly register the installation location of + bindevt.dll. [RT #17159] + +2255. [bug] L.ROOT-SERVERS.NET is now 199.7.83.42. + +2254. [bug] timer.c:dispatch() failed to lock timer->lock + when reading timer->idle allowing it to see + intermediate values as timer->idle was reset by + isc_timer_touch(). [RT #17243] + + --- 9.4.2rc1 released --- + +2251. [doc] Update memstatistics-file documentation to reflect + reality. Note there is behaviour change for BIND 9.5. + [RT #17113] + +2249. [bug] Only set Authentic Data bit if client requested + DNSSEC, per RFC 3655 [RT #17175] + +2248. [cleanup] Fix several errors reported by Coverity. [RT #17160] + +2245. [bug] Validating lack of DS records at trust anchors wasn't + working. [RT #17151] + +2238. [bug] It was possible to trigger a REQUIRE when a + validation was cancelled. [RT #17106] + +2237. [bug] libbind: res_init() was not thread aware. [RT #17123] + +2236. [bug] dnssec-signzone failed to preserve the case of + of wildcard owner names. [RT #17085] + +2235. [bug] was not being installed. [RT #17135] + +2234. [port] Correct some compiler warnings on SCO OSr5 [RT #17134] + +2232. [bug] dns_adb_findaddrinfo() could fail and return + ISC_R_SUCCESS. [RT #17137] + +2231. [bug] Building dlzbdb (contrib/dlz/bin/dlzbdb) was broken. + [RT #17088] + +2230. [bug] We could INSIST reading a corrupted journal. + [RT #17132] + +2228. [contrib] contrib: Change 2188 was incomplete. + +2227. [cleanup] Tidied up the FAQ. [RT #17121] + +2225. [bug] More support for systems with no IPv4 addresses. + [RT #17111] + +2224. [bug] Defer journal compaction if a xfrin is in progress. + [RT #17119] + +2223. [bug] Make a new journal when compacting. [RT #17119] + +2221. [bug] Set the event result code to reflect the actual + record returned to caller when a cache update is + rejected due to a more credible answer existing. + [RT #17017] + +2220. [bug] win32: Address a race condition in final shutdown of + the Windows socket code. [RT #17028] + +2219. [bug] Apply zone consistancy checks to additions, not + removals, when updating. [RT #17049] + +2218. [bug] Remove unnecessary REQUIRE from dns_validator_create(). + [RT #16976] + +2216. [cleanup] Fix a number of errors reported by Coverity. + [RT #17094] + +2215. [bug] Bad REQUIRE check isc_hmacsha1_verify(). [RT #17094] + +2214. [bug] Deregister OpenSSL lock callback when cleaning + up. Reorder OpenSSL cleanup so that RAND_cleanup() + is called before the locks are destroyed. [RT #17098] + +2213. [bug] SIG0 diagnostic failure messages were looking at the + wrong status code. [RT #17101] + +2212. [func] 'host -m' now causes memory statistics and active + memory to be printed at exit. [RT 17028] + +2210. [bug] Deleting class specific records via UPDATE could + fail. [RT #17074] + +2209. [port] osx: linking against user supplied static OpenSSL + libraries failed as the system ones were still being + found. [RT #17078] + +2208. [port] win32: make sure both build methods produce the + same output. [RT #17058] + +2207. [port] Some implementations of getaddrinfo() fail to set + ai_canonname correctly. [RT #17061] + + --- 9.4.2b1 released --- 2206. [security] "allow-query-cache" and "allow-recursion" now cross inherit from each other. @@ -16,12 +128,32 @@ [RT #16987] +2205. [bug] libbind: change #2119 broke thread support. [RT #16982] + 2203. [security] Query id generation was cryptographically weak. [RT # 16915] 2202. [security] The default acls for allow-query-cache and allow-recursion were not being applied. [RT #16960] +2200. [bug] The search for cached NSEC records was stopping to + early leading to excessive DLV queries. [RT #16930] + +2199. [bug] win32: don't call WSAStartup() while loading dlls. + [RT #16911] + +2198. [bug] win32: RegCloseKey() could be called when + RegOpenKeyEx() failed. [RT #16911] + +2197. [bug] Add INSIST to catch negative responses which are + not setting the event result code appropriately. + [RT #16909] + +2196. [port] win32: yield processor while waiting for once to + to complete. [RT #16958] + +2194. [bug] Close journal before calling 'done' in xfrin.c. + 2193. [port] win32: BINDInstall.exe is now linked statically. [RT #16906] @@ -29,6 +161,145 @@ Studio's redistributable dlls if building with Visual Stdio 2005 or later. +2189. [bug] Handle socket() returning EINTR. [RT #15949] + +2188. [contrib] queryperf: autoconf changes to make the search for + libresolv or libbind more robust. [RT #16299] + +2187. [bug] query_addds(), query_addwildcardproof() and + query_addnxrrsetnsec() should take a version + arguement. [RT #16368] + +2186. [port] cygwin: libbind: check for struct sockaddr_storage + independently of IPv6. [RT #16482] + +2185. [port] sunos: libbind: check for ssize_t, memmove() and + memchr(). [RT #16463] + +2183. [bug] dnssec-signzone didn't handle offline private keys + well. [RT #16832] + +2182. [bug] dns_dispatch_createtcp() and dispatch_createudp() + could return ISC_R_SUCCESS when they ran out of + memory. [RT #16365] + +2181. [port] sunos: libbind: add paths.h from BIND 8. [RT #16462] + +2180. [cleanup] Remove bit test from 'compress_test' as they + are no longer needed. [RT #16497] + +2178. [bug] 'rndc reload' of a slave or stub zone resulted in + a reference leak. [RT #16867] + +2177. [bug] Array bounds overrun on read (rcodetext) at + debug level 10+. [RT #16798] + +2176. [contrib] dbus update to handle race condition during + initialisation (Bugzilla 235809). [RT #16842] + +2175. [bug] win32: windows broadcast condition variable support + was broken. [RT #16592] + +2174. [bug] I/O errors should always be fatal when reading + master files. [RT #16825] + +2173. [port] win32: When compiling with MSVS 2005 SP1 we also + need to ship Microsoft.VC80.MFCLOC. + +2171. [bug] Handle breaks in DNSSEC trust chains where the parent + servers are not DS aware (DS queries to the parent + return a referral to the child). + +2170. [func] Add acache processing to test suite. [RT #16711] + +2169. [bug] host, nslookup: when reporting NXDOMAIN report the + given name and not the last name searched for. + [RT #16763] + +2168. [bug] nsupdate: in non-interactive mode treat syntax errors + as fatal errors. [RT #16785] + +2167. [bug] When re-using a automatic zone named failed to + attach it to the new view. [RT #16786] + +2166. [bug] When running in batch mode, dig could misinterpret + a server address as a name to be looked up, causing + unexpected output. [RT #16743] + +2164. [bug] The code to determine how named-checkzone / + named-compilezone was called failed under windows. + [RT #16764] + +2162. [func] Allow "rrset-order fixed" to be disabled at compile + time. [RT #16665] + +2161. [bug] 'rndc flush' could report a false success. [RT #16698] + +2160. [bug] libisc wasn't handling NULL ifa_addr pointers returned + from getifaddrs(). [RT #16708] + +2159. [bug] Array bounds overrun in acache processing. [RT #16710] + +2158. [bug] ns_client_isself() failed to initialise key + leading to a REQUIRE failure. [RT #16688] + +2156. [bug] Fix node reference leaks in lookup.c:lookup_find(), + resolver.c:validated() and resolver.c:cache_name(). + Fix a memory leak in rbtdb.c:free_noqname(). + Make lookup.c:lookup_find() robust against + event leaks. [RT #16685] + +2155. [contrib] SQLite sdb module from jaboydjr@netwalk.com. + [RT #16694] + +2153. [bug] nsupdate could leak memory. [RT #16691] + +2152. [cleanup] Use sizeof(buf) instead of fixed number in + dighost.c:get_trusted_key(). [RT #16678] + +2151. [bug] Missing newline in usage message for journalprint. + [RT #16679] + +2150. [bug] 'rrset-order cyclic' uniformly distribute the + starting point for the first response for a given + RRset. [RT #16655] + +2149. [bug] isc_mem_checkdestroyed() failed to abort on + if there were still active memory contexts. + [RT #16672] + +2147. [bug] libbind: remove potential buffer overflow from + hmac_link.c. [RT #16437] + +2146. [cleanup] Silence Linux's spurious "obsolete setsockopt + SO_BSDCOMPAT" message. [RT #16641] + +2145. [bug] Check DS/DLV digest lengths for known digests. + [RT #16622] + +2144. [cleanup] Suppress logging of SERVFAIL from forwarders. + [RT #16619] + +2143. [bug] We failed to restart the IPv6 client when the + kernel failed to return the destination the + packet was sent to. [RT #16613] + +2142. [bug] Handle master files with a modification time that + matches the epoch. [RT# 16612] + +2141. [bug] dig/host should not be setting IDN_ASCCHECK (IDN + equivalent of LDH checks). [RT #16609] + +2140. [bug] libbind: missing unlock on pthread_key_create() + failures. [RT #16654] + +2139. [bug] dns_view_find() was being called with wrong type + in adb.c. [RT #16670] + +2119. [compat] libbind: allow res_init() to succeed enough to + return the default domain even if it was unable + to allocate memory. + --- 9.4.1 released --- 2172. [bug] query_addsoa() was being called with a non zone db. @@ -524,7 +795,7 @@ hex strings with comments. [RT #15814] 1974. [doc] List each of the zone types and associated zone - options seperately in the ARM. + options separately in the ARM. 1973. [func] TSIG HMACSHA1, HMACSHA224, HMACSHA256, HMACSHA384 and HMACSHA512 support. [RT #13606] @@ -551,7 +822,7 @@ 1965. [func] Suppress spurious "recusion requested but not available" warning with 'dig +qr'. [RT #15780]. -1964. [func] Seperate out MX and SRV to CNAME checks. [RT #15723] +1964. [func] Separate out MX and SRV to CNAME checks. [RT #15723] 1963. [port] Tru64 4.0E doesn't support send() and recv(). [RT #15586] @@ -771,7 +1042,7 @@ 1898. [bug] Extend ISC_SOCKADDR_FORMATSIZE and ISC_NETADDR_FORMATSIZE to allow for scope details. -1897. [func] x86 and x86_64 now have seperate atomic locking +1897. [func] x86 and x86_64 now have separate atomic locking implementations. 1896. [bug] Recursive clients soft quota support wasn't working @@ -825,7 +1096,7 @@ [RT #14892] 1878. [func] Detect duplicates of UDP queries we are recursing on - and drop them. New stats category "duplicates". + and drop them. New stats category "duplicate". [RT #2471] 1877. [bug] Fix unreasonably low quantum on call to @@ -1769,7 +2040,7 @@ [RT #6427] 1555. [func] 'rrset-order cyclic' no longer has a random starting - point. [RT #7572] + point per query. [RT #7572] 1554. [bug] dig, host, nslookup failed when no nameservers were specified in /etc/resolv.conf. [RT #8232] @@ -6250,7 +6521,7 @@ and has been removed. 170. [cleanup] Remove inter server consistancy checks from zone, - these should return as a seperate module in 9.1. + these should return as a separate module in 9.1. dns_zone_checkservers(), dns_zone_checkparents(), dns_zone_checkchildren(), dns_zone_checkglue(). ==== //depot/projects/dtrace/src/contrib/bind9/COPYRIGHT#6 (text+ko) ==== @@ -1,7 +1,7 @@ Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") Copyright (C) 1996-2003 Internet Software Consortium. -Permission to use, copy, modify, and distribute this software for any +Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. @@ -13,7 +13,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -$Id: COPYRIGHT,v 1.9.18.3 2007/01/08 02:41:59 marka Exp $ +$Id: COPYRIGHT,v 1.9.18.4 2007/08/28 07:19:54 tbox Exp $ Portions Copyright (C) 1996-2001 Nominum, Inc. ==== //depot/projects/dtrace/src/contrib/bind9/FAQ#6 (text+ko) ==== @@ -4,97 +4,71 @@ Copyright © 2000-2003 Internet Software Consortium. -------------------------------------------------------------------------------- +----------------------------------------------------------------------- -Q: Why doesn't -u work on Linux 2.2.x when I build with --enable-threads? +1. Compilation and Installation Questions -A: Linux threads do not fully implement the Posix threads (pthreads) standard. In - particular, setuid() operates only on the current thread, not the full process. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 2 23:02:28 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 574BB16A41A; Sun, 2 Dec 2007 23:02: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 F293816A476 for ; Sun, 2 Dec 2007 23:02:27 +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 E644D13C448 for ; Sun, 2 Dec 2007 23:02:27 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2N2RYX004666 for ; Sun, 2 Dec 2007 23:02:27 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB2N2RpG004663 for perforce@freebsd.org; Sun, 2 Dec 2007 23:02:27 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 23:02:27 GMT Message-Id: <200712022302.lB2N2RpG004663@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 130059 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 23:02:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=130059 Change 130059 by hselasky@hselasky_laptop001 on 2007/12/02 23:02:06 Compile fixes. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci.c#57 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#16 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#57 (text+ko) ==== @@ -179,7 +179,7 @@ */ EOWRITE4(sc, EHCI_USBCMD, EHCI_CMD_HCRESET); - for (n = 0; n ! 100; n++) { + for (n = 0; n != 100; n++) { DELAY(1000 * 1); hcr = EOREAD4(sc, EHCI_USBCMD); if (!(hcr & EHCI_CMD_HCRESET)) { ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#16 (text+ko) ==== @@ -206,6 +206,7 @@ vendor BROTHER 0x04f9 Brother Industries vendor DALLAS 0x04fa Dallas Semiconductor vendor SUNPLUS 0x04fc Sunplus +vendor AIPTEK2 0x04fc AIPTEK International vendor PFU 0x04fe PFU vendor FUJIKURA 0x0501 Fujikura/DDK vendor ACER 0x0502 Acer @@ -500,6 +501,7 @@ vendor AGATE 0x0c08 Agate Technologies vendor DMI 0x0c0b DMI vendor MICRODIA 0x0c45 Chicony +vendor CHICONY2 0x0c45 Chicony Electronics vendor SEALEVEL 0x0c52 Sealevel System vendor LUWEN 0x0c76 Luwen vendor KYOCERA2 0x0c88 Kyocera Wireless Corp. From owner-p4-projects@FreeBSD.ORG Sun Dec 2 23:17:50 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65E4F16A46E; Sun, 2 Dec 2007 23:17:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EEFBF16A421 for ; Sun, 2 Dec 2007 23:17:49 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E158E13C468 for ; Sun, 2 Dec 2007 23:17:49 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2NHns1007754 for ; Sun, 2 Dec 2007 23:17:49 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB2NHiIE007751 for perforce@freebsd.org; Sun, 2 Dec 2007 23:17:44 GMT (envelope-from jb@freebsd.org) Date: Sun, 2 Dec 2007 23:17:44 GMT Message-Id: <200712022317.lB2NHiIE007751@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130060 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 23:17:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=130060 Change 130060 by jb@jb_freebsd1 on 2007/12/02 23:16:56 IFC Affected files ... .. //depot/projects/binutils/src/contrib/bind9/CHANGES#4 integrate .. //depot/projects/binutils/src/contrib/bind9/COPYRIGHT#3 integrate .. //depot/projects/binutils/src/contrib/bind9/FAQ#3 integrate .. //depot/projects/binutils/src/contrib/bind9/FAQ.xml#3 integrate .. //depot/projects/binutils/src/contrib/bind9/Makefile.in#3 integrate .. //depot/projects/binutils/src/contrib/bind9/README#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/check/check-tool.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/check/named-checkconf.8#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/check/named-checkconf.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/check/named-checkconf.html#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/check/named-checkzone.8#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/check/named-checkzone.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/check/named-checkzone.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/check/named-checkzone.html#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/dig/dig.1#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/dig/dig.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/dig/dig.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/dig/dig.html#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/dig/host.1#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/dig/host.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/dig/host.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/dig/host.html#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/dig/nslookup.1#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/dig/nslookup.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/dig/nslookup.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/dig/nslookup.html#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/named/client.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/named/config.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/named/control.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/named/lwresd.8#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/named/lwresd.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/named/lwresd.html#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/named/named.8#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/named/named.conf.5#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/named/named.conf.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/named/named.conf.html#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/named/named.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/named/named.html#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/named/query.c#4 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/named/server.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/named/update.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/nsupdate/nsupdate.8#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/nsupdate/nsupdate.html#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/Makefile.in#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/rndc.8#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/rndc.conf.5#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/rndc.conf.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/rndc.conf.html#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/rndc.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/bin/rndc/rndc.html#3 integrate .. //depot/projects/binutils/src/contrib/bind9/configure.in#4 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#3 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#3 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Bv9ARM.pdf#3 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/arm/Makefile.in#3 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/arm/man.dig.html#2 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/arm/man.host.html#2 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/arm/man.named.html#2 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/arm/man.rndc.html#2 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#2 delete .. //depot/projects/binutils/src/contrib/bind9/doc/misc/Makefile.in#3 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/misc/migration#3 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/index#3 integrate .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc4398.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc4408.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc4470.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc4634.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/doc/rfc/rfc4641.txt#1 branch .. //depot/projects/binutils/src/contrib/bind9/lib/bind/api#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/bind/config.h.in#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/bind/configure#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/bind/configure.in#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/bind/dst/hmac_link.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/bind/irs/gai_strerror.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/bind/irs/irs_data.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/bind/isc/ctl_clnt.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/bind/make/rules.in#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/bind/nameser/ns_parse.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/bind/port_before.h.in#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/bind/resolv/res_data.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/bind/resolv/res_init.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/bind9/api#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/bind9/check.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/adb.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/api#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/dispatch.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/dnssec.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/include/dns/db.h#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/include/dns/dispatch.h#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/include/dns/validator.h#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/journal.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/lookup.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/master.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/message.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/openssl_link.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/openssldh_link.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/openssldsa_link.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/rbtdb.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#2 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/rdata/generic/ds_43.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/rdataslab.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/resolver.c#4 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/rootns.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/sdb.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/sdlz.c#2 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/tsig.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/validator.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/view.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/xfrin.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/dns/zone.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/isc/Makefile.in#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/isc/alpha/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/lib/isc/alpha/include/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/lib/isc/api#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/isc/hmacsha.c#2 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/isc/ia64/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/lib/isc/ia64/include/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/lib/isc/include/isc/platform.h.in#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/isc/include/isc/string.h#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/isc/mem.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/isc/mips/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/lib/isc/mips/include/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/lib/isc/noatomic/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/lib/isc/noatomic/include/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/lib/isc/powerpc/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/lib/isc/powerpc/include/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#2 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/isc/sparc64/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/lib/isc/sparc64/include/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/lib/isc/timer.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/isc/unix/net.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/isc/unix/socket.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/isc/unix/syslog.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/isc/x86_32/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/lib/isc/x86_32/include/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/lib/isc/x86_64/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/lib/isc/x86_64/include/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in#1 branch .. //depot/projects/binutils/src/contrib/bind9/lib/isccc/symtab.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/isccfg/api#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/lwres/api#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/lwres/context.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/lwres/getaddrinfo.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/lwres/getipnode.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/lwres/lwres_gnba.c#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/lwres/man/lwres.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/lwres/man/lwres_config.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/lwres/man/lwres_context.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/lwres/man/lwres_noop.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/lwres/man/lwres_packet.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#3 integrate .. //depot/projects/binutils/src/contrib/bind9/make/rules.in#3 integrate .. //depot/projects/binutils/src/contrib/bind9/version#4 integrate .. //depot/projects/binutils/src/lib/bind/bind/Makefile#3 integrate .. //depot/projects/binutils/src/lib/bind/bind/config.h#3 integrate .. //depot/projects/binutils/src/lib/bind/bind/port_before.h#3 integrate .. //depot/projects/binutils/src/lib/bind/config.h#3 integrate .. //depot/projects/binutils/src/lib/bind/config.mk#3 integrate .. //depot/projects/binutils/src/lib/bind/isc/isc/platform.h#3 integrate .. //depot/projects/binutils/src/lib/bind/lwres/Makefile#3 integrate .. //depot/projects/binutils/src/share/man/man9/stack.9#3 integrate .. //depot/projects/binutils/src/sys/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/binutils/src/sys/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/binutils/src/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/binutils/src/sys/amd64/include/stack.h#1 branch .. //depot/projects/binutils/src/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/binutils/src/sys/arm/arm/nexus_io.c#3 delete .. //depot/projects/binutils/src/sys/arm/arm/nexus_io_asm.S#2 delete .. //depot/projects/binutils/src/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/binutils/src/sys/arm/arm/stack_machdep.c#1 branch .. //depot/projects/binutils/src/sys/arm/conf/AVILA#2 integrate .. //depot/projects/binutils/src/sys/arm/conf/BWCT#2 integrate .. //depot/projects/binutils/src/sys/arm/conf/CRB#2 integrate .. //depot/projects/binutils/src/sys/arm/conf/EP80219#3 integrate .. //depot/projects/binutils/src/sys/arm/conf/HL200#2 integrate .. //depot/projects/binutils/src/sys/arm/conf/IQ31244#3 integrate .. //depot/projects/binutils/src/sys/arm/conf/KB920X#3 integrate .. //depot/projects/binutils/src/sys/arm/conf/SIMICS#3 integrate .. //depot/projects/binutils/src/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/binutils/src/sys/arm/include/asmacros.h#3 integrate .. //depot/projects/binutils/src/sys/arm/include/atomic.h#4 integrate .. //depot/projects/binutils/src/sys/arm/include/stack.h#1 branch .. //depot/projects/binutils/src/sys/arm/sa11x0/files.sa11x0#2 integrate .. //depot/projects/binutils/src/sys/compat/ndis/ndis_var.h#3 integrate .. //depot/projects/binutils/src/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/binutils/src/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/binutils/src/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/binutils/src/sys/conf/NOTES#3 integrate .. //depot/projects/binutils/src/sys/conf/files#5 integrate .. //depot/projects/binutils/src/sys/conf/files.amd64#3 integrate .. //depot/projects/binutils/src/sys/conf/files.arm#4 integrate .. //depot/projects/binutils/src/sys/conf/files.i386#3 integrate .. //depot/projects/binutils/src/sys/conf/files.ia64#3 integrate .. //depot/projects/binutils/src/sys/conf/files.powerpc#3 integrate .. //depot/projects/binutils/src/sys/conf/files.sparc64#3 integrate .. //depot/projects/binutils/src/sys/conf/files.sun4v#4 integrate .. //depot/projects/binutils/src/sys/conf/options#3 integrate .. //depot/projects/binutils/src/sys/dev/amr/amr.c#3 integrate .. //depot/projects/binutils/src/sys/dev/amr/amr_cam.c#3 integrate .. //depot/projects/binutils/src/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/binutils/src/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/binutils/src/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/binutils/src/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/binutils/src/sys/i386/i386/db_trace.c#3 integrate .. //depot/projects/binutils/src/sys/i386/i386/stack_machdep.c#1 branch .. //depot/projects/binutils/src/sys/i386/include/stack.h#1 branch .. //depot/projects/binutils/src/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/binutils/src/sys/ia64/ia64/db_machdep.c#3 integrate .. //depot/projects/binutils/src/sys/ia64/ia64/stack_machdep.c#1 branch .. //depot/projects/binutils/src/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/binutils/src/sys/kern/kern_proc.c#3 integrate .. //depot/projects/binutils/src/sys/kern/subr_stack.c#3 integrate .. //depot/projects/binutils/src/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/binutils/src/sys/modules/amr/Makefile#2 integrate .. //depot/projects/binutils/src/sys/netinet/ip_input.c#3 integrate .. //depot/projects/binutils/src/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/binutils/src/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/binutils/src/sys/powerpc/include/stack.h#1 branch .. //depot/projects/binutils/src/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/binutils/src/sys/powerpc/powerpc/stack_machdep.c#1 branch .. //depot/projects/binutils/src/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/binutils/src/sys/sparc64/include/stack.h#1 branch .. //depot/projects/binutils/src/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/binutils/src/sys/sparc64/sparc64/stack_machdep.c#1 branch .. //depot/projects/binutils/src/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/binutils/src/sys/sun4v/include/stack.h#1 branch .. //depot/projects/binutils/src/sys/sun4v/sun4v/db_trace.c#2 integrate .. //depot/projects/binutils/src/sys/sun4v/sun4v/stack_machdep.c#1 branch .. //depot/projects/binutils/src/sys/sys/stack.h#3 integrate .. //depot/projects/binutils/src/sys/sys/sysctl.h#4 integrate .. //depot/projects/binutils/src/sys/sys/user.h#3 integrate .. //depot/projects/binutils/src/sys/vm/vm_page.c#4 integrate Differences ... ==== //depot/projects/binutils/src/contrib/bind9/CHANGES#4 (text+ko) ==== @@ -1,5 +1,117 @@ - --- 9.4.1-P1 released --- + --- 9.4.2 released --- + --- 9.4.2rc2 released --- + +2259. [bug] Reverse incorrect LIBINTERFACE bump of libisc + in 9.4.2rc1. Applications built against 9.4.2rc1 + will need to be rebuilt. + +2258. [bug] Fallback from IXFR/TSIG to SOA/AXFR/TSIG broken. + [RT #17241] + +2257. [bug] win32: Use the full path to vcredist_x86.exe when + calling it. [RT #17222] + +2256. [bug] win32: Correctly register the installation location of + bindevt.dll. [RT #17159] + +2255. [bug] L.ROOT-SERVERS.NET is now 199.7.83.42. + +2254. [bug] timer.c:dispatch() failed to lock timer->lock + when reading timer->idle allowing it to see + intermediate values as timer->idle was reset by + isc_timer_touch(). [RT #17243] + + --- 9.4.2rc1 released --- + +2251. [doc] Update memstatistics-file documentation to reflect + reality. Note there is behaviour change for BIND 9.5. + [RT #17113] + +2249. [bug] Only set Authentic Data bit if client requested + DNSSEC, per RFC 3655 [RT #17175] + +2248. [cleanup] Fix several errors reported by Coverity. [RT #17160] + +2245. [bug] Validating lack of DS records at trust anchors wasn't + working. [RT #17151] + +2238. [bug] It was possible to trigger a REQUIRE when a + validation was cancelled. [RT #17106] + +2237. [bug] libbind: res_init() was not thread aware. [RT #17123] + +2236. [bug] dnssec-signzone failed to preserve the case of + of wildcard owner names. [RT #17085] + +2235. [bug] was not being installed. [RT #17135] + +2234. [port] Correct some compiler warnings on SCO OSr5 [RT #17134] + +2232. [bug] dns_adb_findaddrinfo() could fail and return + ISC_R_SUCCESS. [RT #17137] + +2231. [bug] Building dlzbdb (contrib/dlz/bin/dlzbdb) was broken. + [RT #17088] + +2230. [bug] We could INSIST reading a corrupted journal. + [RT #17132] + +2228. [contrib] contrib: Change 2188 was incomplete. + +2227. [cleanup] Tidied up the FAQ. [RT #17121] + +2225. [bug] More support for systems with no IPv4 addresses. + [RT #17111] + +2224. [bug] Defer journal compaction if a xfrin is in progress. + [RT #17119] + +2223. [bug] Make a new journal when compacting. [RT #17119] + +2221. [bug] Set the event result code to reflect the actual + record returned to caller when a cache update is + rejected due to a more credible answer existing. + [RT #17017] + +2220. [bug] win32: Address a race condition in final shutdown of + the Windows socket code. [RT #17028] + +2219. [bug] Apply zone consistancy checks to additions, not + removals, when updating. [RT #17049] + +2218. [bug] Remove unnecessary REQUIRE from dns_validator_create(). + [RT #16976] + +2216. [cleanup] Fix a number of errors reported by Coverity. + [RT #17094] + +2215. [bug] Bad REQUIRE check isc_hmacsha1_verify(). [RT #17094] + +2214. [bug] Deregister OpenSSL lock callback when cleaning + up. Reorder OpenSSL cleanup so that RAND_cleanup() + is called before the locks are destroyed. [RT #17098] + +2213. [bug] SIG0 diagnostic failure messages were looking at the + wrong status code. [RT #17101] + +2212. [func] 'host -m' now causes memory statistics and active + memory to be printed at exit. [RT 17028] + +2210. [bug] Deleting class specific records via UPDATE could + fail. [RT #17074] + +2209. [port] osx: linking against user supplied static OpenSSL + libraries failed as the system ones were still being + found. [RT #17078] + +2208. [port] win32: make sure both build methods produce the + same output. [RT #17058] + +2207. [port] Some implementations of getaddrinfo() fail to set + ai_canonname correctly. [RT #17061] + + --- 9.4.2b1 released --- 2206. [security] "allow-query-cache" and "allow-recursion" now cross inherit from each other. @@ -16,12 +128,32 @@ [RT #16987] +2205. [bug] libbind: change #2119 broke thread support. [RT #16982] + 2203. [security] Query id generation was cryptographically weak. [RT # 16915] 2202. [security] The default acls for allow-query-cache and allow-recursion were not being applied. [RT #16960] +2200. [bug] The search for cached NSEC records was stopping to + early leading to excessive DLV queries. [RT #16930] + +2199. [bug] win32: don't call WSAStartup() while loading dlls. + [RT #16911] + +2198. [bug] win32: RegCloseKey() could be called when + RegOpenKeyEx() failed. [RT #16911] + +2197. [bug] Add INSIST to catch negative responses which are + not setting the event result code appropriately. + [RT #16909] + +2196. [port] win32: yield processor while waiting for once to + to complete. [RT #16958] + +2194. [bug] Close journal before calling 'done' in xfrin.c. + 2193. [port] win32: BINDInstall.exe is now linked statically. [RT #16906] @@ -29,6 +161,145 @@ Studio's redistributable dlls if building with Visual Stdio 2005 or later. +2189. [bug] Handle socket() returning EINTR. [RT #15949] + +2188. [contrib] queryperf: autoconf changes to make the search for + libresolv or libbind more robust. [RT #16299] + +2187. [bug] query_addds(), query_addwildcardproof() and + query_addnxrrsetnsec() should take a version + arguement. [RT #16368] + +2186. [port] cygwin: libbind: check for struct sockaddr_storage + independently of IPv6. [RT #16482] + +2185. [port] sunos: libbind: check for ssize_t, memmove() and + memchr(). [RT #16463] + +2183. [bug] dnssec-signzone didn't handle offline private keys + well. [RT #16832] + +2182. [bug] dns_dispatch_createtcp() and dispatch_createudp() + could return ISC_R_SUCCESS when they ran out of + memory. [RT #16365] + +2181. [port] sunos: libbind: add paths.h from BIND 8. [RT #16462] + +2180. [cleanup] Remove bit test from 'compress_test' as they + are no longer needed. [RT #16497] + +2178. [bug] 'rndc reload' of a slave or stub zone resulted in + a reference leak. [RT #16867] + +2177. [bug] Array bounds overrun on read (rcodetext) at + debug level 10+. [RT #16798] + +2176. [contrib] dbus update to handle race condition during + initialisation (Bugzilla 235809). [RT #16842] + +2175. [bug] win32: windows broadcast condition variable support + was broken. [RT #16592] + +2174. [bug] I/O errors should always be fatal when reading + master files. [RT #16825] + +2173. [port] win32: When compiling with MSVS 2005 SP1 we also + need to ship Microsoft.VC80.MFCLOC. + +2171. [bug] Handle breaks in DNSSEC trust chains where the parent + servers are not DS aware (DS queries to the parent + return a referral to the child). + +2170. [func] Add acache processing to test suite. [RT #16711] + +2169. [bug] host, nslookup: when reporting NXDOMAIN report the + given name and not the last name searched for. + [RT #16763] + +2168. [bug] nsupdate: in non-interactive mode treat syntax errors + as fatal errors. [RT #16785] + +2167. [bug] When re-using a automatic zone named failed to + attach it to the new view. [RT #16786] + +2166. [bug] When running in batch mode, dig could misinterpret + a server address as a name to be looked up, causing + unexpected output. [RT #16743] + +2164. [bug] The code to determine how named-checkzone / + named-compilezone was called failed under windows. + [RT #16764] + +2162. [func] Allow "rrset-order fixed" to be disabled at compile + time. [RT #16665] + +2161. [bug] 'rndc flush' could report a false success. [RT #16698] + +2160. [bug] libisc wasn't handling NULL ifa_addr pointers returned + from getifaddrs(). [RT #16708] + +2159. [bug] Array bounds overrun in acache processing. [RT #16710] + +2158. [bug] ns_client_isself() failed to initialise key + leading to a REQUIRE failure. [RT #16688] + +2156. [bug] Fix node reference leaks in lookup.c:lookup_find(), + resolver.c:validated() and resolver.c:cache_name(). + Fix a memory leak in rbtdb.c:free_noqname(). + Make lookup.c:lookup_find() robust against + event leaks. [RT #16685] + +2155. [contrib] SQLite sdb module from jaboydjr@netwalk.com. + [RT #16694] + +2153. [bug] nsupdate could leak memory. [RT #16691] + +2152. [cleanup] Use sizeof(buf) instead of fixed number in + dighost.c:get_trusted_key(). [RT #16678] + +2151. [bug] Missing newline in usage message for journalprint. + [RT #16679] + +2150. [bug] 'rrset-order cyclic' uniformly distribute the + starting point for the first response for a given + RRset. [RT #16655] + +2149. [bug] isc_mem_checkdestroyed() failed to abort on + if there were still active memory contexts. + [RT #16672] + +2147. [bug] libbind: remove potential buffer overflow from + hmac_link.c. [RT #16437] + +2146. [cleanup] Silence Linux's spurious "obsolete setsockopt + SO_BSDCOMPAT" message. [RT #16641] + +2145. [bug] Check DS/DLV digest lengths for known digests. + [RT #16622] + +2144. [cleanup] Suppress logging of SERVFAIL from forwarders. + [RT #16619] + +2143. [bug] We failed to restart the IPv6 client when the + kernel failed to return the destination the + packet was sent to. [RT #16613] + +2142. [bug] Handle master files with a modification time that + matches the epoch. [RT# 16612] + +2141. [bug] dig/host should not be setting IDN_ASCCHECK (IDN + equivalent of LDH checks). [RT #16609] + +2140. [bug] libbind: missing unlock on pthread_key_create() + failures. [RT #16654] + +2139. [bug] dns_view_find() was being called with wrong type + in adb.c. [RT #16670] + +2119. [compat] libbind: allow res_init() to succeed enough to + return the default domain even if it was unable + to allocate memory. + --- 9.4.1 released --- 2172. [bug] query_addsoa() was being called with a non zone db. @@ -524,7 +795,7 @@ hex strings with comments. [RT #15814] 1974. [doc] List each of the zone types and associated zone - options seperately in the ARM. + options separately in the ARM. 1973. [func] TSIG HMACSHA1, HMACSHA224, HMACSHA256, HMACSHA384 and HMACSHA512 support. [RT #13606] @@ -551,7 +822,7 @@ 1965. [func] Suppress spurious "recusion requested but not available" warning with 'dig +qr'. [RT #15780]. -1964. [func] Seperate out MX and SRV to CNAME checks. [RT #15723] +1964. [func] Separate out MX and SRV to CNAME checks. [RT #15723] 1963. [port] Tru64 4.0E doesn't support send() and recv(). [RT #15586] @@ -771,7 +1042,7 @@ 1898. [bug] Extend ISC_SOCKADDR_FORMATSIZE and ISC_NETADDR_FORMATSIZE to allow for scope details. -1897. [func] x86 and x86_64 now have seperate atomic locking +1897. [func] x86 and x86_64 now have separate atomic locking implementations. 1896. [bug] Recursive clients soft quota support wasn't working @@ -825,7 +1096,7 @@ [RT #14892] 1878. [func] Detect duplicates of UDP queries we are recursing on - and drop them. New stats category "duplicates". + and drop them. New stats category "duplicate". [RT #2471] 1877. [bug] Fix unreasonably low quantum on call to @@ -1769,7 +2040,7 @@ [RT #6427] 1555. [func] 'rrset-order cyclic' no longer has a random starting - point. [RT #7572] + point per query. [RT #7572] 1554. [bug] dig, host, nslookup failed when no nameservers were specified in /etc/resolv.conf. [RT #8232] @@ -6250,7 +6521,7 @@ and has been removed. 170. [cleanup] Remove inter server consistancy checks from zone, - these should return as a seperate module in 9.1. + these should return as a separate module in 9.1. dns_zone_checkservers(), dns_zone_checkparents(), dns_zone_checkchildren(), dns_zone_checkglue(). ==== //depot/projects/binutils/src/contrib/bind9/COPYRIGHT#3 (text+ko) ==== @@ -1,7 +1,7 @@ Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") Copyright (C) 1996-2003 Internet Software Consortium. -Permission to use, copy, modify, and distribute this software for any +Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. @@ -13,7 +13,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -$Id: COPYRIGHT,v 1.9.18.3 2007/01/08 02:41:59 marka Exp $ +$Id: COPYRIGHT,v 1.9.18.4 2007/08/28 07:19:54 tbox Exp $ Portions Copyright (C) 1996-2001 Nominum, Inc. ==== //depot/projects/binutils/src/contrib/bind9/FAQ#3 (text+ko) ==== @@ -4,97 +4,71 @@ Copyright © 2000-2003 Internet Software Consortium. -------------------------------------------------------------------------------- +----------------------------------------------------------------------- -Q: Why doesn't -u work on Linux 2.2.x when I build with --enable-threads? +1. Compilation and Installation Questions -A: Linux threads do not fully implement the Posix threads (pthreads) standard. In - particular, setuid() operates only on the current thread, not the full process. - Because of this limitation, BIND 9 cannot use setuid() on Linux as it can on - all other supported platforms. setuid() cannot be called before creating - threads, since the server does not start listening on reserved ports until - after threads have started. +Q: I'm trying to compile BIND 9, and "make" is failing due to files not + being found. Why? - In the 2.2.18 or 2.3.99-pre3 and newer kernels, the ability to preserve - capabilities across a setuid() call is present. This allows BIND 9 to call - setuid() early, while retaining the ability to bind reserved ports. This is a - Linux-specific hack. +A: Using a parallel or distributed "make" to build BIND 9 is not + supported, and doesn't work. If you are using one of these, use normal + make or gmake instead. - On a 2.2 kernel, BIND 9 does drop many root privileges, so it should be less of - a security risk than a root process that has not dropped privileges. +Q: Isn't "make install" supposed to generate a default named.conf? - If Linux threads ever work correctly, this restriction will go away. +A: Short Answer: No. - Configuring BIND9 with the --disable-threads option (the default) causes a - non-threaded version to be built, which will allow -u to be used. + Long Answer: There really isn't a default configuration which fits any + site perfectly. There are lots of decisions that need to be made and + there is no consensus on what the defaults should be. For example + FreeBSD uses /etc/namedb as the location where the configuration files + for named are stored. Others use /var/named. -Q: Why do I get the following errors: + What addresses to listen on? For a laptop on the move a lot you may + only want to listen on the loop back interfaces. - general: errno2result.c:109: unexpected error: - general: unable to convert errno to isc_result: 14: Bad address - client: UDP client handler shutting down due to fatal receive error: unexpected error + Who do you offer recursive service to? Is there are firewall to + consider? If so is it stateless or stateful. Are you directly on the + Internet? Are you on a private network? Are you on a NAT'd network? The + answers to all these questions change how you configure even a caching + name server. -A: This is the result of a Linux kernel bug. +2. Configuration and Setup Questions - See: http://marc.theaimsgroup.com/?l=linux-netdev&m=113081708031466&w=2 +Q: Why does named log the warning message "no TTL specified - using SOA + MINTTL instead"? -Q: Why does named log the warning message "no TTL specified - using SOA MINTTL - instead"? - -A: Your zone file is illegal according to RFC1035. It must either have a line - like: +A: Your zone file is illegal according to RFC1035. It must either have a + line like: $TTL 86400 - at the beginning, or the first record in it must have a TTL field, like the - "84600" in this example: + at the beginning, or the first record in it must have a TTL field, like + the "84600" in this example: example.com. 86400 IN SOA ns hostmaster ( 1 3600 1800 1814400 3600 ) -Q: Why do I see 5 (or more) copies of named on Linux? +Q: Why do I get errors like "dns_zone_load: zone foo/IN: loading master + file bar: ran out of space"? -A: Linux threads each show up as a process under ps. The approximate number of - threads running is n+4, where n is the number of CPUs. Note that the amount of - memory used is not cumulative; if each process is using 10M of memory, only a - total of 10M is used. - - Newer versions of Linux's ps command hide the individual threads and require -L - to display them. - -Q: Why does BIND 9 log "permission denied" errors accessing its configuration - files or zones on my Linux system even though it is running as root? +A: This is often caused by TXT records with missing close quotes. Check + that all TXT records containing quoted strings have both open and close + quotes. -A: On Linux, BIND 9 drops most of its root privileges on startup. This including - the privilege to open files owned by other users. Therefore, if the server is - running as root, the configuration files and zone files should also be owned by - root. - -Q: Why do I get errors like "dns_zone_load: zone foo/IN: loading master file bar: - ran out of space"? - -A: This is often caused by TXT records with missing close quotes. Check that all - TXT records containing quoted strings have both open and close quotes. - -Q: How do I produce a usable core file from a multi-threaded named on Linux? - -A: If the Linux kernel is 2.4.7 or newer, multi-threaded core dumps are usable - (that is, the correct thread is dumped). Otherwise, if using a 2.2 kernel, - apply the kernel patch found in contrib/linux/coredump-patch and rebuild the - kernel. This patch will cause multi-threaded programs to dump the correct - thread. - Q: How do I restrict people from looking up the server version? -A: Put a "version" option containing something other than the real version in the - "options" section of named.conf. Note doing this will not prevent attacks and - may impede people trying to diagnose problems with your server. Also it is - possible to "fingerprint" nameservers to determine their version. +A: Put a "version" option containing something other than the real version + in the "options" section of named.conf. Note doing this will not + prevent attacks and may impede people trying to diagnose problems with + your server. Also it is possible to "fingerprint" nameservers to + determine their version. Q: How do I restrict only remote users from looking up the server version? -A: The following view statement will intercept lookups as the internal view that - holds the version information will be matched last. The caveats of the previous - answer still apply, of course. +A: The following view statement will intercept lookups as the internal + view that holds the version information will be matched last. The + caveats of the previous answer still apply, of course. view "chaos" chaos { match-clients { ; }; @@ -105,121 +79,47 @@ }; }; -Q: What do "no source of entropy found" or "could not open entropy source foo" - mean? +Q: What do "no source of entropy found" or "could not open entropy source + foo" mean? -A: The server requires a source of entropy to perform certain operations, mostly - DNSSEC related. These messages indicate that you have no source of entropy. On - systems with /dev/random or an equivalent, it is used by default. A source of - entropy can also be defined using the random-device option in named.conf. +A: The server requires a source of entropy to perform certain operations, + mostly DNSSEC related. These messages indicate that you have no source + of entropy. On systems with /dev/random or an equivalent, it is used by + default. A source of entropy can also be defined using the + random-device option in named.conf. -Q: I installed BIND 9 and restarted named, but it's still BIND 8. Why? +Q: I'm trying to use TSIG to authenticate dynamic updates or zone + transfers. I'm sure I have the keys set up correctly, but the server is + rejecting the TSIG. Why? -A: BIND 9 is installed under /usr/local by default. BIND 8 is often installed - under /usr. Check that the correct named is running. - -Q: I'm trying to use TSIG to authenticate dynamic updates or zone transfers. I'm - sure I have the keys set up correctly, but the server is rejecting the TSIG. - Why? +A: This may be a clock skew problem. Check that the the clocks on the + client and server are properly synchronised (e.g., using ntp). -A: This may be a clock skew problem. Check that the the clocks on the client and - server are properly synchronised (e.g., using ntp). - -Q: I'm trying to compile BIND 9, and "make" is failing due to files not being - found. Why? - -A: Using a parallel or distributed "make" to build BIND 9 is not supported, and - doesn't work. If you are using one of these, use normal make or gmake instead. - -Q: I have a BIND 9 master and a BIND 8.2.3 slave, and the master is logging error - messages like "notify to 10.0.0.1#53 failed: unexpected end of input". What's - wrong? - -A: This error message is caused by a known bug in BIND 8.2.3 and is fixed in BIND - 8.2.4. It can be safely ignored - the notify has been acted on by the slave - despite the error message. - -Q: I keep getting log messages like the following. Why? - - Dec 4 23:47:59 client 10.0.0.1#1355: updating zone 'example.com/IN': update - failed: 'RRset exists (value dependent)' prerequisite not satisfied (NXRRSET) - -A: DNS updates allow the update request to test to see if certain conditions are - met prior to proceeding with the update. The message above is saying that - conditions were not met and the update is not proceeding. See doc/rfc/ - rfc2136.txt for more details on prerequisites. - -Q: I keep getting log messages like the following. Why? - - Jun 21 12:00:00.000 client 10.0.0.1#1234: update denied - -A: Someone is trying to update your DNS data using the RFC2136 Dynamic Update - protocol. Windows 2000 machines have a habit of sending dynamic update requests - to DNS servers without being specifically configured to do so. If the update - requests are coming from a Windows 2000 machine, see http:// - support.microsoft.com/support/kb/articles/q246/8/04.asp for information about - how to turn them off. - Q: I see a log message like the following. Why? couldn't open pid file '/var/run/named.pid': Permission denied -A: You are most likely running named as a non-root user, and that user does not - have permission to write in /var/run. The common ways of fixing this are to - create a /var/run/named directory owned by the named user and set pid-file to " - /var/run/named/named.pid", or set pid-file to "named.pid", which will put the - file in the directory specified by the directory option (which, in this case, - must be writable by the named user). +A: You are most likely running named as a non-root user, and that user + does not have permission to write in /var/run. The common ways of + fixing this are to create a /var/run/named directory owned by the named + user and set pid-file to "/var/run/named/named.pid", or set pid-file to + "named.pid", which will put the file in the directory specified by the + directory option (which, in this case, must be writable by the named + user). -Q: When I do a "dig . ns", many of the A records for the root servers are missing. - Why? +Q: I can query the nameserver from the nameserver but not from other + machines. Why? -A: This is normal and harmless. It is a somewhat confusing side effect of the way - BIND 9 does RFC2181 trust ranking and of the efforts BIND 9 makes to avoid - promoting glue into answers. +A: This is usually the result of the firewall configuration stopping the + queries and / or the replies. - When BIND 9 first starts up and primes its cache, it receives the root server - addresses as additional data in an authoritative response from a root server, - and these records are eligible for inclusion as additional data in responses. - Subsequently it receives a subset of the root server addresses as additional - data in a non-authoritative (referral) response from a root server. This causes - the addresses to now be considered non-authoritative (glue) data, which is not - eligible for inclusion in responses. +Q: How can I make a server a slave for both an internal and an external + view at the same time? When I tried, both views on the slave were + transferred from the same view on the master. - The server does have a complete set of root server addresses cached at all - times, it just may not include all of them as additional data, depending on - whether they were last received as answers or as glue. You can always look up - the addresses with explicit queries like "dig a.root-servers.net A". - -Q: Zone transfers from my BIND 9 master to my Windows 2000 slave fail. Why? +A: You will need to give the master and slave multiple IP addresses and + use those to make sure you reach the correct view on the other machine. -A: This may be caused by a bug in the Windows 2000 DNS server where DNS messages - larger than 16K are not handled properly. This can be worked around by setting - the option "transfer-format one-answer;". Also check whether your zone contains - domain names with embedded spaces or other special characters, like "John\ - 032Doe\213s\032Computer", since such names have been known to cause Windows - 2000 slaves to incorrectly reject the zone. - -Q: Why don't my zones reload when I do an "rndc reload" or SIGHUP? - -A: A zone can be updated either by editing zone files and reloading the server or - by dynamic update, but not both. If you have enabled dynamic update for a zone - using the "allow-update" option, you are not supposed to edit the zone file by - hand, and the server will not attempt to reload it. - -Q: I can query the nameserver from the nameserver but not from other machines. - Why? - -A: This is usually the result of the firewall configuration stopping the queries - and / or the replies. - -Q: How can I make a server a slave for both an internal and an external view at - the same time? When I tried, both views on the slave were transferred from the - same view on the master. - -A: You will need to give the master and slave multiple IP addresses and use those - to make sure you reach the correct view on the other machine. - Master: 10.0.1.1 (internal), 10.0.1.2 (external, IP alias) internal: match-clients { !10.0.1.2; !10.0.1.4; 10.0.1/24; }; @@ -246,8 +146,8 @@ transfer-source 10.0.1.4; query-source address 10.0.1.4; - You put the external address on the alias so that all the other dns clients on - these boxes see the internal view by default. + You put the external address on the alias so that all the other dns + clients on these boxes see the internal view by default. A: BIND 9.3 and later: Use TSIG to select the appropriate view. @@ -283,64 +183,38 @@ ... }; -Q: I have FreeBSD 4.x and "rndc-confgen -a" just sits there. +Q: I get error messages like "multiple RRs of singleton type" and "CNAME + and other data" when transferring a zone. What does this mean? -A: /dev/random is not configured. Use rndcontrol(8) to tell the kernel to use - certain interrupts as a source of random events. You can make this permanent by - setting rand_irqs in /etc/rc.conf. +A: These indicate a malformed master zone. You can identify the exact + records involved by transferring the zone using dig then running + named-checkzone on it. - /etc/rc.conf - rand_irqs="3 14 15" - - See also http://people.freebsd.org/~dougb/randomness.html - -Q: Why is named listening on UDP port other than 53? - -A: Named uses a system selected port to make queries of other nameservers. This - behaviour can be overridden by using query-source to lock down the port and/or - address. See also notify-source and transfer-source. - -Q: I get error messages like "multiple RRs of singleton type" and "CNAME and other - data" when transferring a zone. What does this mean? - -A: These indicate a malformed master zone. You can identify the exact records - involved by transferring the zone using dig then running named-checkzone on it. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 2 23:20:55 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBE0816A419; Sun, 2 Dec 2007 23:20:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52D7D16A417 for ; Sun, 2 Dec 2007 23:20:55 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4652313C4CC for ; Sun, 2 Dec 2007 23:20:55 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2NKt8o008116 for ; Sun, 2 Dec 2007 23:20:55 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB2NKrBV008113 for perforce@freebsd.org; Sun, 2 Dec 2007 23:20:53 GMT (envelope-from jb@freebsd.org) Date: Sun, 2 Dec 2007 23:20:53 GMT Message-Id: <200712022320.lB2NKrBV008113@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130061 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 23:20:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=130061 Change 130061 by jb@jb_freebsd1 on 2007/12/02 23:20:27 IF6 Affected files ... .. //depot/projects/dtrace6/src/UPDATING#4 integrate .. //depot/projects/dtrace6/src/contrib/gdb/gdb/i386fbsd-nat.c#2 integrate .. //depot/projects/dtrace6/src/etc/etc.alpha/ttys#2 integrate .. //depot/projects/dtrace6/src/etc/etc.amd64/ttys#2 integrate .. //depot/projects/dtrace6/src/etc/etc.arm/ttys#2 integrate .. //depot/projects/dtrace6/src/etc/etc.i386/ttys#2 integrate .. //depot/projects/dtrace6/src/etc/etc.ia64/ttys#2 integrate .. //depot/projects/dtrace6/src/etc/etc.powerpc/ttys#2 integrate .. //depot/projects/dtrace6/src/etc/etc.sparc64/ttys#2 integrate .. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/arch/arm/Makefile#2 integrate .. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c#2 integrate .. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c#2 integrate .. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/arch/arm/init.c#2 integrate .. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h#2 integrate .. //depot/projects/dtrace6/src/lib/libc/locale/none.c#4 integrate .. //depot/projects/dtrace6/src/lib/libpthread/thread/thr_spec.c#2 integrate .. //depot/projects/dtrace6/src/lib/libutil/pty.c#2 integrate .. //depot/projects/dtrace6/src/release/doc/en_US.ISO8859-1/errata/article.sgml#2 integrate .. //depot/projects/dtrace6/src/release/doc/share/sgml/release.ent#2 integrate .. //depot/projects/dtrace6/src/sbin/atacontrol/atacontrol.8#2 integrate .. //depot/projects/dtrace6/src/sbin/ipfw/ipfw.8#2 integrate .. //depot/projects/dtrace6/src/sbin/mdconfig/mdconfig.8#3 integrate .. //depot/projects/dtrace6/src/sbin/sysctl/sysctl.8#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/ichsmb.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/rl.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man9/style.9#2 integrate .. //depot/projects/dtrace6/src/sys/alpha/alpha/busdma_machdep.c#2 integrate .. //depot/projects/dtrace6/src/sys/alpha/alpha/interrupt.c#2 integrate .. //depot/projects/dtrace6/src/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/dtrace6/src/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/dtrace6/src/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/dtrace6/src/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/dtrace6/src/sys/arm/at91/std.at91#2 integrate .. //depot/projects/dtrace6/src/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/dtrace6/src/sys/arm/conf/HL200#1 branch .. //depot/projects/dtrace6/src/sys/conf/options.arm#3 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_auth.c#3 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate .. //depot/projects/dtrace6/src/sys/dev/an/if_an.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/an/if_anreg.h#2 integrate .. //depot/projects/dtrace6/src/sys/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/random/yarrow.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/dtrace6/src/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/dtrace6/src/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/dtrace6/src/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/dtrace6/src/sys/kern/tty_pty.c#3 integrate .. //depot/projects/dtrace6/src/sys/net/if_lagg.c#3 integrate .. //depot/projects/dtrace6/src/sys/pci/if_rl.c#2 integrate .. //depot/projects/dtrace6/src/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/conf/DEFAULTS#1 branch .. //depot/projects/dtrace6/src/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/dtrace6/src/sys/sys/param.h#5 integrate .. //depot/projects/dtrace6/src/usr.bin/tail/read.c#3 integrate .. //depot/projects/dtrace6/src/usr.sbin/Makefile#3 integrate .. //depot/projects/dtrace6/src/usr.sbin/ipfwpcap/Makefile#1 branch .. //depot/projects/dtrace6/src/usr.sbin/ipfwpcap/ipfwpcap.8#1 branch .. //depot/projects/dtrace6/src/usr.sbin/ipfwpcap/ipfwpcap.c#1 branch .. //depot/projects/dtrace6/src/usr.sbin/newsyslog/newsyslog.conf.5#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/pciconf/pciconf.8#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/pkg_install/add/main.c#2 integrate Differences ... ==== //depot/projects/dtrace6/src/UPDATING#4 (text+ko) ==== @@ -8,6 +8,17 @@ /usr/ports/UPDATING. Please read that file before running portupgrade. +20071126: + The AT keyboard emulation of sunkbd(4) has been turned on + by default. In order to make the special symbols of the Sun + keyboards driven by sunkbd(4) work under X these now have + to be configured the same way as Sun USB keyboards driven + by ukbd(4) (which also does AT keyboard emulation), f.e.: + + Option "XkbLayout" "us" + Option "XkbRules" "xorg" + Option "XkbSymbols" "pc(pc105)+sun_vndr/usb(sun_usb)+us" + 20071024: A breakage was introduced in libc and fixed later. Make sure you have lib/Makefile rev 1.205.2.4. If it already breaks your @@ -545,4 +556,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.416.2.37 2007/10/25 12:49:21 rafan Exp $ +$FreeBSD: src/UPDATING,v 1.416.2.38 2007/11/26 21:04:58 marius Exp $ ==== //depot/projects/dtrace6/src/contrib/gdb/gdb/i386fbsd-nat.c#2 (text+ko) ==== @@ -91,7 +91,7 @@ #ifdef KERN_PS_STRINGS { int mib[2]; - int ps_strings; + u_long ps_strings; size_t len; mib[0] = CTL_KERN; ==== //depot/projects/dtrace6/src/etc/etc.alpha/ttys#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.alpha/ttys,v 1.11 2003/10/24 15:44:07 simokawa Exp $ +# $FreeBSD: src/etc/etc.alpha/ttys,v 1.11.10.1 2007/11/27 18:41:51 jhb Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -309,3 +309,259 @@ ttySt none network ttySu none network ttySv none network +ttyl0 none network +ttyl1 none network +ttyl2 none network +ttyl3 none network +ttyl4 none network +ttyl5 none network +ttyl6 none network +ttyl7 none network +ttyl8 none network +ttyl9 none network +ttyla none network +ttylb none network +ttylc none network +ttyld none network +ttyle none network +ttylf none network +ttylg none network +ttylh none network +ttyli none network +ttylj none network +ttylk none network +ttyll none network +ttylm none network +ttyln none network +ttylo none network +ttylp none network +ttylq none network +ttylr none network +ttyls none network +ttylt none network +ttylu none network +ttylv none network +ttym0 none network +ttym1 none network +ttym2 none network +ttym3 none network +ttym4 none network +ttym5 none network +ttym6 none network +ttym7 none network +ttym8 none network +ttym9 none network +ttyma none network +ttymb none network +ttymc none network +ttymd none network +ttyme none network +ttymf none network +ttymg none network +ttymh none network +ttymi none network +ttymj none network +ttymk none network +ttyml none network +ttymm none network +ttymn none network +ttymo none network +ttymp none network +ttymq none network +ttymr none network +ttyms none network +ttymt none network +ttymu none network +ttymv none network +ttyn0 none network +ttyn1 none network +ttyn2 none network +ttyn3 none network +ttyn4 none network +ttyn5 none network +ttyn6 none network +ttyn7 none network +ttyn8 none network +ttyn9 none network +ttyna none network +ttynb none network +ttync none network +ttynd none network +ttyne none network +ttynf none network +ttyng none network +ttynh none network +ttyni none network +ttynj none network +ttynk none network +ttynl none network +ttynm none network +ttynn none network +ttyno none network +ttynp none network +ttynq none network +ttynr none network +ttyns none network +ttynt none network +ttynu none network +ttynv none network +ttyo0 none network +ttyo1 none network +ttyo2 none network +ttyo3 none network +ttyo4 none network +ttyo5 none network +ttyo6 none network +ttyo7 none network +ttyo8 none network +ttyo9 none network +ttyoa none network +ttyob none network +ttyoc none network +ttyod none network +ttyoe none network +ttyof none network +ttyog none network +ttyoh none network +ttyoi none network +ttyoj none network +ttyok none network +ttyol none network +ttyom none network +ttyon none network +ttyoo none network +ttyop none network +ttyoq none network +ttyor none network +ttyos none network +ttyot none network +ttyou none network +ttyov none network +ttyL0 none network +ttyL1 none network +ttyL2 none network +ttyL3 none network +ttyL4 none network +ttyL5 none network +ttyL6 none network +ttyL7 none network +ttyL8 none network +ttyL9 none network +ttyLa none network +ttyLb none network +ttyLc none network +ttyLd none network +ttyLe none network +ttyLf none network +ttyLg none network +ttyLh none network +ttyLi none network +ttyLj none network +ttyLk none network +ttyLl none network +ttyLm none network +ttyLn none network +ttyLo none network +ttyLp none network +ttyLq none network +ttyLr none network +ttyLs none network +ttyLt none network +ttyLu none network +ttyLv none network +ttyM0 none network +ttyM1 none network +ttyM2 none network +ttyM3 none network +ttyM4 none network +ttyM5 none network +ttyM6 none network +ttyM7 none network +ttyM8 none network +ttyM9 none network +ttyMa none network +ttyMb none network +ttyMc none network +ttyMd none network +ttyMe none network +ttyMf none network +ttyMg none network +ttyMh none network +ttyMi none network +ttyMj none network +ttyMk none network +ttyMl none network +ttyMm none network +ttyMn none network +ttyMo none network +ttyMp none network +ttyMq none network +ttyMr none network +ttyMs none network +ttyMt none network +ttyMu none network +ttyMv none network +ttyN0 none network +ttyN1 none network +ttyN2 none network +ttyN3 none network +ttyN4 none network +ttyN5 none network +ttyN6 none network +ttyN7 none network +ttyN8 none network +ttyN9 none network +ttyNa none network +ttyNb none network +ttyNc none network +ttyNd none network +ttyNe none network +ttyNf none network +ttyNg none network +ttyNh none network +ttyNi none network +ttyNj none network +ttyNk none network +ttyNl none network +ttyNm none network +ttyNn none network +ttyNo none network +ttyNp none network +ttyNq none network +ttyNr none network +ttyNs none network +ttyNt none network +ttyNu none network +ttyNv none network +ttyO0 none network +ttyO1 none network +ttyO2 none network +ttyO3 none network +ttyO4 none network +ttyO5 none network +ttyO6 none network +ttyO7 none network +ttyO8 none network +ttyO9 none network +ttyOa none network +ttyOb none network +ttyOc none network +ttyOd none network +ttyOe none network +ttyOf none network +ttyOg none network +ttyOh none network +ttyOi none network +ttyOj none network +ttyOk none network +ttyOl none network +ttyOm none network +ttyOn none network +ttyOo none network +ttyOp none network +ttyOq none network +ttyOr none network +ttyOs none network +ttyOt none network +ttyOu none network +ttyOv none network ==== //depot/projects/dtrace6/src/etc/etc.amd64/ttys#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.amd64/ttys,v 1.10 2003/10/24 15:44:07 simokawa Exp $ +# $FreeBSD: src/etc/etc.amd64/ttys,v 1.10.10.1 2007/11/27 18:41:51 jhb Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -307,3 +307,259 @@ ttySt none network ttySu none network ttySv none network +ttyl0 none network +ttyl1 none network +ttyl2 none network +ttyl3 none network +ttyl4 none network +ttyl5 none network +ttyl6 none network +ttyl7 none network +ttyl8 none network +ttyl9 none network +ttyla none network +ttylb none network +ttylc none network +ttyld none network +ttyle none network +ttylf none network +ttylg none network +ttylh none network +ttyli none network +ttylj none network +ttylk none network +ttyll none network +ttylm none network +ttyln none network +ttylo none network +ttylp none network +ttylq none network +ttylr none network +ttyls none network +ttylt none network +ttylu none network +ttylv none network +ttym0 none network +ttym1 none network +ttym2 none network +ttym3 none network +ttym4 none network +ttym5 none network +ttym6 none network +ttym7 none network +ttym8 none network +ttym9 none network +ttyma none network +ttymb none network +ttymc none network +ttymd none network +ttyme none network +ttymf none network +ttymg none network +ttymh none network +ttymi none network +ttymj none network +ttymk none network +ttyml none network +ttymm none network +ttymn none network +ttymo none network +ttymp none network +ttymq none network +ttymr none network +ttyms none network +ttymt none network +ttymu none network +ttymv none network +ttyn0 none network +ttyn1 none network +ttyn2 none network +ttyn3 none network +ttyn4 none network +ttyn5 none network +ttyn6 none network +ttyn7 none network +ttyn8 none network +ttyn9 none network +ttyna none network +ttynb none network +ttync none network +ttynd none network +ttyne none network +ttynf none network +ttyng none network +ttynh none network +ttyni none network +ttynj none network +ttynk none network +ttynl none network +ttynm none network +ttynn none network +ttyno none network +ttynp none network +ttynq none network +ttynr none network +ttyns none network +ttynt none network +ttynu none network +ttynv none network +ttyo0 none network +ttyo1 none network +ttyo2 none network +ttyo3 none network +ttyo4 none network +ttyo5 none network +ttyo6 none network +ttyo7 none network +ttyo8 none network +ttyo9 none network +ttyoa none network +ttyob none network +ttyoc none network +ttyod none network +ttyoe none network +ttyof none network +ttyog none network +ttyoh none network +ttyoi none network +ttyoj none network +ttyok none network +ttyol none network +ttyom none network +ttyon none network +ttyoo none network +ttyop none network +ttyoq none network +ttyor none network +ttyos none network +ttyot none network +ttyou none network +ttyov none network +ttyL0 none network +ttyL1 none network +ttyL2 none network +ttyL3 none network +ttyL4 none network +ttyL5 none network +ttyL6 none network +ttyL7 none network +ttyL8 none network +ttyL9 none network +ttyLa none network +ttyLb none network +ttyLc none network +ttyLd none network +ttyLe none network +ttyLf none network +ttyLg none network +ttyLh none network +ttyLi none network +ttyLj none network +ttyLk none network +ttyLl none network +ttyLm none network +ttyLn none network +ttyLo none network +ttyLp none network +ttyLq none network +ttyLr none network +ttyLs none network +ttyLt none network +ttyLu none network +ttyLv none network +ttyM0 none network +ttyM1 none network +ttyM2 none network +ttyM3 none network +ttyM4 none network +ttyM5 none network +ttyM6 none network +ttyM7 none network +ttyM8 none network +ttyM9 none network +ttyMa none network +ttyMb none network +ttyMc none network +ttyMd none network +ttyMe none network +ttyMf none network +ttyMg none network +ttyMh none network +ttyMi none network +ttyMj none network +ttyMk none network +ttyMl none network +ttyMm none network +ttyMn none network +ttyMo none network +ttyMp none network +ttyMq none network +ttyMr none network +ttyMs none network +ttyMt none network +ttyMu none network +ttyMv none network +ttyN0 none network +ttyN1 none network +ttyN2 none network +ttyN3 none network +ttyN4 none network +ttyN5 none network +ttyN6 none network +ttyN7 none network +ttyN8 none network +ttyN9 none network +ttyNa none network +ttyNb none network +ttyNc none network +ttyNd none network +ttyNe none network +ttyNf none network +ttyNg none network +ttyNh none network +ttyNi none network +ttyNj none network +ttyNk none network +ttyNl none network +ttyNm none network +ttyNn none network +ttyNo none network +ttyNp none network +ttyNq none network +ttyNr none network +ttyNs none network +ttyNt none network +ttyNu none network +ttyNv none network +ttyO0 none network +ttyO1 none network +ttyO2 none network +ttyO3 none network +ttyO4 none network +ttyO5 none network +ttyO6 none network +ttyO7 none network +ttyO8 none network +ttyO9 none network +ttyOa none network +ttyOb none network +ttyOc none network +ttyOd none network +ttyOe none network +ttyOf none network +ttyOg none network +ttyOh none network +ttyOi none network +ttyOj none network +ttyOk none network +ttyOl none network +ttyOm none network +ttyOn none network +ttyOo none network +ttyOp none network +ttyOq none network +ttyOr none network +ttyOs none network +ttyOt none network +ttyOu none network +ttyOv none network ==== //depot/projects/dtrace6/src/etc/etc.arm/ttys#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.arm/ttys,v 1.2 2004/09/24 12:51:15 cognet Exp $ +# $FreeBSD: src/etc/etc.arm/ttys,v 1.2.2.1 2007/11/27 18:41:51 jhb Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -308,3 +308,259 @@ ttySt none network ttySu none network ttySv none network +ttyl0 none network +ttyl1 none network +ttyl2 none network +ttyl3 none network +ttyl4 none network +ttyl5 none network +ttyl6 none network +ttyl7 none network +ttyl8 none network +ttyl9 none network +ttyla none network +ttylb none network +ttylc none network +ttyld none network +ttyle none network +ttylf none network +ttylg none network +ttylh none network +ttyli none network +ttylj none network +ttylk none network +ttyll none network +ttylm none network +ttyln none network +ttylo none network +ttylp none network +ttylq none network +ttylr none network +ttyls none network +ttylt none network +ttylu none network +ttylv none network +ttym0 none network +ttym1 none network +ttym2 none network +ttym3 none network +ttym4 none network +ttym5 none network +ttym6 none network +ttym7 none network +ttym8 none network +ttym9 none network +ttyma none network +ttymb none network +ttymc none network +ttymd none network +ttyme none network +ttymf none network +ttymg none network +ttymh none network +ttymi none network +ttymj none network +ttymk none network +ttyml none network +ttymm none network +ttymn none network +ttymo none network +ttymp none network +ttymq none network +ttymr none network +ttyms none network +ttymt none network +ttymu none network +ttymv none network +ttyn0 none network +ttyn1 none network +ttyn2 none network +ttyn3 none network +ttyn4 none network +ttyn5 none network +ttyn6 none network +ttyn7 none network +ttyn8 none network +ttyn9 none network +ttyna none network +ttynb none network +ttync none network +ttynd none network +ttyne none network +ttynf none network +ttyng none network +ttynh none network +ttyni none network +ttynj none network +ttynk none network +ttynl none network +ttynm none network +ttynn none network +ttyno none network +ttynp none network +ttynq none network +ttynr none network +ttyns none network +ttynt none network +ttynu none network +ttynv none network +ttyo0 none network +ttyo1 none network +ttyo2 none network +ttyo3 none network +ttyo4 none network +ttyo5 none network +ttyo6 none network +ttyo7 none network +ttyo8 none network +ttyo9 none network +ttyoa none network +ttyob none network +ttyoc none network +ttyod none network +ttyoe none network +ttyof none network +ttyog none network +ttyoh none network +ttyoi none network +ttyoj none network +ttyok none network +ttyol none network +ttyom none network +ttyon none network +ttyoo none network +ttyop none network +ttyoq none network +ttyor none network +ttyos none network +ttyot none network +ttyou none network +ttyov none network +ttyL0 none network +ttyL1 none network +ttyL2 none network +ttyL3 none network +ttyL4 none network +ttyL5 none network +ttyL6 none network +ttyL7 none network +ttyL8 none network +ttyL9 none network +ttyLa none network +ttyLb none network +ttyLc none network +ttyLd none network +ttyLe none network +ttyLf none network +ttyLg none network +ttyLh none network +ttyLi none network +ttyLj none network +ttyLk none network +ttyLl none network +ttyLm none network +ttyLn none network +ttyLo none network +ttyLp none network +ttyLq none network +ttyLr none network +ttyLs none network +ttyLt none network +ttyLu none network +ttyLv none network +ttyM0 none network +ttyM1 none network +ttyM2 none network +ttyM3 none network +ttyM4 none network +ttyM5 none network +ttyM6 none network +ttyM7 none network +ttyM8 none network +ttyM9 none network +ttyMa none network +ttyMb none network +ttyMc none network +ttyMd none network +ttyMe none network +ttyMf none network +ttyMg none network +ttyMh none network +ttyMi none network +ttyMj none network +ttyMk none network +ttyMl none network +ttyMm none network +ttyMn none network +ttyMo none network +ttyMp none network +ttyMq none network +ttyMr none network +ttyMs none network +ttyMt none network +ttyMu none network +ttyMv none network +ttyN0 none network +ttyN1 none network +ttyN2 none network +ttyN3 none network +ttyN4 none network +ttyN5 none network +ttyN6 none network +ttyN7 none network +ttyN8 none network +ttyN9 none network +ttyNa none network +ttyNb none network +ttyNc none network +ttyNd none network +ttyNe none network +ttyNf none network +ttyNg none network +ttyNh none network +ttyNi none network +ttyNj none network +ttyNk none network +ttyNl none network +ttyNm none network +ttyNn none network +ttyNo none network +ttyNp none network +ttyNq none network +ttyNr none network +ttyNs none network +ttyNt none network +ttyNu none network +ttyNv none network +ttyO0 none network +ttyO1 none network +ttyO2 none network +ttyO3 none network +ttyO4 none network +ttyO5 none network +ttyO6 none network +ttyO7 none network +ttyO8 none network +ttyO9 none network +ttyOa none network +ttyOb none network +ttyOc none network +ttyOd none network +ttyOe none network +ttyOf none network +ttyOg none network +ttyOh none network +ttyOi none network +ttyOj none network +ttyOk none network +ttyOl none network +ttyOm none network +ttyOn none network +ttyOo none network +ttyOp none network +ttyOq none network +ttyOr none network +ttyOs none network +ttyOt none network +ttyOu none network +ttyOv none network ==== //depot/projects/dtrace6/src/etc/etc.i386/ttys#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.i386/ttys,v 1.10 2003/10/24 15:44:08 simokawa Exp $ +# $FreeBSD: src/etc/etc.i386/ttys,v 1.10.10.1 2007/11/27 18:41:52 jhb Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -307,3 +307,259 @@ ttySt none network ttySu none network ttySv none network +ttyl0 none network +ttyl1 none network +ttyl2 none network +ttyl3 none network +ttyl4 none network +ttyl5 none network +ttyl6 none network +ttyl7 none network +ttyl8 none network +ttyl9 none network +ttyla none network +ttylb none network +ttylc none network +ttyld none network +ttyle none network +ttylf none network +ttylg none network +ttylh none network +ttyli none network +ttylj none network +ttylk none network +ttyll none network +ttylm none network +ttyln none network +ttylo none network +ttylp none network +ttylq none network +ttylr none network +ttyls none network +ttylt none network +ttylu none network +ttylv none network +ttym0 none network +ttym1 none network +ttym2 none network +ttym3 none network +ttym4 none network +ttym5 none network +ttym6 none network +ttym7 none network +ttym8 none network +ttym9 none network +ttyma none network +ttymb none network +ttymc none network +ttymd none network +ttyme none network +ttymf none network +ttymg none network +ttymh none network +ttymi none network +ttymj none network +ttymk none network +ttyml none network +ttymm none network +ttymn none network +ttymo none network +ttymp none network +ttymq none network +ttymr none network +ttyms none network +ttymt none network +ttymu none network +ttymv none network +ttyn0 none network +ttyn1 none network +ttyn2 none network >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 2 23:34:11 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B72DB16A468; Sun, 2 Dec 2007 23:34:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6DEF716A418 for ; Sun, 2 Dec 2007 23:34:11 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5D30513C47E for ; Sun, 2 Dec 2007 23:34:11 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2NYBsE010671 for ; Sun, 2 Dec 2007 23:34:11 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB2NY9H8010668 for perforce@freebsd.org; Sun, 2 Dec 2007 23:34:09 GMT (envelope-from jb@freebsd.org) Date: Sun, 2 Dec 2007 23:34:09 GMT Message-Id: <200712022334.lB2NY9H8010668@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130062 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2007 23:34:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=130062 Change 130062 by jb@jb_freebsd1 on 2007/12/02 23:33:20 IF7 Affected files ... .. //depot/projects/dtrace7/src/ObsoleteFiles.inc#3 integrate .. //depot/projects/dtrace7/src/UPDATING#2 integrate .. //depot/projects/dtrace7/src/contrib/gdb/gdb/i386fbsd-nat.c#2 integrate .. //depot/projects/dtrace7/src/contrib/tcpdump/tcpdump.c#2 integrate .. //depot/projects/dtrace7/src/etc/etc.amd64/ttys#2 integrate .. //depot/projects/dtrace7/src/etc/etc.arm/ttys#2 integrate .. //depot/projects/dtrace7/src/etc/etc.i386/ttys#2 integrate .. //depot/projects/dtrace7/src/etc/etc.ia64/ttys#2 integrate .. //depot/projects/dtrace7/src/etc/etc.powerpc/ttys#2 integrate .. //depot/projects/dtrace7/src/etc/etc.sparc64/ttys#2 integrate .. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/arch/arm/Makefile#2 integrate .. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c#2 integrate .. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c#2 integrate .. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/arch/arm/init.c#2 integrate .. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h#2 integrate .. //depot/projects/dtrace7/src/lib/Makefile#2 integrate .. //depot/projects/dtrace7/src/lib/libgssapi/gss_acquire_cred.c#2 integrate .. //depot/projects/dtrace7/src/lib/libkse/thread/thr_spec.c#2 integrate .. //depot/projects/dtrace7/src/lib/libthread_db/arch/arm/libpthread_md.c#1 branch .. //depot/projects/dtrace7/src/lib/libutil/pty.c#2 integrate .. //depot/projects/dtrace7/src/release/Makefile#3 integrate .. //depot/projects/dtrace7/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/dtrace7/src/release/doc/share/sgml/release.ent#2 integrate .. //depot/projects/dtrace7/src/sbin/atacontrol/atacontrol.8#2 integrate .. //depot/projects/dtrace7/src/sbin/ipfw/ipfw.8#2 integrate .. //depot/projects/dtrace7/src/sbin/mdconfig/mdconfig.8#2 integrate .. //depot/projects/dtrace7/src/sbin/sysctl/sysctl.8#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/aac.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/agp.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/ichsmb.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/nfe.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/rl.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man9/rwlock.9#2 integrate .. //depot/projects/dtrace7/src/share/man/man9/sx.9#2 integrate .. //depot/projects/dtrace7/src/share/mk/sys.mk#2 integrate .. //depot/projects/dtrace7/src/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/dtrace7/src/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/at91/std.at91#2 integrate .. //depot/projects/dtrace7/src/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/dtrace7/src/sys/arm/conf/HL200#1 branch .. //depot/projects/dtrace7/src/sys/conf/files#3 integrate .. //depot/projects/dtrace7/src/sys/conf/newvers.sh#3 integrate .. //depot/projects/dtrace7/src/sys/conf/options.arm#2 integrate .. //depot/projects/dtrace7/src/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/dtrace7/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/dtrace7/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/dtrace7/src/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/dtrace7/src/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/dtrace7/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/aac/aac.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/an/if_an.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_80003es2lan.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_80003es2lan.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_82540.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_82541.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_82541.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_82542.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_82543.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_82543.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_82571.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_82571.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_82575.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_82575.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_api.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_api.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_defines.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_hw.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_ich8lan.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_ich8lan.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_mac.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_mac.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_manage.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_manage.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_nvm.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_nvm.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_osdep.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_phy.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_phy.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/e1000_regs.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/if_em.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/em/if_em.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ixgbe/ixgbe.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ixgbe/ixgbe.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ixgbe/ixgbe_82598.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ixgbe/ixgbe_api.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ixgbe/ixgbe_api.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ixgbe/ixgbe_common.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ixgbe/ixgbe_common.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ixgbe/ixgbe_osdep.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ixgbe/ixgbe_phy.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ixgbe/ixgbe_phy.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ixgbe/ixgbe_type.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/pci/pci.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/random/yarrow.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/usb/if_zyd.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/usb/if_zydreg.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/dtrace7/src/sys/fs/ntfs/ntfs_ihash.c#2 integrate .. //depot/projects/dtrace7/src/sys/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/dtrace7/src/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/dtrace7/src/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate .. //depot/projects/dtrace7/src/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/dtrace7/src/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/subr_witness.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/tty_pty.c#3 integrate .. //depot/projects/dtrace7/src/sys/net/if_lagg.c#2 integrate .. //depot/projects/dtrace7/src/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/dtrace7/src/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/dtrace7/src/sys/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/dtrace7/src/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/dtrace7/src/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/dtrace7/src/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/dtrace7/src/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/dtrace7/src/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/in_mcast.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/tcp_output.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/dtrace7/src/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/dtrace7/src/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/dtrace7/src/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/dtrace7/src/sys/pci/agp_i810.c#2 integrate .. //depot/projects/dtrace7/src/sys/pci/if_rl.c#2 integrate .. //depot/projects/dtrace7/src/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/dtrace7/src/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/conf/DEFAULTS#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/intr_machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/vm/vm_page.c#2 integrate .. //depot/projects/dtrace7/src/usr.bin/make/main.c#2 integrate .. //depot/projects/dtrace7/src/usr.bin/tail/read.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/newsyslog/newsyslog.conf.5#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/pciconf/pciconf.8#2 integrate Differences ... ==== //depot/projects/dtrace7/src/ObsoleteFiles.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.112.2.4 2007/11/22 21:25:17 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.112.2.5 2007/11/30 15:35:18 brix Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -3957,6 +3957,7 @@ # 20071120: shared library version bump OLD_LIBS+=usr/lib/libasn1.so.8 OLD_LIBS+=usr/lib/libgssapi.so.8 +OLD_LIBS+=usr/lib/libgssapi_krb5.so.8 OLD_LIBS+=usr/lib/libhdb.so.8 OLD_LIBS+=usr/lib/libkadm5clnt.so.8 OLD_LIBS+=usr/lib/libkadm5srv.so.8 ==== //depot/projects/dtrace7/src/UPDATING#2 (text+ko) ==== @@ -8,6 +8,17 @@ /usr/ports/UPDATING. Please read that file before running portupgrade. +20071126: + The AT keyboard emulation of sunkbd(4) has been turned on + by default. In order to make the special symbols of the Sun + keyboards driven by sunkbd(4) work under X these now have + to be configured the same way as Sun USB keyboards driven + by ukbd(4) (which also does AT keyboard emulation), f.e.: + + Option "XkbLayout" "us" + Option "XkbRules" "xorg" + Option "XkbSymbols" "pc(pc105)+sun_vndr/usb(sun_usb)+us" + 20071028: It has been decided that it is desirable to provide ABI backwards compatibility to the FreeBSD 4/5/6 versions of the @@ -908,4 +919,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.507.2.2 2007/10/28 17:31:51 marius Exp $ +$FreeBSD: src/UPDATING,v 1.507.2.3 2007/11/26 20:07:19 marius Exp $ ==== //depot/projects/dtrace7/src/contrib/gdb/gdb/i386fbsd-nat.c#2 (text+ko) ==== @@ -91,7 +91,7 @@ #ifdef KERN_PS_STRINGS { int mib[2]; - int ps_strings; + u_long ps_strings; size_t len; mib[0] = CTL_KERN; ==== //depot/projects/dtrace7/src/contrib/tcpdump/tcpdump.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.253.2.13 2007/09/12 19:48:51 guy Exp $ (LBL)"; #endif -/* $FreeBSD: src/contrib/tcpdump/tcpdump.c,v 1.11.2.1 2007/10/19 03:04:00 mlaier Exp $ */ +/* $FreeBSD: src/contrib/tcpdump/tcpdump.c,v 1.11.2.2 2007/11/25 19:28:38 mlaier Exp $ */ /* * tcpdump - monitor tcp/ip traffic on an ethernet. @@ -1132,6 +1132,7 @@ if (pcap_stats(pd, &stat) < 0) { (void)fprintf(stderr, "pcap_stats: %s\n", pcap_geterr(pd)); + infoprint = 0; return; } ==== //depot/projects/dtrace7/src/etc/etc.amd64/ttys#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.amd64/ttys,v 1.11 2007/05/29 06:37:57 dougb Exp $ +# $FreeBSD: src/etc/etc.amd64/ttys,v 1.11.2.1 2007/11/27 18:40:15 jhb Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -307,3 +307,259 @@ ttySt none network ttySu none network ttySv none network +ttyl0 none network +ttyl1 none network +ttyl2 none network +ttyl3 none network +ttyl4 none network +ttyl5 none network +ttyl6 none network +ttyl7 none network +ttyl8 none network +ttyl9 none network +ttyla none network +ttylb none network +ttylc none network +ttyld none network +ttyle none network +ttylf none network +ttylg none network +ttylh none network +ttyli none network +ttylj none network +ttylk none network +ttyll none network +ttylm none network +ttyln none network +ttylo none network +ttylp none network +ttylq none network +ttylr none network +ttyls none network +ttylt none network +ttylu none network +ttylv none network +ttym0 none network +ttym1 none network +ttym2 none network +ttym3 none network +ttym4 none network +ttym5 none network +ttym6 none network +ttym7 none network +ttym8 none network +ttym9 none network +ttyma none network +ttymb none network +ttymc none network +ttymd none network +ttyme none network +ttymf none network +ttymg none network +ttymh none network +ttymi none network +ttymj none network +ttymk none network +ttyml none network +ttymm none network +ttymn none network +ttymo none network +ttymp none network +ttymq none network +ttymr none network +ttyms none network +ttymt none network +ttymu none network +ttymv none network +ttyn0 none network +ttyn1 none network +ttyn2 none network +ttyn3 none network +ttyn4 none network +ttyn5 none network +ttyn6 none network +ttyn7 none network +ttyn8 none network +ttyn9 none network +ttyna none network +ttynb none network +ttync none network +ttynd none network +ttyne none network +ttynf none network +ttyng none network +ttynh none network +ttyni none network +ttynj none network +ttynk none network +ttynl none network +ttynm none network +ttynn none network +ttyno none network +ttynp none network +ttynq none network +ttynr none network +ttyns none network +ttynt none network +ttynu none network +ttynv none network +ttyo0 none network +ttyo1 none network +ttyo2 none network +ttyo3 none network +ttyo4 none network +ttyo5 none network +ttyo6 none network +ttyo7 none network +ttyo8 none network +ttyo9 none network +ttyoa none network +ttyob none network +ttyoc none network +ttyod none network +ttyoe none network +ttyof none network +ttyog none network +ttyoh none network +ttyoi none network +ttyoj none network +ttyok none network +ttyol none network +ttyom none network +ttyon none network +ttyoo none network +ttyop none network +ttyoq none network +ttyor none network +ttyos none network +ttyot none network +ttyou none network +ttyov none network +ttyL0 none network +ttyL1 none network +ttyL2 none network +ttyL3 none network +ttyL4 none network +ttyL5 none network +ttyL6 none network +ttyL7 none network +ttyL8 none network +ttyL9 none network +ttyLa none network +ttyLb none network +ttyLc none network +ttyLd none network +ttyLe none network +ttyLf none network +ttyLg none network +ttyLh none network +ttyLi none network +ttyLj none network +ttyLk none network +ttyLl none network +ttyLm none network +ttyLn none network +ttyLo none network +ttyLp none network +ttyLq none network +ttyLr none network +ttyLs none network +ttyLt none network +ttyLu none network +ttyLv none network +ttyM0 none network +ttyM1 none network +ttyM2 none network +ttyM3 none network +ttyM4 none network +ttyM5 none network +ttyM6 none network +ttyM7 none network +ttyM8 none network +ttyM9 none network +ttyMa none network +ttyMb none network +ttyMc none network +ttyMd none network +ttyMe none network +ttyMf none network +ttyMg none network +ttyMh none network +ttyMi none network +ttyMj none network +ttyMk none network +ttyMl none network +ttyMm none network +ttyMn none network +ttyMo none network +ttyMp none network +ttyMq none network +ttyMr none network +ttyMs none network +ttyMt none network +ttyMu none network +ttyMv none network +ttyN0 none network +ttyN1 none network +ttyN2 none network +ttyN3 none network +ttyN4 none network +ttyN5 none network +ttyN6 none network +ttyN7 none network +ttyN8 none network +ttyN9 none network +ttyNa none network +ttyNb none network +ttyNc none network +ttyNd none network +ttyNe none network +ttyNf none network +ttyNg none network +ttyNh none network +ttyNi none network +ttyNj none network +ttyNk none network +ttyNl none network +ttyNm none network +ttyNn none network +ttyNo none network +ttyNp none network +ttyNq none network +ttyNr none network +ttyNs none network +ttyNt none network +ttyNu none network +ttyNv none network +ttyO0 none network +ttyO1 none network +ttyO2 none network +ttyO3 none network +ttyO4 none network +ttyO5 none network +ttyO6 none network +ttyO7 none network +ttyO8 none network +ttyO9 none network +ttyOa none network +ttyOb none network +ttyOc none network +ttyOd none network +ttyOe none network +ttyOf none network +ttyOg none network +ttyOh none network +ttyOi none network +ttyOj none network +ttyOk none network +ttyOl none network +ttyOm none network +ttyOn none network +ttyOo none network +ttyOp none network +ttyOq none network +ttyOr none network +ttyOs none network +ttyOt none network +ttyOu none network +ttyOv none network ==== //depot/projects/dtrace7/src/etc/etc.arm/ttys#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.arm/ttys,v 1.4 2007/08/12 17:13:06 cognet Exp $ +# $FreeBSD: src/etc/etc.arm/ttys,v 1.4.2.1 2007/11/27 18:40:15 jhb Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -307,3 +307,259 @@ ttySt none network ttySu none network ttySv none network +ttyl0 none network +ttyl1 none network +ttyl2 none network +ttyl3 none network +ttyl4 none network +ttyl5 none network +ttyl6 none network +ttyl7 none network +ttyl8 none network +ttyl9 none network +ttyla none network +ttylb none network +ttylc none network +ttyld none network +ttyle none network +ttylf none network +ttylg none network +ttylh none network +ttyli none network +ttylj none network +ttylk none network +ttyll none network +ttylm none network +ttyln none network +ttylo none network +ttylp none network +ttylq none network +ttylr none network +ttyls none network +ttylt none network +ttylu none network +ttylv none network +ttym0 none network +ttym1 none network +ttym2 none network +ttym3 none network +ttym4 none network +ttym5 none network +ttym6 none network +ttym7 none network +ttym8 none network +ttym9 none network +ttyma none network +ttymb none network +ttymc none network +ttymd none network +ttyme none network +ttymf none network +ttymg none network +ttymh none network +ttymi none network +ttymj none network +ttymk none network +ttyml none network +ttymm none network +ttymn none network +ttymo none network +ttymp none network +ttymq none network +ttymr none network +ttyms none network +ttymt none network +ttymu none network +ttymv none network +ttyn0 none network +ttyn1 none network +ttyn2 none network +ttyn3 none network +ttyn4 none network +ttyn5 none network +ttyn6 none network +ttyn7 none network +ttyn8 none network +ttyn9 none network +ttyna none network +ttynb none network +ttync none network +ttynd none network +ttyne none network +ttynf none network +ttyng none network +ttynh none network +ttyni none network +ttynj none network +ttynk none network +ttynl none network +ttynm none network +ttynn none network +ttyno none network +ttynp none network +ttynq none network +ttynr none network +ttyns none network +ttynt none network +ttynu none network +ttynv none network +ttyo0 none network +ttyo1 none network +ttyo2 none network +ttyo3 none network +ttyo4 none network +ttyo5 none network +ttyo6 none network +ttyo7 none network +ttyo8 none network +ttyo9 none network +ttyoa none network +ttyob none network +ttyoc none network +ttyod none network +ttyoe none network +ttyof none network +ttyog none network +ttyoh none network +ttyoi none network +ttyoj none network +ttyok none network +ttyol none network +ttyom none network +ttyon none network +ttyoo none network +ttyop none network +ttyoq none network +ttyor none network +ttyos none network +ttyot none network +ttyou none network +ttyov none network +ttyL0 none network +ttyL1 none network +ttyL2 none network +ttyL3 none network +ttyL4 none network +ttyL5 none network +ttyL6 none network +ttyL7 none network +ttyL8 none network +ttyL9 none network +ttyLa none network +ttyLb none network +ttyLc none network +ttyLd none network +ttyLe none network +ttyLf none network +ttyLg none network +ttyLh none network +ttyLi none network +ttyLj none network +ttyLk none network +ttyLl none network +ttyLm none network +ttyLn none network +ttyLo none network +ttyLp none network +ttyLq none network +ttyLr none network +ttyLs none network +ttyLt none network +ttyLu none network +ttyLv none network +ttyM0 none network +ttyM1 none network +ttyM2 none network +ttyM3 none network +ttyM4 none network +ttyM5 none network +ttyM6 none network +ttyM7 none network +ttyM8 none network +ttyM9 none network +ttyMa none network +ttyMb none network +ttyMc none network +ttyMd none network +ttyMe none network +ttyMf none network +ttyMg none network +ttyMh none network +ttyMi none network +ttyMj none network +ttyMk none network +ttyMl none network +ttyMm none network +ttyMn none network +ttyMo none network +ttyMp none network +ttyMq none network +ttyMr none network +ttyMs none network +ttyMt none network +ttyMu none network +ttyMv none network +ttyN0 none network +ttyN1 none network +ttyN2 none network +ttyN3 none network +ttyN4 none network +ttyN5 none network +ttyN6 none network +ttyN7 none network +ttyN8 none network +ttyN9 none network +ttyNa none network +ttyNb none network +ttyNc none network +ttyNd none network +ttyNe none network +ttyNf none network +ttyNg none network +ttyNh none network +ttyNi none network +ttyNj none network +ttyNk none network +ttyNl none network +ttyNm none network +ttyNn none network +ttyNo none network +ttyNp none network +ttyNq none network +ttyNr none network +ttyNs none network +ttyNt none network +ttyNu none network +ttyNv none network +ttyO0 none network +ttyO1 none network +ttyO2 none network +ttyO3 none network +ttyO4 none network +ttyO5 none network +ttyO6 none network +ttyO7 none network +ttyO8 none network +ttyO9 none network +ttyOa none network +ttyOb none network +ttyOc none network +ttyOd none network +ttyOe none network +ttyOf none network +ttyOg none network +ttyOh none network +ttyOi none network +ttyOj none network +ttyOk none network +ttyOl none network +ttyOm none network +ttyOn none network +ttyOo none network +ttyOp none network +ttyOq none network +ttyOr none network +ttyOs none network +ttyOt none network +ttyOu none network +ttyOv none network ==== //depot/projects/dtrace7/src/etc/etc.i386/ttys#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.i386/ttys,v 1.11 2007/05/29 06:37:57 dougb Exp $ +# $FreeBSD: src/etc/etc.i386/ttys,v 1.11.2.1 2007/11/27 18:40:15 jhb Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -307,3 +307,259 @@ ttySt none network ttySu none network ttySv none network +ttyl0 none network +ttyl1 none network +ttyl2 none network +ttyl3 none network +ttyl4 none network +ttyl5 none network +ttyl6 none network +ttyl7 none network +ttyl8 none network +ttyl9 none network +ttyla none network +ttylb none network +ttylc none network +ttyld none network +ttyle none network +ttylf none network +ttylg none network +ttylh none network +ttyli none network +ttylj none network +ttylk none network +ttyll none network +ttylm none network +ttyln none network +ttylo none network +ttylp none network +ttylq none network +ttylr none network +ttyls none network +ttylt none network +ttylu none network +ttylv none network +ttym0 none network +ttym1 none network +ttym2 none network +ttym3 none network +ttym4 none network +ttym5 none network +ttym6 none network +ttym7 none network +ttym8 none network +ttym9 none network +ttyma none network +ttymb none network +ttymc none network +ttymd none network +ttyme none network +ttymf none network +ttymg none network +ttymh none network +ttymi none network +ttymj none network +ttymk none network +ttyml none network +ttymm none network +ttymn none network +ttymo none network +ttymp none network +ttymq none network +ttymr none network +ttyms none network +ttymt none network +ttymu none network +ttymv none network +ttyn0 none network +ttyn1 none network +ttyn2 none network +ttyn3 none network +ttyn4 none network +ttyn5 none network +ttyn6 none network +ttyn7 none network +ttyn8 none network +ttyn9 none network +ttyna none network +ttynb none network +ttync none network +ttynd none network +ttyne none network +ttynf none network +ttyng none network +ttynh none network +ttyni none network +ttynj none network +ttynk none network +ttynl none network +ttynm none network +ttynn none network +ttyno none network +ttynp none network +ttynq none network +ttynr none network +ttyns none network +ttynt none network +ttynu none network +ttynv none network +ttyo0 none network +ttyo1 none network +ttyo2 none network +ttyo3 none network +ttyo4 none network +ttyo5 none network +ttyo6 none network +ttyo7 none network +ttyo8 none network +ttyo9 none network +ttyoa none network +ttyob none network +ttyoc none network +ttyod none network +ttyoe none network +ttyof none network +ttyog none network +ttyoh none network +ttyoi none network +ttyoj none network +ttyok none network +ttyol none network +ttyom none network +ttyon none network +ttyoo none network +ttyop none network +ttyoq none network +ttyor none network +ttyos none network +ttyot none network +ttyou none network +ttyov none network +ttyL0 none network +ttyL1 none network +ttyL2 none network +ttyL3 none network +ttyL4 none network +ttyL5 none network +ttyL6 none network +ttyL7 none network +ttyL8 none network +ttyL9 none network +ttyLa none network +ttyLb none network +ttyLc none network +ttyLd none network +ttyLe none network +ttyLf none network +ttyLg none network +ttyLh none network +ttyLi none network +ttyLj none network +ttyLk none network +ttyLl none network +ttyLm none network +ttyLn none network +ttyLo none network +ttyLp none network +ttyLq none network +ttyLr none network +ttyLs none network +ttyLt none network +ttyLu none network +ttyLv none network +ttyM0 none network +ttyM1 none network +ttyM2 none network +ttyM3 none network +ttyM4 none network +ttyM5 none network +ttyM6 none network +ttyM7 none network +ttyM8 none network +ttyM9 none network +ttyMa none network +ttyMb none network +ttyMc none network +ttyMd none network +ttyMe none network +ttyMf none network +ttyMg none network +ttyMh none network +ttyMi none network +ttyMj none network +ttyMk none network +ttyMl none network +ttyMm none network +ttyMn none network +ttyMo none network +ttyMp none network +ttyMq none network +ttyMr none network +ttyMs none network +ttyMt none network +ttyMu none network +ttyMv none network +ttyN0 none network +ttyN1 none network +ttyN2 none network +ttyN3 none network +ttyN4 none network +ttyN5 none network +ttyN6 none network +ttyN7 none network +ttyN8 none network +ttyN9 none network +ttyNa none network +ttyNb none network +ttyNc none network +ttyNd none network +ttyNe none network +ttyNf none network +ttyNg none network +ttyNh none network +ttyNi none network +ttyNj none network >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 3 00:35:20 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1CA4316A419; Mon, 3 Dec 2007 00:35: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 B124116A417 for ; Mon, 3 Dec 2007 00:35:19 +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 90C4013C457 for ; Mon, 3 Dec 2007 00:35:19 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB30ZJxt021175 for ; Mon, 3 Dec 2007 00:35:19 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB30ZJXY021172 for perforce@freebsd.org; Mon, 3 Dec 2007 00:35:19 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 3 Dec 2007 00:35:19 GMT Message-Id: <200712030035.lB30ZJXY021172@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 130067 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2007 00:35:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=130067 Change 130067 by hselasky@hselasky_laptop001 on 2007/12/03 00:34:40 Bugfix after IFC. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci.c#58 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#58 (text+ko) ==== @@ -168,6 +168,7 @@ DELAY(1000 * 1); hcr = EOREAD4(sc, EHCI_USBSTS); if (hcr & EHCI_STS_HCH) { + hcr = 0; break; } } @@ -183,6 +184,7 @@ DELAY(1000 * 1); hcr = EOREAD4(sc, EHCI_USBCMD); if (!(hcr & EHCI_CMD_HCRESET)) { + hcr = 0; break; } } From owner-p4-projects@FreeBSD.ORG Mon Dec 3 00:38:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2BD016A468; Mon, 3 Dec 2007 00:38: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 53D7816A417 for ; Mon, 3 Dec 2007 00:38: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 3114613C45D for ; Mon, 3 Dec 2007 00:38:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB30cMZE021279 for ; Mon, 3 Dec 2007 00:38:23 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB30cMbo021276 for perforce@freebsd.org; Mon, 3 Dec 2007 00:38:22 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 3 Dec 2007 00:38:22 GMT Message-Id: <200712030038.lB30cMbo021276@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 130069 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2007 00:38:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=130069 Change 130069 by hselasky@hselasky_laptop001 on 2007/12/03 00:38:02 Bugfix afer IFC. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#32 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ukbd.c#32 (text+ko) ==== @@ -400,7 +400,7 @@ */ for (j = 0; j != UKBD_NKEYCODE; j++) { if (j != i) - sc->sc_ntime[i] = now + (100 * 1000); + sc->sc_ntime[j] = now + (100 * 1000); } pfound: ; } From owner-p4-projects@FreeBSD.ORG Mon Dec 3 01:06:01 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9F1216A46B; Mon, 3 Dec 2007 01:06: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 53F4E16A417 for ; Mon, 3 Dec 2007 01:06:01 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4C58F13C467 for ; Mon, 3 Dec 2007 01:06:01 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB3161FD035435 for ; Mon, 3 Dec 2007 01:06:01 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB315r3r035419 for perforce@freebsd.org; Mon, 3 Dec 2007 01:05:53 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 3 Dec 2007 01:05:53 GMT Message-Id: <200712030105.lB315r3r035419@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130072 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2007 01:06:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=130072 Change 130072 by kmacy@entropy_kmacy_xen31 on 2007/12/03 01:04:59 IFC #130063 Affected files ... .. //depot/projects/xen31/ObsoleteFiles.inc#6 integrate .. //depot/projects/xen31/contrib/bind9/CHANGES#2 integrate .. //depot/projects/xen31/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/xen31/contrib/bind9/FAQ#2 integrate .. //depot/projects/xen31/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/xen31/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/bind9/README#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/check/check-tool.c#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/check/named-checkzone.c#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/dig/host.c#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/dig/nslookup.c#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/named/client.c#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/named/control.c#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/named/server.c#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/rndc/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/xen31/contrib/bind9/configure.in#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/arm/man.dig.html#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/arm/man.host.html#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/arm/man.named.html#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/arm/man.rndc.html#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#2 delete .. //depot/projects/xen31/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/misc/migration#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc4398.txt#1 branch .. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc4408.txt#1 branch .. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc4470.txt#1 branch .. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc4634.txt#1 branch .. //depot/projects/xen31/contrib/bind9/doc/rfc/rfc4641.txt#1 branch .. //depot/projects/xen31/contrib/bind9/lib/bind/api#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/bind/config.h.in#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/bind/configure#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/bind/configure.in#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/bind/irs/gai_strerror.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/bind/irs/irs_data.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/bind/make/rules.in#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/bind/resolv/res_data.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/bind9/check.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/api#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/dispatch.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/include/dns/db.h#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/include/dns/dispatch.h#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/journal.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/master.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/rdataslab.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/rootns.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/sdb.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/sdlz.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/view.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/isc/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/isc/alpha/Makefile.in#1 branch .. //depot/projects/xen31/contrib/bind9/lib/isc/alpha/include/Makefile.in#1 branch .. //depot/projects/xen31/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#1 branch .. //depot/projects/xen31/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/isc/hmacsha.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/isc/ia64/Makefile.in#1 branch .. //depot/projects/xen31/contrib/bind9/lib/isc/ia64/include/Makefile.in#1 branch .. //depot/projects/xen31/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#1 branch .. //depot/projects/xen31/contrib/bind9/lib/isc/include/isc/platform.h.in#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/isc/include/isc/string.h#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/isc/mips/Makefile.in#1 branch .. //depot/projects/xen31/contrib/bind9/lib/isc/mips/include/Makefile.in#1 branch .. //depot/projects/xen31/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#1 branch .. //depot/projects/xen31/contrib/bind9/lib/isc/noatomic/Makefile.in#1 branch .. //depot/projects/xen31/contrib/bind9/lib/isc/noatomic/include/Makefile.in#1 branch .. //depot/projects/xen31/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#1 branch .. //depot/projects/xen31/contrib/bind9/lib/isc/powerpc/Makefile.in#1 branch .. //depot/projects/xen31/contrib/bind9/lib/isc/powerpc/include/Makefile.in#1 branch .. //depot/projects/xen31/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in#1 branch .. //depot/projects/xen31/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/isc/sparc64/Makefile.in#1 branch .. //depot/projects/xen31/contrib/bind9/lib/isc/sparc64/include/Makefile.in#1 branch .. //depot/projects/xen31/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in#1 branch .. //depot/projects/xen31/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/isc/unix/socket.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/isc/unix/syslog.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/isc/x86_32/Makefile.in#1 branch .. //depot/projects/xen31/contrib/bind9/lib/isc/x86_32/include/Makefile.in#1 branch .. //depot/projects/xen31/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in#1 branch .. //depot/projects/xen31/contrib/bind9/lib/isc/x86_64/Makefile.in#1 branch .. //depot/projects/xen31/contrib/bind9/lib/isc/x86_64/include/Makefile.in#1 branch .. //depot/projects/xen31/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in#1 branch .. //depot/projects/xen31/contrib/bind9/lib/isccc/symtab.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/isccfg/api#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/lwres/context.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/lwres/getipnode.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/lwres/lwres_gnba.c#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate .. //depot/projects/xen31/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/xen31/contrib/bind9/version#2 integrate .. //depot/projects/xen31/include/assert.h#2 integrate .. //depot/projects/xen31/lib/bind/bind/Makefile#2 integrate .. //depot/projects/xen31/lib/bind/bind/config.h#2 integrate .. //depot/projects/xen31/lib/bind/bind/port_before.h#2 integrate .. //depot/projects/xen31/lib/bind/config.h#2 integrate .. //depot/projects/xen31/lib/bind/config.mk#2 integrate .. //depot/projects/xen31/lib/bind/isc/isc/platform.h#2 integrate .. //depot/projects/xen31/lib/bind/lwres/Makefile#2 integrate .. //depot/projects/xen31/lib/libkse/Makefile#3 integrate .. //depot/projects/xen31/lib/libkse/arch/amd64/include/atomic_ops.h#2 integrate .. //depot/projects/xen31/lib/libkse/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/xen31/lib/libkse/arch/arm/include/atomic_ops.h#2 integrate .. //depot/projects/xen31/lib/libkse/arch/i386/include/atomic_ops.h#2 integrate .. //depot/projects/xen31/lib/libkse/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/xen31/lib/libkse/arch/ia64/include/atomic_ops.h#2 integrate .. //depot/projects/xen31/lib/libkse/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/xen31/lib/libkse/arch/powerpc/include/atomic_ops.h#2 integrate .. //depot/projects/xen31/lib/libkse/arch/powerpc/include/pthread_md.h#2 integrate .. //depot/projects/xen31/lib/libkse/arch/sparc64/include/atomic_ops.h#2 integrate .. //depot/projects/xen31/lib/libkse/arch/sparc64/include/pthread_md.h#2 integrate .. //depot/projects/xen31/lib/libkse/sys/lock.c#3 integrate .. //depot/projects/xen31/lib/libkse/sys/thr_error.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_accept.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_aio_suspend.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_atfork.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_destroy.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_get_np.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_getdetachstate.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_getguardsize.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_getinheritsched.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_getschedparam.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_getschedpolicy.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_getscope.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_getstack.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_getstackaddr.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_getstacksize.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_init.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_setdetachstate.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_setguardsize.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_setinheritsched.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_setschedparam.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_setschedpolicy.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_setscope.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_setstack.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_setstackaddr.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_setstacksize.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_barrier.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_barrierattr.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_cancel.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_clean.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_close.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_concurrency.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_cond.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_condattr_destroy.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_condattr_init.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_condattr_pshared.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_connect.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_creat.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_create.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_detach.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_equal.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_execve.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_exit.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_fcntl.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_find_thread.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_fork.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_fsync.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_getschedparam.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_info.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_init.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_join.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_kern.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_kill.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_main_np.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_mattr_init.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_mattr_kind_np.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_mattr_pshared.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_msync.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_multi_np.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_mutex.c#4 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_mutex_prioceiling.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_mutex_protocol.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_mutexattr_destroy.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_nanosleep.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_once.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_open.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_pause.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_poll.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_priority_queue.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_private.h#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_pselect.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_pspinlock.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_raise.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_read.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_readv.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_resume_np.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_rtld.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_rwlock.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_rwlockattr.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_select.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_self.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_seterrno.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_setprio.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_setschedparam.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_sig.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_sigaction.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_sigaltstack.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_sigmask.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_sigpending.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_sigprocmask.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_sigsuspend.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_sigwait.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_single_np.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_sleep.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_spec.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_spinlock.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_stack.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_suspend_np.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_switch_np.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_symbols.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_system.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_tcdrain.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_vfork.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_wait.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_wait4.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_waitpid.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_write.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_writev.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_yield.c#2 integrate .. //depot/projects/xen31/libexec/rtld-elf/sparc64/rtld_machdep.h#2 integrate .. //depot/projects/xen31/release/doc/share/sgml/release.ent#3 integrate .. //depot/projects/xen31/share/man/man4/aac.4#2 integrate .. //depot/projects/xen31/share/man/man9/Makefile#5 integrate .. //depot/projects/xen31/share/man/man9/stack.9#2 integrate .. //depot/projects/xen31/sys/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/xen31/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/xen31/sys/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/xen31/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/xen31/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/xen31/sys/amd64/include/stack.h#1 branch .. //depot/projects/xen31/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/xen31/sys/arm/arm/nexus_io.c#2 delete .. //depot/projects/xen31/sys/arm/arm/nexus_io_asm.S#2 delete .. //depot/projects/xen31/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/xen31/sys/arm/arm/stack_machdep.c#1 branch .. //depot/projects/xen31/sys/arm/conf/AVILA#2 integrate .. //depot/projects/xen31/sys/arm/conf/BWCT#2 integrate .. //depot/projects/xen31/sys/arm/conf/CRB#2 integrate .. //depot/projects/xen31/sys/arm/conf/EP80219#2 integrate .. //depot/projects/xen31/sys/arm/conf/HL200#2 integrate .. //depot/projects/xen31/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/xen31/sys/arm/conf/KB920X#2 integrate .. //depot/projects/xen31/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/xen31/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/xen31/sys/arm/include/asmacros.h#2 integrate .. //depot/projects/xen31/sys/arm/include/atomic.h#3 integrate .. //depot/projects/xen31/sys/arm/include/stack.h#1 branch .. //depot/projects/xen31/sys/arm/sa11x0/files.sa11x0#2 integrate .. //depot/projects/xen31/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/xen31/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/xen31/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/xen31/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/xen31/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/xen31/sys/conf/NOTES#4 integrate .. //depot/projects/xen31/sys/conf/files#5 integrate .. //depot/projects/xen31/sys/conf/files.amd64#4 integrate .. //depot/projects/xen31/sys/conf/files.arm#3 integrate .. //depot/projects/xen31/sys/conf/files.i386#4 integrate .. //depot/projects/xen31/sys/conf/files.ia64#3 integrate .. //depot/projects/xen31/sys/conf/files.powerpc#3 integrate .. //depot/projects/xen31/sys/conf/files.sparc64#2 integrate .. //depot/projects/xen31/sys/conf/files.sun4v#3 integrate .. //depot/projects/xen31/sys/conf/options#3 integrate .. //depot/projects/xen31/sys/conf/options.amd64#2 integrate .. //depot/projects/xen31/sys/conf/options.i386#3 integrate .. //depot/projects/xen31/sys/dev/amr/amr.c#3 integrate .. //depot/projects/xen31/sys/dev/amr/amr_cam.c#3 integrate .. //depot/projects/xen31/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/xen31/sys/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/projects/xen31/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/xen31/sys/dev/random/yarrow.c#2 integrate .. //depot/projects/xen31/sys/dev/si/si_pci.c#2 integrate .. //depot/projects/xen31/sys/dev/sio/sio_isa.c#2 integrate .. //depot/projects/xen31/sys/dev/sio/sio_puc.c#2 integrate .. //depot/projects/xen31/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/xen31/sys/dev/usb/if_zyd.c#4 integrate .. //depot/projects/xen31/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/xen31/sys/i386/conf/NOTES#3 integrate .. //depot/projects/xen31/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/xen31/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/xen31/sys/i386/i386/stack_machdep.c#1 branch .. //depot/projects/xen31/sys/i386/include/stack.h#1 branch .. //depot/projects/xen31/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/xen31/sys/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/xen31/sys/ia64/ia64/stack_machdep.c#1 branch .. //depot/projects/xen31/sys/kern/kern_clock.c#3 integrate .. //depot/projects/xen31/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/xen31/sys/kern/kern_linker.c#4 integrate .. //depot/projects/xen31/sys/kern/kern_lock.c#3 integrate .. //depot/projects/xen31/sys/kern/kern_proc.c#4 integrate .. //depot/projects/xen31/sys/kern/kern_sysctl.c#3 integrate .. //depot/projects/xen31/sys/kern/subr_bus.c#2 integrate .. //depot/projects/xen31/sys/kern/subr_stack.c#2 integrate .. //depot/projects/xen31/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/xen31/sys/modules/amr/Makefile#2 integrate .. //depot/projects/xen31/sys/netgraph/ng_cisco.c#2 integrate .. //depot/projects/xen31/sys/netinet/ip_input.c#3 integrate .. //depot/projects/xen31/sys/netinet/tcp_output.c#4 integrate .. //depot/projects/xen31/sys/netinet/tcp_syncache.c#5 integrate .. //depot/projects/xen31/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/xen31/sys/pci/xrpu.c#2 delete .. //depot/projects/xen31/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/xen31/sys/powerpc/include/stack.h#1 branch .. //depot/projects/xen31/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/xen31/sys/powerpc/powerpc/stack_machdep.c#1 branch .. //depot/projects/xen31/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/xen31/sys/sparc64/include/stack.h#1 branch .. //depot/projects/xen31/sys/sparc64/pci/ofw_pcibus.c#2 integrate .. //depot/projects/xen31/sys/sparc64/pci/psycho.c#2 integrate .. //depot/projects/xen31/sys/sparc64/pci/psychovar.h#2 integrate .. //depot/projects/xen31/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/xen31/sys/sparc64/sparc64/stack_machdep.c#1 branch .. //depot/projects/xen31/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/xen31/sys/sun4v/include/pcpu.h#3 integrate .. //depot/projects/xen31/sys/sun4v/include/stack.h#1 branch .. //depot/projects/xen31/sys/sun4v/sun4v/db_trace.c#2 integrate .. //depot/projects/xen31/sys/sun4v/sun4v/stack_machdep.c#1 branch .. //depot/projects/xen31/sys/sys/elf_common.h#2 integrate .. //depot/projects/xen31/sys/sys/linker.h#4 integrate .. //depot/projects/xen31/sys/sys/pcpu.h#3 integrate .. //depot/projects/xen31/sys/sys/resource.h#2 integrate .. //depot/projects/xen31/sys/sys/stack.h#2 integrate .. //depot/projects/xen31/sys/sys/sysctl.h#2 integrate .. //depot/projects/xen31/sys/sys/user.h#2 integrate .. //depot/projects/xen31/sys/sys/xrpuio.h#2 delete .. //depot/projects/xen31/sys/ufs/ffs/ffs_alloc.c#3 integrate .. //depot/projects/xen31/sys/vm/redzone.c#2 integrate .. //depot/projects/xen31/sys/vm/vm_page.c#5 integrate .. //depot/projects/xen31/usr.bin/Makefile#2 integrate .. //depot/projects/xen31/usr.bin/login/login.1#2 integrate .. //depot/projects/xen31/usr.bin/procstat/Makefile#1 branch .. //depot/projects/xen31/usr.bin/procstat/procstat.1#1 branch .. //depot/projects/xen31/usr.bin/procstat/procstat.c#1 branch .. //depot/projects/xen31/usr.bin/procstat/procstat.h#1 branch .. //depot/projects/xen31/usr.bin/procstat/procstat_args.c#1 branch .. //depot/projects/xen31/usr.bin/procstat/procstat_basic.c#1 branch .. //depot/projects/xen31/usr.bin/procstat/procstat_bin.c#1 branch .. //depot/projects/xen31/usr.bin/procstat/procstat_cred.c#1 branch .. //depot/projects/xen31/usr.bin/procstat/procstat_files.c#1 branch .. //depot/projects/xen31/usr.bin/procstat/procstat_kstack.c#1 branch .. //depot/projects/xen31/usr.bin/procstat/procstat_threads.c#1 branch .. //depot/projects/xen31/usr.bin/procstat/procstat_vm.c#1 branch Differences ... ==== //depot/projects/xen31/ObsoleteFiles.inc#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.122 2007/11/28 23:21:55 jb Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.123 2007/11/29 21:49:08 brooks 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,12 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071129: Disabled static versions of libkse by default +.if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no" +OLD_FILES+=usr/lib/libkse.a +OLD_FILES+=usr/lib/libkse_p.a +OLD_FILES+=usr/lib/libkse_pic.a +.endif # 20071129: Removed a Solaris compatibility header OLD_FILES+=usr/include/sys/_elf_solaris.h # 20071108: Removed very crunch OLDCARD support file ==== //depot/projects/xen31/contrib/bind9/CHANGES#2 (text+ko) ==== @@ -1,5 +1,117 @@ - --- 9.4.1-P1 released --- + --- 9.4.2 released --- + --- 9.4.2rc2 released --- + +2259. [bug] Reverse incorrect LIBINTERFACE bump of libisc + in 9.4.2rc1. Applications built against 9.4.2rc1 + will need to be rebuilt. + +2258. [bug] Fallback from IXFR/TSIG to SOA/AXFR/TSIG broken. + [RT #17241] + +2257. [bug] win32: Use the full path to vcredist_x86.exe when + calling it. [RT #17222] + +2256. [bug] win32: Correctly register the installation location of + bindevt.dll. [RT #17159] + +2255. [bug] L.ROOT-SERVERS.NET is now 199.7.83.42. + +2254. [bug] timer.c:dispatch() failed to lock timer->lock + when reading timer->idle allowing it to see + intermediate values as timer->idle was reset by + isc_timer_touch(). [RT #17243] + + --- 9.4.2rc1 released --- + +2251. [doc] Update memstatistics-file documentation to reflect + reality. Note there is behaviour change for BIND 9.5. + [RT #17113] + +2249. [bug] Only set Authentic Data bit if client requested + DNSSEC, per RFC 3655 [RT #17175] + +2248. [cleanup] Fix several errors reported by Coverity. [RT #17160] + +2245. [bug] Validating lack of DS records at trust anchors wasn't + working. [RT #17151] + +2238. [bug] It was possible to trigger a REQUIRE when a + validation was cancelled. [RT #17106] + +2237. [bug] libbind: res_init() was not thread aware. [RT #17123] + +2236. [bug] dnssec-signzone failed to preserve the case of + of wildcard owner names. [RT #17085] + +2235. [bug] was not being installed. [RT #17135] + +2234. [port] Correct some compiler warnings on SCO OSr5 [RT #17134] + +2232. [bug] dns_adb_findaddrinfo() could fail and return + ISC_R_SUCCESS. [RT #17137] + +2231. [bug] Building dlzbdb (contrib/dlz/bin/dlzbdb) was broken. + [RT #17088] + +2230. [bug] We could INSIST reading a corrupted journal. + [RT #17132] + +2228. [contrib] contrib: Change 2188 was incomplete. + +2227. [cleanup] Tidied up the FAQ. [RT #17121] + +2225. [bug] More support for systems with no IPv4 addresses. + [RT #17111] + +2224. [bug] Defer journal compaction if a xfrin is in progress. + [RT #17119] + +2223. [bug] Make a new journal when compacting. [RT #17119] + +2221. [bug] Set the event result code to reflect the actual + record returned to caller when a cache update is + rejected due to a more credible answer existing. + [RT #17017] + +2220. [bug] win32: Address a race condition in final shutdown of + the Windows socket code. [RT #17028] + +2219. [bug] Apply zone consistancy checks to additions, not + removals, when updating. [RT #17049] + +2218. [bug] Remove unnecessary REQUIRE from dns_validator_create(). + [RT #16976] + +2216. [cleanup] Fix a number of errors reported by Coverity. + [RT #17094] + +2215. [bug] Bad REQUIRE check isc_hmacsha1_verify(). [RT #17094] + +2214. [bug] Deregister OpenSSL lock callback when cleaning + up. Reorder OpenSSL cleanup so that RAND_cleanup() + is called before the locks are destroyed. [RT #17098] + +2213. [bug] SIG0 diagnostic failure messages were looking at the + wrong status code. [RT #17101] + +2212. [func] 'host -m' now causes memory statistics and active + memory to be printed at exit. [RT 17028] + +2210. [bug] Deleting class specific records via UPDATE could + fail. [RT #17074] + +2209. [port] osx: linking against user supplied static OpenSSL + libraries failed as the system ones were still being + found. [RT #17078] + +2208. [port] win32: make sure both build methods produce the + same output. [RT #17058] + +2207. [port] Some implementations of getaddrinfo() fail to set + ai_canonname correctly. [RT #17061] + + --- 9.4.2b1 released --- 2206. [security] "allow-query-cache" and "allow-recursion" now cross inherit from each other. @@ -16,12 +128,32 @@ [RT #16987] +2205. [bug] libbind: change #2119 broke thread support. [RT #16982] + 2203. [security] Query id generation was cryptographically weak. [RT # 16915] 2202. [security] The default acls for allow-query-cache and allow-recursion were not being applied. [RT #16960] +2200. [bug] The search for cached NSEC records was stopping to + early leading to excessive DLV queries. [RT #16930] + +2199. [bug] win32: don't call WSAStartup() while loading dlls. + [RT #16911] + +2198. [bug] win32: RegCloseKey() could be called when + RegOpenKeyEx() failed. [RT #16911] + +2197. [bug] Add INSIST to catch negative responses which are + not setting the event result code appropriately. + [RT #16909] + +2196. [port] win32: yield processor while waiting for once to + to complete. [RT #16958] + +2194. [bug] Close journal before calling 'done' in xfrin.c. + 2193. [port] win32: BINDInstall.exe is now linked statically. [RT #16906] @@ -29,6 +161,145 @@ Studio's redistributable dlls if building with Visual Stdio 2005 or later. +2189. [bug] Handle socket() returning EINTR. [RT #15949] + +2188. [contrib] queryperf: autoconf changes to make the search for + libresolv or libbind more robust. [RT #16299] + +2187. [bug] query_addds(), query_addwildcardproof() and + query_addnxrrsetnsec() should take a version + arguement. [RT #16368] + +2186. [port] cygwin: libbind: check for struct sockaddr_storage + independently of IPv6. [RT #16482] + +2185. [port] sunos: libbind: check for ssize_t, memmove() and + memchr(). [RT #16463] + +2183. [bug] dnssec-signzone didn't handle offline private keys + well. [RT #16832] + +2182. [bug] dns_dispatch_createtcp() and dispatch_createudp() + could return ISC_R_SUCCESS when they ran out of + memory. [RT #16365] + +2181. [port] sunos: libbind: add paths.h from BIND 8. [RT #16462] + +2180. [cleanup] Remove bit test from 'compress_test' as they + are no longer needed. [RT #16497] + +2178. [bug] 'rndc reload' of a slave or stub zone resulted in + a reference leak. [RT #16867] + +2177. [bug] Array bounds overrun on read (rcodetext) at + debug level 10+. [RT #16798] + +2176. [contrib] dbus update to handle race condition during + initialisation (Bugzilla 235809). [RT #16842] + +2175. [bug] win32: windows broadcast condition variable support + was broken. [RT #16592] + +2174. [bug] I/O errors should always be fatal when reading + master files. [RT #16825] + +2173. [port] win32: When compiling with MSVS 2005 SP1 we also + need to ship Microsoft.VC80.MFCLOC. + +2171. [bug] Handle breaks in DNSSEC trust chains where the parent + servers are not DS aware (DS queries to the parent + return a referral to the child). + +2170. [func] Add acache processing to test suite. [RT #16711] + +2169. [bug] host, nslookup: when reporting NXDOMAIN report the + given name and not the last name searched for. + [RT #16763] + +2168. [bug] nsupdate: in non-interactive mode treat syntax errors + as fatal errors. [RT #16785] + +2167. [bug] When re-using a automatic zone named failed to + attach it to the new view. [RT #16786] + +2166. [bug] When running in batch mode, dig could misinterpret + a server address as a name to be looked up, causing + unexpected output. [RT #16743] + +2164. [bug] The code to determine how named-checkzone / + named-compilezone was called failed under windows. + [RT #16764] + +2162. [func] Allow "rrset-order fixed" to be disabled at compile + time. [RT #16665] + +2161. [bug] 'rndc flush' could report a false success. [RT #16698] + +2160. [bug] libisc wasn't handling NULL ifa_addr pointers returned + from getifaddrs(). [RT #16708] + +2159. [bug] Array bounds overrun in acache processing. [RT #16710] + +2158. [bug] ns_client_isself() failed to initialise key + leading to a REQUIRE failure. [RT #16688] + +2156. [bug] Fix node reference leaks in lookup.c:lookup_find(), + resolver.c:validated() and resolver.c:cache_name(). + Fix a memory leak in rbtdb.c:free_noqname(). + Make lookup.c:lookup_find() robust against + event leaks. [RT #16685] + +2155. [contrib] SQLite sdb module from jaboydjr@netwalk.com. + [RT #16694] + +2153. [bug] nsupdate could leak memory. [RT #16691] + +2152. [cleanup] Use sizeof(buf) instead of fixed number in + dighost.c:get_trusted_key(). [RT #16678] + +2151. [bug] Missing newline in usage message for journalprint. + [RT #16679] + +2150. [bug] 'rrset-order cyclic' uniformly distribute the + starting point for the first response for a given + RRset. [RT #16655] + +2149. [bug] isc_mem_checkdestroyed() failed to abort on + if there were still active memory contexts. + [RT #16672] + +2147. [bug] libbind: remove potential buffer overflow from + hmac_link.c. [RT #16437] + +2146. [cleanup] Silence Linux's spurious "obsolete setsockopt + SO_BSDCOMPAT" message. [RT #16641] + +2145. [bug] Check DS/DLV digest lengths for known digests. + [RT #16622] + +2144. [cleanup] Suppress logging of SERVFAIL from forwarders. + [RT #16619] + +2143. [bug] We failed to restart the IPv6 client when the + kernel failed to return the destination the + packet was sent to. [RT #16613] + +2142. [bug] Handle master files with a modification time that + matches the epoch. [RT# 16612] + +2141. [bug] dig/host should not be setting IDN_ASCCHECK (IDN + equivalent of LDH checks). [RT #16609] + +2140. [bug] libbind: missing unlock on pthread_key_create() + failures. [RT #16654] + +2139. [bug] dns_view_find() was being called with wrong type + in adb.c. [RT #16670] + +2119. [compat] libbind: allow res_init() to succeed enough to + return the default domain even if it was unable + to allocate memory. + --- 9.4.1 released --- 2172. [bug] query_addsoa() was being called with a non zone db. @@ -524,7 +795,7 @@ hex strings with comments. [RT #15814] 1974. [doc] List each of the zone types and associated zone - options seperately in the ARM. + options separately in the ARM. 1973. [func] TSIG HMACSHA1, HMACSHA224, HMACSHA256, HMACSHA384 and HMACSHA512 support. [RT #13606] @@ -551,7 +822,7 @@ 1965. [func] Suppress spurious "recusion requested but not available" warning with 'dig +qr'. [RT #15780]. -1964. [func] Seperate out MX and SRV to CNAME checks. [RT #15723] +1964. [func] Separate out MX and SRV to CNAME checks. [RT #15723] 1963. [port] Tru64 4.0E doesn't support send() and recv(). [RT #15586] @@ -771,7 +1042,7 @@ 1898. [bug] Extend ISC_SOCKADDR_FORMATSIZE and ISC_NETADDR_FORMATSIZE to allow for scope details. -1897. [func] x86 and x86_64 now have seperate atomic locking +1897. [func] x86 and x86_64 now have separate atomic locking implementations. 1896. [bug] Recursive clients soft quota support wasn't working @@ -825,7 +1096,7 @@ [RT #14892] 1878. [func] Detect duplicates of UDP queries we are recursing on - and drop them. New stats category "duplicates". + and drop them. New stats category "duplicate". [RT #2471] 1877. [bug] Fix unreasonably low quantum on call to @@ -1769,7 +2040,7 @@ [RT #6427] 1555. [func] 'rrset-order cyclic' no longer has a random starting - point. [RT #7572] + point per query. [RT #7572] 1554. [bug] dig, host, nslookup failed when no nameservers were specified in /etc/resolv.conf. [RT #8232] @@ -6250,7 +6521,7 @@ and has been removed. 170. [cleanup] Remove inter server consistancy checks from zone, - these should return as a seperate module in 9.1. + these should return as a separate module in 9.1. dns_zone_checkservers(), dns_zone_checkparents(), dns_zone_checkchildren(), dns_zone_checkglue(). ==== //depot/projects/xen31/contrib/bind9/COPYRIGHT#2 (text+ko) ==== @@ -1,7 +1,7 @@ Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") Copyright (C) 1996-2003 Internet Software Consortium. -Permission to use, copy, modify, and distribute this software for any +Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. @@ -13,7 +13,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -$Id: COPYRIGHT,v 1.9.18.3 2007/01/08 02:41:59 marka Exp $ +$Id: COPYRIGHT,v 1.9.18.4 2007/08/28 07:19:54 tbox Exp $ Portions Copyright (C) 1996-2001 Nominum, Inc. ==== //depot/projects/xen31/contrib/bind9/FAQ#2 (text+ko) ==== @@ -4,97 +4,71 @@ Copyright © 2000-2003 Internet Software Consortium. -------------------------------------------------------------------------------- +----------------------------------------------------------------------- -Q: Why doesn't -u work on Linux 2.2.x when I build with --enable-threads? +1. Compilation and Installation Questions -A: Linux threads do not fully implement the Posix threads (pthreads) standard. In - particular, setuid() operates only on the current thread, not the full process. - Because of this limitation, BIND 9 cannot use setuid() on Linux as it can on - all other supported platforms. setuid() cannot be called before creating - threads, since the server does not start listening on reserved ports until - after threads have started. +Q: I'm trying to compile BIND 9, and "make" is failing due to files not + being found. Why? - In the 2.2.18 or 2.3.99-pre3 and newer kernels, the ability to preserve - capabilities across a setuid() call is present. This allows BIND 9 to call - setuid() early, while retaining the ability to bind reserved ports. This is a - Linux-specific hack. +A: Using a parallel or distributed "make" to build BIND 9 is not + supported, and doesn't work. If you are using one of these, use normal + make or gmake instead. - On a 2.2 kernel, BIND 9 does drop many root privileges, so it should be less of - a security risk than a root process that has not dropped privileges. +Q: Isn't "make install" supposed to generate a default named.conf? - If Linux threads ever work correctly, this restriction will go away. +A: Short Answer: No. - Configuring BIND9 with the --disable-threads option (the default) causes a - non-threaded version to be built, which will allow -u to be used. + Long Answer: There really isn't a default configuration which fits any + site perfectly. There are lots of decisions that need to be made and + there is no consensus on what the defaults should be. For example + FreeBSD uses /etc/namedb as the location where the configuration files + for named are stored. Others use /var/named. -Q: Why do I get the following errors: + What addresses to listen on? For a laptop on the move a lot you may + only want to listen on the loop back interfaces. - general: errno2result.c:109: unexpected error: - general: unable to convert errno to isc_result: 14: Bad address - client: UDP client handler shutting down due to fatal receive error: unexpected error + Who do you offer recursive service to? Is there are firewall to + consider? If so is it stateless or stateful. Are you directly on the + Internet? Are you on a private network? Are you on a NAT'd network? The + answers to all these questions change how you configure even a caching + name server. -A: This is the result of a Linux kernel bug. +2. Configuration and Setup Questions - See: http://marc.theaimsgroup.com/?l=linux-netdev&m=113081708031466&w=2 +Q: Why does named log the warning message "no TTL specified - using SOA + MINTTL instead"? -Q: Why does named log the warning message "no TTL specified - using SOA MINTTL - instead"? - -A: Your zone file is illegal according to RFC1035. It must either have a line - like: +A: Your zone file is illegal according to RFC1035. It must either have a + line like: $TTL 86400 - at the beginning, or the first record in it must have a TTL field, like the - "84600" in this example: + at the beginning, or the first record in it must have a TTL field, like + the "84600" in this example: example.com. 86400 IN SOA ns hostmaster ( 1 3600 1800 1814400 3600 ) -Q: Why do I see 5 (or more) copies of named on Linux? +Q: Why do I get errors like "dns_zone_load: zone foo/IN: loading master + file bar: ran out of space"? -A: Linux threads each show up as a process under ps. The approximate number of - threads running is n+4, where n is the number of CPUs. Note that the amount of - memory used is not cumulative; if each process is using 10M of memory, only a - total of 10M is used. - - Newer versions of Linux's ps command hide the individual threads and require -L - to display them. - -Q: Why does BIND 9 log "permission denied" errors accessing its configuration - files or zones on my Linux system even though it is running as root? +A: This is often caused by TXT records with missing close quotes. Check + that all TXT records containing quoted strings have both open and close + quotes. -A: On Linux, BIND 9 drops most of its root privileges on startup. This including - the privilege to open files owned by other users. Therefore, if the server is - running as root, the configuration files and zone files should also be owned by - root. - -Q: Why do I get errors like "dns_zone_load: zone foo/IN: loading master file bar: - ran out of space"? - -A: This is often caused by TXT records with missing close quotes. Check that all - TXT records containing quoted strings have both open and close quotes. - -Q: How do I produce a usable core file from a multi-threaded named on Linux? - -A: If the Linux kernel is 2.4.7 or newer, multi-threaded core dumps are usable - (that is, the correct thread is dumped). Otherwise, if using a 2.2 kernel, - apply the kernel patch found in contrib/linux/coredump-patch and rebuild the - kernel. This patch will cause multi-threaded programs to dump the correct - thread. - Q: How do I restrict people from looking up the server version? -A: Put a "version" option containing something other than the real version in the - "options" section of named.conf. Note doing this will not prevent attacks and - may impede people trying to diagnose problems with your server. Also it is - possible to "fingerprint" nameservers to determine their version. +A: Put a "version" option containing something other than the real version + in the "options" section of named.conf. Note doing this will not + prevent attacks and may impede people trying to diagnose problems with + your server. Also it is possible to "fingerprint" nameservers to + determine their version. Q: How do I restrict only remote users from looking up the server version? -A: The following view statement will intercept lookups as the internal view that - holds the version information will be matched last. The caveats of the previous - answer still apply, of course. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 3 03:41:01 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F0CDA16A41B; Mon, 3 Dec 2007 03:41:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8585F16A418 for ; Mon, 3 Dec 2007 03:41:00 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8395413C45A for ; Mon, 3 Dec 2007 03:41:00 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB33f0XX064449 for ; Mon, 3 Dec 2007 03:41:00 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB33f0ZM064444 for perforce@freebsd.org; Mon, 3 Dec 2007 03:41:00 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 3 Dec 2007 03:41:00 GMT Message-Id: <200712030341.lB33f0ZM064444@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130076 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2007 03:41:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=130076 Change 130076 by kmacy@entropy_kmacy_xen31 on 2007/12/03 03:40:07 integrate xen support directly in to native version of machdep.c to minimize future divergence from native Affected files ... .. //depot/projects/xen31/sys/conf/files.i386#5 edit .. //depot/projects/xen31/sys/dev/cxgb/cxgb_osdep.h#2 edit .. //depot/projects/xen31/sys/i386/i386/machdep.c#5 edit .. //depot/projects/xen31/sys/i386/include/pcpu.h#2 edit .. //depot/projects/xen31/sys/i386/include/pmap.h#3 edit Differences ... ==== //depot/projects/xen31/sys/conf/files.i386#5 (text+ko) ==== @@ -296,8 +296,7 @@ i386/i386/locore.s optional native no-obj i386/xen/locore.s optional xen no-obj i386/i386/longrun.c optional cpu_enable_longrun -i386/i386/machdep.c optional native -i386/xen/machdep.c optional xen +i386/i386/machdep.c standard i386/xen/xen_machdep.c optional xen i386/i386/mem.c optional mem i386/i386/minidump_machdep.c standard ==== //depot/projects/xen31/sys/dev/cxgb/cxgb_osdep.h#2 (text+ko) ==== @@ -58,11 +58,12 @@ }; +#ifndef PANIC_IF #define PANIC_IF(exp) do { \ if (exp) \ panic("BUG: %s", exp); \ } while (0) - +#endif #define m_get_priority(m) ((uintptr_t)(m)->m_pkthdr.rcvif) #define m_set_priority(m, pri) ((m)->m_pkthdr.rcvif = (struct ifnet *)((uintptr_t)pri)) @@ -124,7 +125,9 @@ #if defined(__i386__) || defined(__amd64__) +#ifndef mb #define mb() __asm volatile("mfence":::"memory") +#endif #define rmb() __asm volatile("lfence":::"memory") #define wmb() __asm volatile("sfence" ::: "memory") #define smp_mb() mb() ==== //depot/projects/xen31/sys/i386/i386/machdep.c#5 (text+ko) ==== @@ -54,6 +54,7 @@ #include "opt_npx.h" #include "opt_perfmon.h" #include "opt_xbox.h" +#include "opt_global.h" #include #include @@ -141,6 +142,25 @@ uint32_t arch_i386_xbox_memsize = 0; #endif +#ifdef XEN +/* XEN includes */ +#include +#include +#include +#include +#include +#include + +void Xhypervisor_callback(void); +void failsafe_callback(void); + +int gdt_set; +extern trap_info_t trap_table[]; +struct proc_ldt default_proc_ldt; +extern int init_first; +int running_xen = 1; +#endif + /* Sanity check for __curthread() */ CTASSERT(offsetof(struct pcpu, pc_curthread) == 0); @@ -258,8 +278,9 @@ */ bufinit(); vm_pager_bufferinit(); - +#ifndef XEN cpu_setregs(); +#endif } /* @@ -1089,6 +1110,25 @@ return (0); } +static int cpu_idle_hlt = 1; +TUNABLE_INT("machdep.cpu_idle_hlt", &cpu_idle_hlt); +SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW, + &cpu_idle_hlt, 0, "Idle loop HLT enable"); + +#ifdef XEN +void +cpu_halt(void) +{ + HYPERVISOR_shutdown(SHUTDOWN_poweroff); +} + +static void +cpu_idle_default(void) +{ + idle_block(); +} + +#else /* * Shutdown the CPU as much as possible */ @@ -1114,10 +1154,6 @@ * XXX I'm turning it on for SMP as well by default for now. It seems to * help lock contention somewhat, and this is critical for HTT. -Peter */ -static int cpu_idle_hlt = 1; -TUNABLE_INT("machdep.cpu_idle_hlt", &cpu_idle_hlt); -SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW, - &cpu_idle_hlt, 0, "Idle loop HLT enable"); static void cpu_idle_default(void) @@ -1129,7 +1165,7 @@ */ __asm __volatile("sti; hlt"); } - +#endif /* * Note that we have to be careful here to avoid a race between checking * sched_runnable() and actually halting. If we don't do this, we may waste @@ -1279,10 +1315,16 @@ */ int _default_ldt; +#ifdef XEN +union descriptor *gdt; +union descriptor *ldt; +#else union descriptor gdt[NGDT * MAXCPU]; /* global descriptor table */ +union descriptor ldt[NLDT]; /* local descriptor table */ +#endif + static struct gate_descriptor idt0[NIDT]; struct gate_descriptor *idt = &idt0[0]; /* interrupt descriptor table */ -union descriptor ldt[NLDT]; /* local descriptor table */ struct region_descriptor r_gdt, r_idt; /* table descriptors */ struct mtx dt_lock; /* lock for GDT and LDT */ @@ -1316,7 +1358,7 @@ { 0x0, /* segment base address */ 0xfffff, /* length - all address space */ SDT_MEMRWA, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, 1, /* default 32 vs 16 bit size */ @@ -1343,7 +1385,7 @@ { 0x0, /* segment base address */ 0xfffff, /* length - all address space */ SDT_MEMERA, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, 1, /* default 32 vs 16 bit size */ @@ -1352,7 +1394,7 @@ { 0x0, /* segment base address */ 0xfffff, /* length - all address space */ SDT_MEMRWA, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, 1, /* default 32 vs 16 bit size */ @@ -1379,7 +1421,7 @@ { 0x400, /* segment base address */ 0xfffff, /* length */ SDT_MEMRWA, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, 1, /* default 32 vs 16 bit size */ @@ -1389,11 +1431,12 @@ 0x0, /* segment base address */ sizeof(struct i386tss)-1,/* length */ SDT_SYS386TSS, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, 0, /* unused - default 32 vs 16 bit size */ 0 /* limit granularity (byte/page units)*/ }, +#ifndef XEN /* GLDT_SEL 10 LDT Descriptor */ { (int) ldt, /* segment base address */ sizeof(ldt)-1, /* length - all address space */ @@ -1402,12 +1445,12 @@ 1, /* segment descriptor present */ 0, 0, 0, /* unused - default 32 vs 16 bit size */ - 0 /* limit granularity (byte/page units)*/ }, + 0 /* limit granularity (byte/page units)*/ }, /* GUSERLDT_SEL 11 User LDT Descriptor per process */ { (int) ldt, /* segment base address */ (512 * sizeof(union descriptor)-1), /* length */ SDT_SYSLDT, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, 0, /* unused - default 32 vs 16 bit size */ @@ -1416,7 +1459,7 @@ { (int) &dblfault_tss, /* segment base address */ sizeof(struct i386tss)-1,/* length - all address space */ SDT_SYS386TSS, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, 0, /* unused - default 32 vs 16 bit size */ @@ -1425,7 +1468,7 @@ { 0, /* segment base address (overwritten) */ 0xfffff, /* length */ SDT_MEMERA, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, 0, /* default 32 vs 16 bit size */ @@ -1434,7 +1477,7 @@ { 0, /* segment base address (overwritten) */ 0xfffff, /* length */ SDT_MEMERA, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, 0, /* default 32 vs 16 bit size */ @@ -1443,7 +1486,7 @@ { 0, /* segment base address (overwritten) */ 0xfffff, /* length */ SDT_MEMRWA, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, 1, /* default 32 vs 16 bit size */ @@ -1452,7 +1495,7 @@ { 0, /* segment base address (overwritten) */ 0xfffff, /* length */ SDT_MEMRWA, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, 0, /* default 32 vs 16 bit size */ @@ -1461,7 +1504,7 @@ { 0, /* segment base address (overwritten) */ 0xfffff, /* length */ SDT_MEMRWA, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, 0, /* default 32 vs 16 bit size */ @@ -1470,11 +1513,12 @@ { 0x0, /* segment base address */ 0x0, /* length */ 0, /* segment type */ - 0, /* segment descriptor priority level */ + SEL_KPL, /* segment descriptor priority level */ 0, /* segment descriptor present */ 0, 0, 0, /* default 32 vs 16 bit size */ 0 /* limit granularity (byte/page units)*/ }, +#endif /* !XEN */ }; static struct soft_segment_descriptor ldt_segs[] = { @@ -1659,7 +1703,16 @@ goto physmap_done; } #endif - +#if defined(XEN) + Maxmem = xen_start_info->nr_pages - init_first; + physmem = Maxmem; + basemem = 0; + physmap[0] = init_first << PAGE_SHIFT; + physmap[1] = ptoa(Maxmem) - round_page(MSGBUF_SIZE); + physmap_idx = 0; + goto physmap_done; +#endif + hasbrokenint12 = 0; TUNABLE_INT_FETCH("hw.hasbrokenint12", &hasbrokenint12); bzero(&vmf, sizeof(vmf)); @@ -1836,7 +1889,7 @@ vmf.vmf_ah = 0x88; vm86_intcall(0x15, &vmf); extmem = vmf.vmf_ax; -#else +#elif !defined(XEN) /* * Prefer the RTC value for extended memory. */ @@ -2067,8 +2120,250 @@ for (off = 0; off < round_page(MSGBUF_SIZE); off += PAGE_SIZE) pmap_kenter((vm_offset_t)msgbufp + off, phys_avail[pa_indx] + off); + + PT_UPDATES_FLUSH(); +} + +#ifdef XEN +void +init386(int first) +{ + + int error, gsel_tss, metadata_missing, x; + unsigned long gdtmachpfn; + struct pcpu *pc; + + thread0.td_kstack = proc0kstack; + thread0.td_pcb = (struct pcb *) + (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; + + /* + * This may be done better later if it gets more high level + * components in it. If so just link td->td_proc here. + */ + proc_linkup0(&proc0, &thread0); + + metadata_missing = 0; + if (xen_start_info->mod_start) { + preload_metadata = (caddr_t)xen_start_info->mod_start; + preload_bootstrap_relocate(KERNBASE); + } else { + metadata_missing = 1; + } + if (envmode == 1) + kern_envp = static_env; + else if ((caddr_t)xen_start_info->cmd_line) + kern_envp = xen_setbootenv((caddr_t)xen_start_info->cmd_line); + + boothowto |= xen_boothowto(kern_envp); + + /* Init basic tunables, hz etc */ + init_param1(); + + /* + * Make gdt memory segments. All segments cover the full 4GB + * of address space and permissions are enforced at page level. + */ + + /* + * XEN occupies the upper 64MB of virtual address space + * At its base it manages an array mapping machine page frames + * to physical page frames - hence we need to be able to + * access 4GB - (64MB - 4MB + 64k) + */ + gdt_segs[GCODE_SEL].ssd_limit = atop(0 - ((1 << 26) - + (1 << 22) + (1 << 16))); + gdt_segs[GDATA_SEL].ssd_limit = atop(0 - ((1 << 26) - + (1 << 22) + (1 << 16))); + gdt_segs[GUCODE_SEL].ssd_limit = atop(0 - ((1 << 26) - + (1 << 22) + (1 << 16))); + gdt_segs[GUDATA_SEL].ssd_limit = atop(0 - ((1 << 26) - + (1 << 22) + (1 << 16))); + gdt_segs[GUFS_SEL].ssd_limit = atop(0 - ((1 << 26) - + (1 << 22) + (1 << 16))); + gdt_segs[GUGS_SEL].ssd_limit = atop(0 - ((1 << 26) - + (1 << 22) + (1 << 16))); + + pc = &__pcpu[0]; + gdt_segs[GPRIV_SEL].ssd_limit = atop(0 - 1); + gdt_segs[GPRIV_SEL].ssd_base = (int) pc; + gdt_segs[GPROC0_SEL].ssd_base = (int) &pc->pc_common_tss; + + for (x = 0; x < NGDT; x++) + ssdtosd(&gdt_segs[x], &gdt[x].sd); + + + mtx_init(&dt_lock, "descriptor tables", NULL, MTX_SPIN); + + printk("gdt=%p\n", gdt); + printk("PTmap=%p\n", PTmap); + printk("addr=%p\n", *vtopte((unsigned long)gdt) & ~PG_RW); + + PT_SET_MA(gdt, *vtopte((unsigned long)gdt) & ~PG_RW); + gdtmachpfn = vtomach(gdt) >> PAGE_SHIFT; + PANIC_IF(HYPERVISOR_set_gdt(&gdtmachpfn, 512) != 0); + lgdt(&r_gdt /* unused */); + gdt_set = 1; + + if ((error = HYPERVISOR_set_trap_table(trap_table)) != 0) { + panic("set_trap_table failed - error %d\n", error); + } + HYPERVISOR_set_callbacks(GSEL(GCODE_SEL, SEL_KPL), + (unsigned long)Xhypervisor_callback, + GSEL(GCODE_SEL, SEL_KPL), (unsigned long)failsafe_callback); + + pcpu_init(pc, 0, sizeof(struct pcpu)); + PCPU_SET(prvspace, pc); + PCPU_SET(curthread, &thread0); + PCPU_SET(curpcb, thread0.td_pcb); + PCPU_SET(pdir, (unsigned long)IdlePTD); + + /* + * Initialize mutexes. + * + * icu_lock: in order to allow an interrupt to occur in a critical + * section, to set pcpu->ipending (etc...) properly, we + * must be able to get the icu lock, so it can't be + * under witness. + */ + mutex_init(); + mtx_init(&icu_lock, "icu", NULL, MTX_SPIN | MTX_NOWITNESS | MTX_NOPROFILE); + + /* make ldt memory segments */ + ldt_segs[LUCODE_SEL].ssd_limit = atop(0 - 1); + ldt_segs[LUDATA_SEL].ssd_limit = atop(0 - 1); + for (x = 0; x < sizeof ldt_segs / sizeof ldt_segs[0]; x++) + ssdtosd(&ldt_segs[x], &ldt[x].sd); + + default_proc_ldt.ldt_base = (caddr_t)ldt; + default_proc_ldt.ldt_len = 6; + _default_ldt = (int)&default_proc_ldt; + PCPU_SET(currentldt, _default_ldt) + PT_SET_MA(ldt, *vtopte((unsigned long)ldt) & ~PG_RW); + xen_set_ldt((unsigned long) ldt, (sizeof ldt_segs / sizeof ldt_segs[0])); + +#ifdef XBOX + /* + * The following code queries the PCI ID of 0:0:0. For the XBOX, + * This should be 0x10de / 0x02a5. + * + * This is exactly what Linux does. + */ + outl(0xcf8, 0x80000000); + if (inl(0xcfc) == 0x02a510de) { + arch_i386_is_xbox = 1; + pic16l_setled(XBOX_LED_GREEN); + + /* + * We are an XBOX, but we may have either 64MB or 128MB of + * memory. The PCI host bridge should be programmed for this, + * so we just query it. + */ + outl(0xcf8, 0x80000084); + arch_i386_xbox_memsize = (inl(0xcfc) == 0x7FFFFFF) ? 128 : 64; + } +#endif /* XBOX */ +#if defined (XEN_PRIVILEGED) + /* + * Initialize the i8254 before the console so that console + * initialization can use DELAY(). + */ + i8254_init(); +#endif + /* + * Initialize the console before we print anything out. + */ + cninit(); + + if (metadata_missing) + printf("WARNING: loader(8) metadata is missing!\n"); + +#ifdef DEV_ISA + if (xen_start_info->flags & SIF_PRIVILEGED) { + elcr_probe(); + atpic_startup(); + } +#endif + +#ifdef DDB + ksym_start = bootinfo.bi_symtab; + ksym_end = bootinfo.bi_esymtab; +#endif + + kdb_init(); + +#ifdef KDB + if (boothowto & RB_KDB) + kdb_enter("Boot flags requested debugger"); +#endif + + finishidentcpu(); /* Final stage of CPU initialization */ + setidt(IDT_UD, &IDTVEC(ill), SDT_SYS386TGT, SEL_KPL, + GSEL(GCODE_SEL, SEL_KPL)); + setidt(IDT_GP, &IDTVEC(prot), SDT_SYS386TGT, SEL_KPL, + GSEL(GCODE_SEL, SEL_KPL)); + initializecpu(); /* Initialize CPU registers */ + + /* make an initial tss so cpu can get interrupt stack on syscall! */ + /* Note: -16 is so we can grow the trapframe if we came from vm86 */ + PCPU_SET(common_tss.tss_esp0, thread0.td_kstack + + KSTACK_PAGES * PAGE_SIZE - sizeof(struct pcb) - 16); + PCPU_SET(common_tss.tss_ss0, GSEL(GDATA_SEL, SEL_KPL)); + gsel_tss = GSEL(GPROC0_SEL, SEL_KPL); + HYPERVISOR_stack_switch(GSEL(GDATA_SEL, SEL_KPL), + PCPU_GET(common_tss.tss_esp0)); + + + /* pointer to selector slot for %fs/%gs */ + PCPU_SET(fsgs_gdt, &gdt[GUFS_SEL].sd); + + dblfault_tss.tss_esp = dblfault_tss.tss_esp0 = dblfault_tss.tss_esp1 = + dblfault_tss.tss_esp2 = (int)&dblfault_stack[sizeof(dblfault_stack)]; + dblfault_tss.tss_ss = dblfault_tss.tss_ss0 = dblfault_tss.tss_ss1 = + dblfault_tss.tss_ss2 = GSEL(GDATA_SEL, SEL_KPL); +#ifdef PAE + dblfault_tss.tss_cr3 = (int)IdlePDPT; +#else + dblfault_tss.tss_cr3 = (int)IdlePTD; +#endif + dblfault_tss.tss_eip = (int)dblfault_handler; + dblfault_tss.tss_eflags = PSL_KERNEL; + dblfault_tss.tss_ds = dblfault_tss.tss_es = + dblfault_tss.tss_gs = GSEL(GDATA_SEL, SEL_KPL); + dblfault_tss.tss_fs = GSEL(GPRIV_SEL, SEL_KPL); + dblfault_tss.tss_cs = GSEL(GCODE_SEL, SEL_KPL); + dblfault_tss.tss_ldt = GSEL(GLDT_SEL, SEL_KPL); + + vm86_initialize(); + getmemsize(first); + init_param2(physmem); + + /* now running on new page tables, configured,and u/iom is accessible */ + + msgbufinit(msgbufp, MSGBUF_SIZE); + + /* transfer to user mode */ + + _ucodesel = GSEL(GUCODE_SEL, SEL_UPL); + _udatasel = GSEL(GUDATA_SEL, SEL_UPL); + + /* setup proc 0's pcb */ + thread0.td_pcb->pcb_flags = 0; +#ifdef PAE + thread0.td_pcb->pcb_cr3 = (int)IdlePDPT; +#else + thread0.td_pcb->pcb_cr3 = (int)IdlePTD; +#endif + thread0.td_pcb->pcb_ext = 0; + thread0.td_frame = &proc0_tf; + thread0.td_pcb->pcb_fsd = PCPU_GET(fsgs_gdt)[0]; + thread0.td_pcb->pcb_gsd = PCPU_GET(fsgs_gdt)[1]; } + + +#else + void init386(first) int first; @@ -2331,6 +2626,7 @@ thread0.td_pcb->pcb_ext = 0; thread0.td_frame = &proc0_tf; } +#endif /* !XEN */ void cpu_pcpu_init(struct pcpu *pcpu, int cpuid, size_t size) ==== //depot/projects/xen31/sys/i386/include/pcpu.h#2 (text+ko) ==== @@ -45,6 +45,9 @@ * to each CPU's data can be set up for things like "check curproc on all * other processors" */ + + +#ifdef XEN #define PCPU_MD_FIELDS \ struct pcpu *pc_prvspace; /* Self-reference */ \ struct pmap *pc_curpmap; \ @@ -55,8 +58,30 @@ int pc_currentldt; \ u_int pc_acpi_id; /* ACPI CPU id */ \ u_int pc_apic_id; \ + int pc_private_tss; /* Flag indicating private tss*/\ + u_int pc_cr3; /* track cr3 for R1/R3*/ \ + u_int pc_pdir; \ + u_int pc_lazypmap; \ + u_int pc_rendezvous; \ + u_int pc_cpuast + + +#else +#define PCPU_MD_FIELDS \ + struct pcpu *pc_prvspace; /* Self-reference */ \ + struct pmap *pc_curpmap; \ + struct i386tss pc_common_tss; \ + struct segment_descriptor pc_common_tssd; \ + struct segment_descriptor *pc_tss_gdt; \ + struct segment_descriptor *pc_fsgs_gdt; \ + int pc_currentldt; \ + u_int pc_acpi_id; /* ACPI CPU id */ \ + u_int pc_apic_id; \ int pc_private_tss /* Flag indicating private tss */ + +#endif /* !XEN */ + #ifdef lint extern struct pcpu *pcpup; ==== //depot/projects/xen31/sys/i386/include/pmap.h#3 (text+ko) ==== @@ -189,6 +189,45 @@ #define vtopte(va) (PTmap + i386_btop(va)) #define vtophys(va) pmap_kextract((vm_offset_t)(va)) + + +#ifdef XEN +#include +#include +#include +#ifndef TRUE +#define TRUE 1 +#endif +#ifndef FALSE +#define FALSE 0 +#endif + +static __inline vm_paddr_t +pmap_kextract_ma(vm_offset_t va) +{ + vm_paddr_t ma; + if ((ma = PTD[va >> PDRSHIFT]) & PG_PS) { + ma = (ma & ~(NBPDR - 1)) | (va & (NBPDR - 1)); + } else { + ma = (*vtopte(va) & PG_FRAME) | (va & PAGE_MASK); + } + return ma; +} + +static __inline vm_paddr_t +pmap_kextract(vm_offset_t va) +{ + return xpmap_mtop(pmap_kextract_ma(va)); +} +#define vtomach(va) pmap_kextract_ma(((vm_offset_t) (va))) + +vm_paddr_t pmap_extract_ma(struct pmap *pmap, vm_offset_t va); + +void pmap_kenter_ma(vm_offset_t va, vm_paddr_t pa); +void pmap_map_readonly(struct pmap *pmap, vm_offset_t va, int len); +void pmap_map_readwrite(struct pmap *pmap, vm_offset_t va, int len); + +#else /* * Routine: pmap_kextract * Function: @@ -304,6 +343,7 @@ #define pte_clear(ptep) pte_store((ptep), (pt_entry_t)0ULL) #define pde_store(pdep, pde) pte_store((pdep), (pde)) +#endif /* !XEN */ #endif /* _KERNEL */ From owner-p4-projects@FreeBSD.ORG Mon Dec 3 05:16:42 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA9AB16A46C; Mon, 3 Dec 2007 05:16:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4A2EB16A468 for ; Mon, 3 Dec 2007 05:16:42 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 49A4813C469 for ; Mon, 3 Dec 2007 05:16:42 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB35Gfmm089788 for ; Mon, 3 Dec 2007 05:16:41 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB35Gftr089785 for perforce@freebsd.org; Mon, 3 Dec 2007 05:16:41 GMT (envelope-from marcel@freebsd.org) Date: Mon, 3 Dec 2007 05:16:41 GMT Message-Id: <200712030516.lB35Gftr089785@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130077 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2007 05:16:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=130077 Change 130077 by marcel@marcel_cluster on 2007/12/03 05:15:41 Add support for BSD disklabels to g_part. BSD disklabels with 8-20 (incl) partitions is supported. No bootcode support as of yet. Compile-tested only. Affected files ... .. //depot/projects/ia64/sys/conf/NOTES#118 edit .. //depot/projects/ia64/sys/conf/files#159 edit .. //depot/projects/ia64/sys/conf/options#109 edit .. //depot/projects/ia64/sys/geom/part/g_part.c#4 edit .. //depot/projects/ia64/sys/geom/part/g_part.h#4 edit .. //depot/projects/ia64/sys/geom/part/g_part_bsd.c#1 add .. //depot/projects/ia64/sys/ia64/conf/DEFAULTS#9 edit Differences ... ==== //depot/projects/ia64/sys/conf/NOTES#118 (text+ko) ==== @@ -146,6 +146,7 @@ options GEOM_MULTIPATH # Disk multipath options GEOM_NOP # Test class. options GEOM_PART_APM # Apple partitioning +options GEOM_PART_BSD # BSD disklabel options GEOM_PART_GPT # GPT partitioning options GEOM_PART_MBR # MBR partitioning options GEOM_PC98 # NEC PC9800 partitioning ==== //depot/projects/ia64/sys/conf/files#159 (text+ko) ==== @@ -1294,6 +1294,7 @@ geom/part/g_part.c standard geom/part/g_part_if.m standard geom/part/g_part_apm.c optional geom_part_apm +geom/part/g_part_bsd.c optional geom_part_bsd geom/part/g_part_gpt.c optional geom_part_gpt geom/part/g_part_mbr.c optional geom_part_mbr geom/raid3/g_raid3.c optional geom_raid3 ==== //depot/projects/ia64/sys/conf/options#109 (text+ko) ==== @@ -88,6 +88,7 @@ GEOM_MULTIPATH opt_geom.h GEOM_NOP opt_geom.h GEOM_PART_APM opt_geom.h +GEOM_PART_BSD opt_geom.h GEOM_PART_GPT opt_geom.h GEOM_PART_MBR opt_geom.h GEOM_PC98 opt_geom.h ==== //depot/projects/ia64/sys/geom/part/g_part.c#4 (text+ko) ==== @@ -664,6 +664,14 @@ error = g_getattr("PART::depth", cp, &attr); table->gpt_depth = (!error) ? attr + 1 : 0; + /* If we're nested, get the absolute sector offset on disk. */ + if (table->gpt_depth) { + error = g_getattr("PART::offset", cp, &attr); + if (error) + goto fail; + table->gpt_offset = attr; + } + /* * Synthesize a disk geometry. Some partitioning schemes * depend on it and since some file systems need it even @@ -1329,7 +1337,15 @@ goto fail; table = gp->softc; - + + /* If we're nested, get the absolute sector offset on disk. */ + if (table->gpt_depth) { + error = g_getattr("PART::offset", cp, &attr); + if (error) + goto fail; + table->gpt_offset = attr; + } + /* * Synthesize a disk geometry. Some partitioning schemes * depend on it and since some file systems need it even @@ -1505,6 +1521,9 @@ return; if (g_handleattr_int(bp, "PART::depth", table->gpt_depth)) return; + if (g_handleattr_int(bp, "PART::offset", + table->gpt_offset + entry->gpe_offset)) + return; if (!strcmp("GEOM::kerneldump", bp->bio_attribute)) { /* * Check that the partition is suitable for kernel ==== //depot/projects/ia64/sys/geom/part/g_part.h#4 (text+ko) ==== @@ -99,6 +99,13 @@ */ uint32_t gpt_sectors; uint32_t gpt_heads; + /* + * gpt_offset holds the absolute block address of the scheme + * on disk. Some partitioning schemes (historically) use + * absolute addressing. Relative addresses are obtained by + * subtracting gpt_offset from the absolute addresses. + */ + uint64_t gpt_offset; int gpt_depth; /* Sub-partitioning level. */ int gpt_isleaf:1; /* Cannot be sub-partitioned. */ ==== //depot/projects/ia64/sys/ia64/conf/DEFAULTS#9 (text+ko) ==== @@ -14,7 +14,7 @@ # UART chips on this platform device uart_ns8250 -options GEOM_BSD +options GEOM_PART_BSD options GEOM_PART_GPT options GEOM_PART_MBR From owner-p4-projects@FreeBSD.ORG Mon Dec 3 05:37:04 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89D7616A469; Mon, 3 Dec 2007 05:37:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2F07716A419 for ; Mon, 3 Dec 2007 05:37:04 +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 03ADA13C45A for ; Mon, 3 Dec 2007 05:37:04 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB35b3Nv092635 for ; Mon, 3 Dec 2007 05:37:03 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB35b346092632 for perforce@freebsd.org; Mon, 3 Dec 2007 05:37:03 GMT (envelope-from sam@freebsd.org) Date: Mon, 3 Dec 2007 05:37:03 GMT Message-Id: <200712030537.lB35b346092632@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 130078 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2007 05:37:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=130078 Change 130078 by sam@sam_ebb on 2007/12/03 05:36:54 start over Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_power.c#4 delete Differences ... From owner-p4-projects@FreeBSD.ORG Mon Dec 3 05:38:05 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E19716A468; Mon, 3 Dec 2007 05:38:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 18F3F16A41A for ; Mon, 3 Dec 2007 05:38:05 +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 023F313C4E8 for ; Mon, 3 Dec 2007 05:38:05 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB35c4TJ092669 for ; Mon, 3 Dec 2007 05:38:04 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB35c4vd092666 for perforce@freebsd.org; Mon, 3 Dec 2007 05:38:04 GMT (envelope-from sam@freebsd.org) Date: Mon, 3 Dec 2007 05:38:04 GMT Message-Id: <200712030538.lB35c4vd092666@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 130079 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2007 05:38:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=130079 Change 130079 by sam@sam_ebb on 2007/12/03 05:37:50 initial version Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_power.c#5 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Dec 3 18:39:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40E2716A469; Mon, 3 Dec 2007 18:39: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 D4D3D16A468 for ; Mon, 3 Dec 2007 18:39:29 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D297713C45B for ; Mon, 3 Dec 2007 18:39:29 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB3IdTo7084061 for ; Mon, 3 Dec 2007 18:39:29 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB3IdRAC084058 for perforce@freebsd.org; Mon, 3 Dec 2007 18:39:27 GMT (envelope-from sam@freebsd.org) Date: Mon, 3 Dec 2007 18:39:27 GMT Message-Id: <200712031839.lB3IdRAC084058@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 130106 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2007 18:39:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=130106 Change 130106 by sam@sam_ebb on 2007/12/03 18:39:25 checkpoint vap integration; compiles but needs major work and is still missing pieces Supported by: Marvell Affected files ... .. //depot/projects/vap/sys/conf/files#8 edit .. //depot/projects/vap/sys/conf/options#6 edit .. //depot/projects/vap/sys/modules/Makefile#7 edit .. //depot/projects/vap/sys/modules/wlan/Makefile#6 edit .. //depot/projects/vap/sys/net/if_media.h#7 edit .. //depot/projects/vap/sys/net80211/_ieee80211.h#8 edit .. //depot/projects/vap/sys/net80211/ieee80211.c#16 edit .. //depot/projects/vap/sys/net80211/ieee80211.h#6 edit .. //depot/projects/vap/sys/net80211/ieee80211_acl.c#6 edit .. //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#1 add .. //depot/projects/vap/sys/net80211/ieee80211_adhoc.h#1 add .. //depot/projects/vap/sys/net80211/ieee80211_amrr.c#4 edit .. //depot/projects/vap/sys/net80211/ieee80211_amrr.h#4 edit .. //depot/projects/vap/sys/net80211/ieee80211_crypto.c#8 edit .. //depot/projects/vap/sys/net80211/ieee80211_crypto.h#9 edit .. //depot/projects/vap/sys/net80211/ieee80211_crypto_ccmp.c#8 edit .. //depot/projects/vap/sys/net80211/ieee80211_crypto_none.c#8 edit .. //depot/projects/vap/sys/net80211/ieee80211_crypto_tkip.c#8 edit .. //depot/projects/vap/sys/net80211/ieee80211_crypto_wep.c#8 edit .. //depot/projects/vap/sys/net80211/ieee80211_dfs.c#1 add .. //depot/projects/vap/sys/net80211/ieee80211_dfs.h#1 add .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#13 edit .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#12 edit .. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#1 add .. //depot/projects/vap/sys/net80211/ieee80211_hostap.h#1 add .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#4 edit .. //depot/projects/vap/sys/net80211/ieee80211_ht.h#4 edit .. //depot/projects/vap/sys/net80211/ieee80211_input.c#22 edit .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#18 edit .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.h#10 edit .. //depot/projects/vap/sys/net80211/ieee80211_monitor.c#1 add .. //depot/projects/vap/sys/net80211/ieee80211_monitor.h#1 add .. //depot/projects/vap/sys/net80211/ieee80211_node.c#16 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.h#11 edit .. //depot/projects/vap/sys/net80211/ieee80211_output.c#19 edit .. //depot/projects/vap/sys/net80211/ieee80211_power.c#6 edit .. //depot/projects/vap/sys/net80211/ieee80211_proto.c#16 edit .. //depot/projects/vap/sys/net80211/ieee80211_proto.h#11 edit .. //depot/projects/vap/sys/net80211/ieee80211_radiotap.h#6 edit .. //depot/projects/vap/sys/net80211/ieee80211_scan.c#11 edit .. //depot/projects/vap/sys/net80211/ieee80211_scan.h#9 edit .. //depot/projects/vap/sys/net80211/ieee80211_scan_ap.c#7 delete .. //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#13 edit .. //depot/projects/vap/sys/net80211/ieee80211_sta.c#1 add .. //depot/projects/vap/sys/net80211/ieee80211_sta.h#1 add .. //depot/projects/vap/sys/net80211/ieee80211_var.h#21 edit .. //depot/projects/vap/sys/net80211/ieee80211_wds.c#1 add .. //depot/projects/vap/sys/net80211/ieee80211_wds.h#1 add .. //depot/projects/vap/sys/net80211/ieee80211_xauth.c#6 edit Differences ... ==== //depot/projects/vap/sys/conf/files#8 (text+ko) ==== @@ -1650,24 +1650,29 @@ mxge | ppp_deflate | netgraph_deflate net80211/ieee80211.c optional wlan net80211/ieee80211_acl.c optional wlan_acl +net80211/ieee80211_adhoc.c optional wlan net80211/ieee80211_amrr.c optional wlan_amrr net80211/ieee80211_crypto.c optional wlan net80211/ieee80211_crypto_ccmp.c optional wlan_ccmp net80211/ieee80211_crypto_none.c optional wlan net80211/ieee80211_crypto_tkip.c optional wlan_tkip net80211/ieee80211_crypto_wep.c optional wlan_wep +net80211/ieee80211_dfs.c optional wlan net80211/ieee80211_freebsd.c optional wlan +net80211/ieee80211_hostap.c optional wlan net80211/ieee80211_ht.c optional wlan net80211/ieee80211_input.c optional wlan net80211/ieee80211_ioctl.c optional wlan +net80211/ieee80211_monitor.c optional wlan net80211/ieee80211_node.c optional wlan net80211/ieee80211_output.c optional wlan net80211/ieee80211_power.c optional wlan net80211/ieee80211_proto.c optional wlan net80211/ieee80211_regdomain.c optional wlan net80211/ieee80211_scan.c optional wlan -net80211/ieee80211_scan_ap.c optional wlan_scan_ap net80211/ieee80211_scan_sta.c optional wlan_scan_sta +net80211/ieee80211_sta.c optional wlan +net80211/ieee80211_wds.c optional wlan net80211/ieee80211_xauth.c optional wlan_xauth netatalk/aarp.c optional netatalk netatalk/at_control.c optional netatalk ==== //depot/projects/vap/sys/conf/options#6 (text+ko) ==== @@ -750,3 +750,8 @@ # Interrupt filtering INTR_FILTER opt_global.h + +# 802.11 support layer +IEEE80211_DEBUG opt_wlan.h +IEEE80211_DEBUG_REFCNT opt_wlan.h +IEEE80211_AMPDU_AGE opt_wlan.h ==== //depot/projects/vap/sys/modules/Makefile#7 (text+ko) ==== @@ -304,7 +304,6 @@ wlan_acl \ wlan_amrr \ wlan_ccmp \ - wlan_scan_ap \ wlan_scan_sta \ wlan_tkip \ wlan_wep \ ==== //depot/projects/vap/sys/modules/wlan/Makefile#6 (text+ko) ==== @@ -3,16 +3,18 @@ .PATH: ${.CURDIR}/../../net80211 KMOD= wlan -SRCS= ieee80211.c ieee80211_crypto.c ieee80211_crypto_none.c \ +SRCS= ieee80211.c ieee80211_crypto.c ieee80211_crypto_none.c ieee80211_dfs.c \ ieee80211_freebsd.c ieee80211_input.c ieee80211_ioctl.c \ ieee80211_node.c ieee80211_output.c ieee80211_power.c \ ieee80211_proto.c ieee80211_scan.c ieee80211_regdomain.c \ - ieee80211_ht.c -SRCS+= bus_if.h device_if.h opt_compat.h opt_inet.h opt_ipx.h + ieee80211_ht.c \ + ieee80211_adhoc.c ieee80211_hostap.c ieee80211_monitor.c \ + ieee80211_sta.c ieee80211_wds.c +SRCS+= bus_if.h device_if.h opt_inet.h opt_ipx.h opt_wlan.h .if !defined(KERNBUILDDIR) -opt_compat.h: - echo "#define COMPAT_FREEBSD6 1" > ${.TARGET} +opt_wlan.h: + echo "#define IEEE80211_DEBUG 1" > opt_wlan.h opt_inet.h: echo "#define INET 1" > opt_inet.h ==== //depot/projects/vap/sys/net/if_media.h#7 (text+ko) ==== @@ -208,7 +208,7 @@ #define IFM_IEEE80211_ADHOC 0x00000100 /* Operate in Adhoc mode */ #define IFM_IEEE80211_HOSTAP 0x00000200 /* Operate in Host AP mode */ #define IFM_IEEE80211_IBSS 0x00000400 /* Operate in IBSS mode */ -#define IFM_IEEE80211_IBSSMASTER 0x00000800 /* Operate as an IBSS master */ +#define IFM_IEEE80211_WDS 0x00000800 /* Operate in WDS mode */ #define IFM_IEEE80211_TURBO 0x00001000 /* Operate in turbo mode */ #define IFM_IEEE80211_MONITOR 0x00002000 /* Operate in monitor mode */ @@ -495,7 +495,7 @@ { IFM_IEEE80211_ADHOC, "adhoc" }, \ { IFM_IEEE80211_HOSTAP, "hostap" }, \ { IFM_IEEE80211_IBSS, "ibss" }, \ - { IFM_IEEE80211_IBSSMASTER, "ibss-master" }, \ + { IFM_IEEE80211_WDS, "wds" }, \ { IFM_IEEE80211_TURBO, "turbo" }, \ { IFM_IEEE80211_MONITOR, "monitor" }, \ { 0, NULL }, \ ==== //depot/projects/vap/sys/net80211/_ieee80211.h#8 (text+ko) ==== @@ -28,16 +28,31 @@ #ifndef _NET80211__IEEE80211_H_ #define _NET80211__IEEE80211_H_ +/* + * 802.11 implementation definitions. + * + * NB: this file is used by applications. + */ + +/* + * PHY type; mostly used to identify FH phys. + */ enum ieee80211_phytype { IEEE80211_T_DS, /* direct sequence spread spectrum */ IEEE80211_T_FH, /* frequency hopping */ IEEE80211_T_OFDM, /* frequency division multiplexing */ IEEE80211_T_TURBO, /* high rate OFDM, aka turbo mode */ - IEEE80211_T_HT, /* high throughput, full GI */ + IEEE80211_T_HT, /* high throughput */ }; #define IEEE80211_T_CCK IEEE80211_T_DS /* more common nomenclature */ -/* XXX not really a mode; there are really multiple PHY's */ +/* + * PHY mode; this is not really a mode as multi-mode devices + * have multiple PHY's. Mode is mostly used as a shorthand + * for constraining which channels to consider in setting up + * operation. Modes used to be used more extensively when + * channels were identified as IEEE channel numbers. + */ enum ieee80211_phymode { IEEE80211_MODE_AUTO = 0, /* autoselect */ IEEE80211_MODE_11A = 1, /* 5GHz, OFDM */ @@ -52,13 +67,18 @@ }; #define IEEE80211_MODE_MAX (IEEE80211_MODE_11NG+1) +/* + * Operating mode. Devices do not necessarily support + * all modes; they indicate which are supported in their + * capabilities. + */ enum ieee80211_opmode { + IEEE80211_M_IBSS = 0, /* IBSS (adhoc) station */ IEEE80211_M_STA = 1, /* infrastructure station */ - IEEE80211_M_IBSS = 0, /* IBSS (adhoc) station */ + IEEE80211_M_WDS = 2, /* WDS link */ IEEE80211_M_AHDEMO = 3, /* Old lucent compatible adhoc demo */ - IEEE80211_M_HOSTAP = 6, /* Software Access Point */ - IEEE80211_M_MONITOR = 8, /* Monitor mode */ - IEEE80211_M_WDS = 2 /* WDS link */ + IEEE80211_M_HOSTAP = 4, /* Software Access Point */ + IEEE80211_M_MONITOR = 5, /* Monitor mode */ }; #define IEEE80211_OPMODE_MAX (IEEE80211_M_MONITOR+1) @@ -72,7 +92,11 @@ }; /* - * Authentication mode. + * Authentication mode. The open and shared key authentication + * modes are implemented within the 802.11 layer. 802.1x and + * WPA/802.11i are implemented in user mode by setting the + * 802.11 layer into IEEE80211_AUTH_8021X and deferring + * authentication to user space programs. */ enum ieee80211_authmode { IEEE80211_AUTH_NONE = 0, @@ -265,18 +289,28 @@ #define IEEE80211_NONQOS_TID WME_NUM_TID /* index for non-QoS sta */ /* + * The 802.11 spec says at most 2007 stations may be + * associated at once. For most AP's this is way more + * than is feasible so we use a default of 128. This + * number may be overridden by the driver and/or by + * user configuration but may not be less than IEEE80211_AID_MIN. + */ +#define IEEE80211_AID_DEF 128 +#define IEEE80211_AID_MIN 16 + +/* * 802.11 rate set. */ #define IEEE80211_RATE_SIZE 8 /* 802.11 standard */ #define IEEE80211_RATE_MAXSIZE 15 /* max rates we'll handle */ struct ieee80211_rateset { - uint8_t rs_nrates; - uint8_t rs_rates[IEEE80211_RATE_MAXSIZE]; + uint8_t rs_nrates; + uint8_t rs_rates[IEEE80211_RATE_MAXSIZE]; }; /* - * 802.11n variant of ieee80211_rateset. Instead + * 802.11n variant of ieee80211_rateset. Instead of * legacy rates the entries are MCS rates. We define * the structure such that it can be used interchangeably * with an ieee80211_rateset (modulo structure size). @@ -284,27 +318,58 @@ #define IEEE80211_HTRATE_MAXSIZE 127 struct ieee80211_htrateset { - uint8_t rs_nrates; - uint8_t rs_rates[IEEE80211_HTRATE_MAXSIZE]; + uint8_t rs_nrates; + uint8_t rs_rates[IEEE80211_HTRATE_MAXSIZE]; }; #define IEEE80211_RATE_MCS 0x80 /* - * Roaming state visible to user space. There are two - * thresholds that control whether roaming is considered; - * when either is exceeded the 802.11 layer will check - * the scan cache for another AP. If the cache is stale - * then a scan may be triggered. + * Per-mode transmit parameters/controls visible to user space. + * These can be used to set fixed transmit rate for all operating + * modes or on a per-client basis according to the capabilities + * of the client (e.g. an 11b client associated to an 11g ap). + * + * MCS are distinguished from legacy rates by or'ing in 0x80. + */ +struct ieee80211_txparam { + uint8_t ucastrate; /* ucast data rate (legacy/MCS|0x80) */ + uint8_t mgmtrate; /* mgmt frame rate (legacy/MCS|0x80) */ + uint8_t mcastrate; /* multicast rate (legacy/MCS|0x80) */ + uint8_t maxretry; /* max unicast data retry count */ +}; + +/* + * Per-mode roaming state visible to user space. There are two + * thresholds that control whether roaming is considered; when + * either is exceeded the 802.11 layer will check the scan cache + * for another AP. If the cache is stale then a scan may be + * triggered. + */ +struct ieee80211_roamparam { + int8_t rssi; /* rssi thresh (.5 dBm) */ + uint8_t rate; /* tx rate thresh (.5 Mb/s or MCS) */ + uint16_t pad; /* reserve */ +}; + +/* + * Regulatory Information. + */ +struct ieee80211_regdomain { + uint16_t regdomain; /* SKU */ + uint16_t country; /* ISO country code */ + uint8_t location; /* I (indoor), O (outdoor), other */ + uint8_t ecm; /* Extended Channel Mode */ + char isocc[2]; /* country code string */ + short pad[2]; +}; + +/* + * MIMO antenna/radio state. */ -struct ieee80211_roam { - int8_t rssi11a; /* rssi thresh for 11a bss */ - int8_t rssi11b; /* for 11g sta in 11b bss */ - int8_t rssi11bOnly; /* for 11b sta */ - uint8_t pad1; - uint8_t rate11a; /* rate thresh for 11a bss */ - uint8_t rate11b; /* for 11g sta in 11b bss */ - uint8_t rate11bOnly; /* for 11b sta */ - uint8_t pad2; +struct ieee80211_mimo_info { + int8_t rssi[3]; /* per-antenna rssi */ + int8_t noise[3]; /* per-antenna noise floor */ + uint32_t evm[3]; /* EVM data */ }; #endif /* _NET80211__IEEE80211_H_ */ ==== //depot/projects/vap/sys/net80211/ieee80211.c#16 (text+ko) ==== @@ -38,10 +38,13 @@ #include #include +#include #include +#include #include #include +#include #include @@ -57,7 +60,21 @@ "11na", /* IEEE80211_MODE_11NA */ "11ng", /* IEEE80211_MODE_11NG */ }; +static const uint8_t ieee80211broadcastaddr[IEEE80211_ADDR_LEN] = + { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; + +static void ieee80211_syncflag_locked(struct ieee80211com *ic, int flag); +static void ieee80211_syncflag_ext_locked(struct ieee80211com *ic, int flag); +static int ieee80211_media_setup(struct ieee80211com *ic, + struct ifmedia *media, int caps, int addsta, + ifm_change_cb_t media_change, ifm_stat_cb_t media_stat); +static void ieee80211com_media_status(struct ifnet *, struct ifmediareq *); +static int ieee80211com_media_change(struct ifnet *); +static int media_status(enum ieee80211_opmode, + const struct ieee80211_channel *); +MALLOC_DEFINE(M_80211_VAP, "80211vap", "802.11 vap state"); + /* * Default supported rates for 802.11 operation (in IEEE .5Mb units). */ @@ -75,66 +92,6 @@ { 12, { B(2), B(4), B(11), B(22), 12, 18, 24, 36, 48, 72, 96, 108 } }; #undef B -static int media_status(enum ieee80211_opmode , - const struct ieee80211_channel *); - -/* list of all instances */ -SLIST_HEAD(ieee80211_list, ieee80211com); -static struct ieee80211_list ieee80211_list = - SLIST_HEAD_INITIALIZER(ieee80211_list); -static uint8_t ieee80211_vapmap[32]; /* enough for 256 */ -static struct mtx ieee80211_vap_mtx; -MTX_SYSINIT(ieee80211, &ieee80211_vap_mtx, "net80211 instances", MTX_DEF); - -static void -ieee80211_add_vap(struct ieee80211com *ic) -{ -#define N(a) (sizeof(a)/sizeof(a[0])) - int i; - uint8_t b; - - mtx_lock(&ieee80211_vap_mtx); - ic->ic_vap = 0; - for (i = 0; i < N(ieee80211_vapmap) && ieee80211_vapmap[i] == 0xff; i++) - ic->ic_vap += NBBY; - if (i == N(ieee80211_vapmap)) - panic("vap table full"); - for (b = ieee80211_vapmap[i]; b & 1; b >>= 1) - ic->ic_vap++; - setbit(ieee80211_vapmap, ic->ic_vap); - SLIST_INSERT_HEAD(&ieee80211_list, ic, ic_next); - mtx_unlock(&ieee80211_vap_mtx); -#undef N -} - -static void -ieee80211_remove_vap(struct ieee80211com *ic) -{ - mtx_lock(&ieee80211_vap_mtx); - SLIST_REMOVE(&ieee80211_list, ic, ieee80211com, ic_next); - KASSERT(ic->ic_vap < sizeof(ieee80211_vapmap)*NBBY, - ("invalid vap id %d", ic->ic_vap)); - KASSERT(isset(ieee80211_vapmap, ic->ic_vap), - ("vap id %d not allocated", ic->ic_vap)); - clrbit(ieee80211_vapmap, ic->ic_vap); - mtx_unlock(&ieee80211_vap_mtx); -} - -/* - * Default reset method for use with the ioctl support. This - * method is invoked after any state change in the 802.11 - * layer that should be propagated to the hardware but not - * require re-initialization of the 802.11 state machine (e.g - * rescanning for an ap). We always return ENETRESET which - * should cause the driver to re-initialize the device. Drivers - * can override this method to implement more optimized support. - */ -static int -ieee80211_default_reset(struct ifnet *ifp) -{ - return ENETRESET; -} - /* * Fill in 802.11 available channel set, mark * all available channels as active, and pick @@ -153,6 +110,7 @@ KASSERT(0 < ic->ic_nchans && ic->ic_nchans < IEEE80211_CHAN_MAX, ("invalid number of channels specified: %u", ic->ic_nchans)); memset(ic->ic_chan_avail, 0, sizeof(ic->ic_chan_avail)); + memset(ic->ic_modecaps, 0, sizeof(ic->ic_modecaps)); setbit(ic->ic_modecaps, IEEE80211_MODE_AUTO); for (i = 0; i < ic->ic_nchans; i++) { c = &ic->ic_channels[i]; @@ -186,9 +144,13 @@ memcpy(ic->ic_chan_active, ic->ic_chan_avail, sizeof(ic->ic_chan_avail)); - ic->ic_des_chan = IEEE80211_CHAN_ANYC; /* any channel is ok */ + /* sort channel table to allow lookup optimizations */ + ieee80211_sort_channels(ic->ic_channels, ic->ic_nchans); + + /* invalidate any previous state */ ic->ic_bsschan = IEEE80211_CHAN_ANYC; ic->ic_prevchan = NULL; + ic->ic_csa_newchan = NULL; /* arbitrarily pick the first channel */ ic->ic_curchan = &ic->ic_channels[0]; @@ -206,54 +168,45 @@ #undef DEFAULTRATES } +static void +null_update_mcast(struct ifnet *ifp) +{ + if_printf(ifp, "need multicast update callback\n"); +} + +static void +null_update_promisc(struct ifnet *ifp) +{ + if_printf(ifp, "need promiscuous mode update callback\n"); +} + +/* + * Attach/setup the common net80211 state. Called by + * the driver on attach to prior to creating any vap's. + */ void ieee80211_ifattach(struct ieee80211com *ic) { struct ifnet *ifp = ic->ic_ifp; + struct sockaddr_dl *sdl; + struct ifaddr *ifa; ether_ifattach(ifp, ic->ic_myaddr); - ifp->if_output = ieee80211_output; - bpfattach2(ifp, DLT_IEEE802_11, - sizeof(struct ieee80211_frame_addr4), &ic->ic_rawbpf); - - /* override the 802.3 setting */ - ifp->if_hdrlen = ic->ic_headroom - + sizeof(struct ieee80211_qosframe_addr4) - + IEEE80211_WEP_IVLEN + IEEE80211_WEP_KIDLEN - + IEEE80211_WEP_EXTIVLEN; - /* XXX no way to recalculate on ifdetach */ - if (ALIGN(ifp->if_hdrlen) > max_linkhdr) { - /* XXX sanity check... */ - max_linkhdr = ALIGN(ifp->if_hdrlen); - max_hdr = max_linkhdr + max_protohdr; - max_datalen = MHLEN - max_hdr; - } - + IEEE80211_LOCK_INIT(ic, "ieee80211com"); + TAILQ_INIT(&ic->ic_vaps); /* * Fill in 802.11 available channel set, mark all * available channels as active, and pick a default * channel if not already specified. */ - ieee80211_chan_init(ic); + ieee80211_media_init(ic, + ieee80211com_media_change, ieee80211com_media_status); - if (ic->ic_caps & IEEE80211_C_BGSCAN) /* enable if capable */ - ic->ic_flags |= IEEE80211_F_BGSCAN; -#if 0 - /* XXX not until WME+WPA issues resolved */ - if (ic->ic_caps & IEEE80211_C_WME) /* enable if capable */ - ic->ic_flags |= IEEE80211_F_WME; -#endif - if (ic->ic_caps & IEEE80211_C_BURST) - ic->ic_flags |= IEEE80211_F_BURST; - ic->ic_flags |= IEEE80211_F_DOTH; /* XXX out of caps, just ena */ + ic->ic_update_mcast = null_update_mcast; + ic->ic_update_promisc = null_update_promisc; ic->ic_bintval = IEEE80211_BINTVAL_DEFAULT; - ic->ic_bmissthreshold = IEEE80211_HWBMISS_DEFAULT; - ic->ic_dtim_period = IEEE80211_DTIM_DEFAULT; - IEEE80211_LOCK_INIT(ic, "ieee80211com"); - IEEE80211_BEACON_LOCK_INIT(ic, "beacon"); - ic->ic_lintval = ic->ic_bintval; ic->ic_txpowlimit = IEEE80211_TXPOWER_MAX; @@ -263,30 +216,43 @@ ieee80211_proto_attach(ic); ieee80211_ht_attach(ic); ieee80211_scan_attach(ic); + ieee80211_regdomain_attach(ic); - ieee80211_add_vap(ic); + ieee80211_sysctl_attach(ic); - ieee80211_sysctl_attach(ic); /* NB: requires ic_vap */ - - /* - * Install a default reset method for the ioctl support. - * The driver is expected to fill this in before calling us. - */ - if (ic->ic_reset == NULL) - ic->ic_reset = ieee80211_default_reset; - - KASSERT(ifp->if_spare2 == NULL, ("oops, hosed")); - ifp->if_spare2 = ic; /* XXX temp backpointer */ + ifp->if_type = IFT_IEEE80211; /* NB: not IFT_ETHER */ + ifp->if_addrlen = IEEE80211_ADDR_LEN; + ifp->if_hdrlen = 0; + if_attach(ifp); + /* NB: must do after 'cuz if_attach resets state */ + ifp->if_mtu = IEEE80211_MTU_MAX; + ifa = ifaddr_byindex(ifp->if_index); + KASSERT(ifa != NULL, ("%s: no lladdr!\n", __func__)); + sdl = (struct sockaddr_dl *)ifa->ifa_addr; + sdl->sdl_type = IFT_ETHER; /* XXX IFT_IEEE80211? */ + sdl->sdl_alen = IEEE80211_ADDR_LEN; + IEEE80211_ADDR_COPY(LLADDR(sdl), ic->ic_myaddr); + ifp->if_broadcastaddr = ieee80211broadcastaddr; } +/* + * Detach net80211 state on device detach. Tear down + * all vap's and reclaim all common state prior to the + * device state going away. Note we may call back into + * driver; it must be prepared for this. + */ void ieee80211_ifdetach(struct ieee80211com *ic) { struct ifnet *ifp = ic->ic_ifp; + struct ieee80211vap *vap; - ieee80211_remove_vap(ic); + /* XXX ieee80211_stop_all? */ + while ((vap = TAILQ_FIRST(&ic->ic_vaps)) != NULL) + ic->ic_vap_delete(vap); ieee80211_sysctl_detach(ic); + ieee80211_regdomain_detach(ic); ieee80211_scan_detach(ic); ieee80211_ht_detach(ic); /* NB: must be called before ieee80211_node_detach */ @@ -296,13 +262,356 @@ ieee80211_node_detach(ic); ifmedia_removeall(&ic->ic_media); + bpfdetach(ifp); + ether_ifdetach(ifp); + IEEE80211_LOCK_DESTROY(ic); - IEEE80211_BEACON_LOCK_DESTROY(ic); + if_detach(ifp); +} + +/* + * Default reset method for use with the ioctl support. This + * method is invoked after any state change in the 802.11 + * layer that should be propagated to the hardware but not + * require re-initialization of the 802.11 state machine (e.g + * rescanning for an ap). We always return ENETRESET which + * should cause the driver to re-initialize the device. Drivers + * can override this method to implement more optimized support. + */ +static int +default_reset(struct ieee80211vap *vap) +{ + return ENETRESET; +} + +/* + * Prepare a vap for use. Drivers use this call to + * setup net80211 state in new vap's prior attaching + * them with ieee80211_vap_attach (below). + */ +int +ieee80211_vap_setup(struct ieee80211com *ic, struct ieee80211vap *vap, + const char name[IFNAMSIZ], int unit, int opmode, int flags, + const uint8_t bssid[IEEE80211_ADDR_LEN]) +{ +#define IEEE80211_C_OPMODE \ + (IEEE80211_C_IBSS | IEEE80211_C_HOSTAP | IEEE80211_C_AHDEMO | \ + IEEE80211_C_MONITOR | IEEE80211_C_WDS) + struct ifnet *ifp; + + ifp = if_alloc(IFT_ETHER); + if (ifp == NULL) { + /* XXX msg,stat? */ + return 0; + } + if_initname(ifp, name, unit); + ifp->if_softc = vap; /* back pointer */ + ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST; + ifp->if_start = ieee80211_start; + ifp->if_ioctl = ieee80211_ioctl; + ifp->if_watchdog = NULL; /* NB: no watchdog routine */ + ifp->if_init = ieee80211_init; + /* NB: input+output filled in by ether_ifattach */ + IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); + ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; + IFQ_SET_READY(&ifp->if_snd); + + vap->iv_ifp = ifp; + vap->iv_ic = ic; + vap->iv_flags = ic->ic_flags; /* propagate common flags */ + vap->iv_flags_ext = ic->ic_flags_ext; + vap->iv_flags_ven = ic->ic_flags_ven; + vap->iv_caps = ic->ic_caps &~ IEEE80211_C_OPMODE; + vap->iv_htcaps = ic->ic_htcaps; + vap->iv_opmode = opmode; + switch (opmode) { + case IEEE80211_M_STA: + /* auto-enable s/w beacon miss support */ + if (flags & IEEE80211_CLONE_NOBEACONS) + vap->iv_flags_ext |= IEEE80211_FEXT_SWBMISS; + break; + case IEEE80211_M_IBSS: + vap->iv_caps |= IEEE80211_C_IBSS; + break; + case IEEE80211_M_AHDEMO: + vap->iv_caps |= IEEE80211_C_AHDEMO; + break; + case IEEE80211_M_HOSTAP: + vap->iv_caps |= IEEE80211_C_HOSTAP; + break; + case IEEE80211_M_MONITOR: + vap->iv_caps |= IEEE80211_C_MONITOR; + break; + case IEEE80211_M_WDS: + vap->iv_caps |= IEEE80211_C_WDS; + /* + * WDS links must specify the bssid of the far end. + * For legacy operation this is a static relationship. + * For non-legacy operation the station must associate + * and be authorized to pass traffic. Plumbing the + * vap to the proper node happens when the vap + * transitions to RUN state. + */ + IEEE80211_ADDR_COPY(vap->iv_des_bssid, bssid); + vap->iv_flags |= IEEE80211_F_DESBSSID; + if (flags & IEEE80211_CLONE_WDSLEGACY) + vap->iv_flags_ext |= IEEE80211_FEXT_WDSLEGACY; + break; + } + /* + * Enable various functionality by default if we're + * capable; the driver can override us if it knows better. + */ + if (vap->iv_caps & IEEE80211_C_WME) + vap->iv_flags |= IEEE80211_F_WME; + if (vap->iv_caps & IEEE80211_C_BURST) + vap->iv_flags |= IEEE80211_F_BURST; + if (vap->iv_caps & IEEE80211_C_FF) + vap->iv_flags |= IEEE80211_F_FF; + if (vap->iv_caps & IEEE80211_C_TURBOP) + vap->iv_flags |= IEEE80211_F_TURBOP; + /* NB: bg scanning only makes sense for station mode right now */ + if (vap->iv_opmode == IEEE80211_M_STA && + (vap->iv_caps & IEEE80211_C_BGSCAN)) + vap->iv_flags |= IEEE80211_F_BGSCAN; + vap->iv_flags |= IEEE80211_F_DOTH; /* XXX out of caps, just ena */ + /* XXX out of caps, just ena */ + if (vap->iv_opmode == IEEE80211_M_HOSTAP) + vap->iv_flags_ext |= IEEE80211_FEXT_DFS; + + vap->iv_des_chan = IEEE80211_CHAN_ANYC; /* any channel is ok */ + vap->iv_bmissthreshold = IEEE80211_HWBMISS_DEFAULT; + vap->iv_dtim_period = IEEE80211_DTIM_DEFAULT; + /* + * Install a default reset method for the ioctl support; + * the driver can override this. + */ + vap->iv_reset = default_reset; + + IEEE80211_ADDR_COPY(vap->iv_myaddr, ic->ic_myaddr); + + ieee80211_sysctl_vattach(vap); + ieee80211_crypto_vattach(vap); + ieee80211_node_vattach(vap); + ieee80211_power_vattach(vap); + ieee80211_proto_vattach(vap); + ieee80211_ht_vattach(vap); + ieee80211_scan_vattach(vap); + ieee80211_regdomain_vattach(vap); + + return 1; +#undef IEEE80211_C_OPMODE +} + +/* + * Activate a vap. State should have been prepared with a + * call to ieee80211_vap_setup and by the driver. On return + * from this call the vap is ready for use. + */ +int +ieee80211_vap_attach(struct ieee80211vap *vap, + ifm_change_cb_t media_change, ifm_stat_cb_t media_stat) +{ + struct ifnet *ifp = vap->iv_ifp; + struct ieee80211com *ic = vap->iv_ic; + struct ifmediareq imr; + int maxrate; + + IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, + "%s: %s parent %s flags 0x%x flags_ext 0x%x\n", + __func__, ieee80211_opmode_name[vap->iv_opmode], + ic->ic_ifp->if_xname, vap->iv_flags, vap->iv_flags_ext); + + /* + * Do late attach work that cannot happen until after + * the driver has had a chance to override defaults. + */ + ieee80211_node_latevattach(vap); + ieee80211_power_latevattach(vap); + + maxrate = ieee80211_media_setup(ic, &vap->iv_media, vap->iv_caps, + vap->iv_opmode == IEEE80211_M_STA, media_change, media_stat); + ieee80211_media_status(ifp, &imr); + /* NB: strip explicit mode; we're actually in autoselect */ + ifmedia_set(&vap->iv_media, imr.ifm_active &~ IFM_MMASK); + if (maxrate) + ifp->if_baudrate = IF_Mbps(maxrate); + + ether_ifattach(ifp, vap->iv_myaddr); + /* hook output method setup by ether_ifattach */ + vap->iv_output = ifp->if_output; + ifp->if_output = ieee80211_output; + /* NB: if_mtu set by ether_ifattach to ETHERMTU */ + bpfattach2(ifp, DLT_IEEE802_11, ifp->if_hdrlen, &vap->iv_rawbpf); + + IEEE80211_LOCK(ic); + TAILQ_INSERT_TAIL(&ic->ic_vaps, vap, iv_next); + ieee80211_syncflag_locked(ic, IEEE80211_F_WME); + ieee80211_syncflag_locked(ic, IEEE80211_F_TURBOP); + ieee80211_syncflag_locked(ic, IEEE80211_F_PCF); + ieee80211_syncflag_locked(ic, IEEE80211_F_BURST); + ieee80211_syncflag_ext_locked(ic, IEEE80211_FEXT_HT); + ieee80211_syncflag_ext_locked(ic, IEEE80211_FEXT_USEHT40); + ieee80211_syncifflag_locked(ic, IFF_PROMISC); + ieee80211_syncifflag_locked(ic, IFF_ALLMULTI); + IEEE80211_UNLOCK(ic); + + return 1; +} + +/* + * Tear down vap state prior to reclaiming the ifnet. + */ +void +ieee80211_vap_detach(struct ieee80211vap *vap) +{ + struct ieee80211com *ic = vap->iv_ic; + struct ifnet *ifp = vap->iv_ifp; + + IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, "%s: %s parent %s\n", + __func__, ieee80211_opmode_name[vap->iv_opmode], + ic->ic_ifp->if_xname); + /* + * Mark interface down so we ignore calls by the bridge + * to turn off promiscuous mode as a result of calling + * ether_ifdetach. + */ + ifp->if_flags &= ~IFF_UP; + ieee80211_stop(vap); bpfdetach(ifp); ether_ifdetach(ifp); + + IEEE80211_LOCK(ic); + TAILQ_REMOVE(&ic->ic_vaps, vap, iv_next); + ieee80211_syncflag_locked(ic, IEEE80211_F_WME); + ieee80211_syncflag_locked(ic, IEEE80211_F_TURBOP); + ieee80211_syncflag_locked(ic, IEEE80211_F_PCF); + ieee80211_syncflag_locked(ic, IEEE80211_F_BURST); + ieee80211_syncflag_ext_locked(ic, IEEE80211_FEXT_HT); + ieee80211_syncflag_ext_locked(ic, IEEE80211_FEXT_USEHT40); + ieee80211_syncifflag_locked(ic, IFF_PROMISC); + ieee80211_syncifflag_locked(ic, IFF_ALLMULTI); + IEEE80211_UNLOCK(ic); + + ifmedia_removeall(&vap->iv_media); + + ieee80211_regdomain_vdetach(vap); + ieee80211_scan_vdetach(vap); + ieee80211_ht_vdetach(vap); + /* NB: must be before ieee80211_node_vdetach */ + ieee80211_proto_vdetach(vap); + ieee80211_crypto_vdetach(vap); + ieee80211_power_vdetach(vap); + ieee80211_node_vdetach(vap); + ieee80211_sysctl_vdetach(vap); } +/* + * Synchronize flag bit state in the parent ifnet structure + * according to the state of all vap ifnet's. This is used, + * for example, to handle IFF_PROMISC and IFF_ALLMULTI. + */ +void +ieee80211_syncifflag_locked(struct ieee80211com *ic, int flag) +{ + struct ieee80211vap *vap; + int bit; + + IEEE80211_LOCK_ASSERT(ic); + + bit = 0; + TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) + if (vap->iv_ifp->if_flags & flag) { + bit = 1; + break; + } + if (bit) + ic->ic_ifp->if_flags |= flag; + else + ic->ic_ifp->if_flags &= ~flag; +} + +/* + * Synchronize flag bit state in the com structure + * according to the state of all vap's. This is used, + * for example, to handle state changes via ioctls. + */ +static void +ieee80211_syncflag_locked(struct ieee80211com *ic, int flag) +{ + struct ieee80211vap *vap; + int bit; + + IEEE80211_LOCK_ASSERT(ic); + + bit = 0; + TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) + if (vap->iv_flags & flag) { + bit = 1; + break; + } + if (bit) + ic->ic_flags |= flag; + else + ic->ic_flags &= ~flag; +} + +void +ieee80211_syncflag(struct ieee80211vap *vap, int flag) +{ + struct ieee80211com *ic = vap->iv_ic; + + IEEE80211_LOCK(ic); + if (flag < 0) { + flag = -flag; + vap->iv_flags &= ~flag; + } else + vap->iv_flags |= flag; + ieee80211_syncflag_locked(ic, flag); + IEEE80211_UNLOCK(ic); +} + +/* + * Synchronize flag bit state in the com structure + * according to the state of all vap's. This is used, + * for example, to handle state changes via ioctls. + */ +static void +ieee80211_syncflag_ext_locked(struct ieee80211com *ic, int flag) +{ + struct ieee80211vap *vap; + int bit; + + IEEE80211_LOCK_ASSERT(ic); + + bit = 0; + TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) + if (vap->iv_flags_ext & flag) { + bit = 1; + break; + } + if (bit) + ic->ic_flags_ext |= flag; + else + ic->ic_flags_ext &= ~flag; +} + +void +ieee80211_syncflag_ext(struct ieee80211vap *vap, int flag) +{ + struct ieee80211com *ic = vap->iv_ic; + + IEEE80211_LOCK(ic); + if (flag < 0) { + flag = -flag; + vap->iv_flags_ext &= ~flag; + } else + vap->iv_flags_ext |= flag; + ieee80211_syncflag_ext_locked(ic, flag); + IEEE80211_UNLOCK(ic); +} + static __inline int mapgsm(u_int freq, u_int flags) { @@ -416,7 +725,7 @@ /* * Locate a channel given a frequency+flags. We cache - * the previous lookup to optimize swithing between two + * the previous lookup to optimize switching between two * channels--as happens with dynamic turbo. */ struct ieee80211_channel * @@ -467,80 +776,58 @@ } static void -addmedia(struct ieee80211com *ic, int mode, int mword) +addmedia(struct ifmedia *media, int caps, int addsta, int mode, int mword) { -#define TURBO(m) ((m) | IFM_IEEE80211_TURBO) #define ADD(_ic, _s, _o) \ - ifmedia_add(&(_ic)->ic_media, \ + ifmedia_add(media, \ IFM_MAKEWORD(IFM_IEEE80211, (_s), (_o), 0), 0, NULL) static const u_int mopts[IEEE80211_MODE_MAX] = { - IFM_AUTO, /* IEEE80211_MODE_AUTO */ - IFM_IEEE80211_11A, /* IEEE80211_MODE_11A */ - IFM_IEEE80211_11B, /* IEEE80211_MODE_11B */ - IFM_IEEE80211_11G, /* IEEE80211_MODE_11G */ - IFM_IEEE80211_FH, /* IEEE80211_MODE_FH */ - TURBO(IFM_IEEE80211_11A), /* IEEE80211_MODE_TURBO_A */ - TURBO(IFM_IEEE80211_11G), /* IEEE80211_MODE_TURBO_G */ - TURBO(IFM_IEEE80211_11A), /* IEEE80211_MODE_STURBO_A */ - IFM_IEEE80211_11NA, /* IEEE80211_MODE_11NA */ - IFM_IEEE80211_11NG, /* IEEE80211_MODE_11NG */ + IFM_AUTO, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 3 19:25:20 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E63816A46E; Mon, 3 Dec 2007 19:25:20 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6D04016A41A for ; Mon, 3 Dec 2007 19:25:19 +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 6FB1913C4E8 for ; Mon, 3 Dec 2007 19:25:19 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB3JPJ8A092351 for ; Mon, 3 Dec 2007 19:25:19 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB3JPJFq092348 for perforce@freebsd.org; Mon, 3 Dec 2007 19:25:19 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 3 Dec 2007 19:25:19 GMT Message-Id: <200712031925.lB3JPJFq092348@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 130109 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2007 19:25:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=130109 Change 130109 by hselasky@hselasky_laptop001 on 2007/12/03 19:25:15 The AT91 port did not allocate a config thread for the OHCI controller. Consequently nothing worked. Fix this. Affected files ... .. //depot/projects/usb/src/sys/arm/at91/ohci_atmelarm.c#13 edit Differences ... ==== //depot/projects/usb/src/sys/arm/at91/ohci_atmelarm.c#13 (text) ==== @@ -113,6 +113,13 @@ strlcpy(sc->sc_ohci.sc_vendor, "Atmel", sizeof(sc->sc_ohci.sc_vendor)); + err = usbd_config_td_setup(&(sc->sc_ohci.sc_config_td), sc, + &(sc->sc_ohci.sc_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_ohci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, NULL, (void *)(void *)ohci_interrupt, sc, &(sc->sc_ohci.sc_intr_hdl)); From owner-p4-projects@FreeBSD.ORG Mon Dec 3 19:26:21 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B3B216A46C; Mon, 3 Dec 2007 19:26:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D54C116A419 for ; Mon, 3 Dec 2007 19:26: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 D853413C46A for ; Mon, 3 Dec 2007 19:26:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB3JQKjY092396 for ; Mon, 3 Dec 2007 19:26:20 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB3JQKwB092393 for perforce@freebsd.org; Mon, 3 Dec 2007 19:26:20 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 3 Dec 2007 19:26:20 GMT Message-Id: <200712031926.lB3JQKwB092393@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 130110 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2007 19:26:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=130110 Change 130110 by hselasky@hselasky_laptop001 on 2007/12/03 19:25:51 Optimize OHCI interrupt handler. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ohci.c#46 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ohci.c#46 (text+ko) ==== @@ -1132,7 +1132,8 @@ ohci_interrupt_td(ohci_softc_t *sc, struct thread *ctd) { enum { - FINISH_LIST_MAX = 16}; + FINISH_LIST_MAX = 16, + }; struct usbd_xfer *xlist[FINISH_LIST_MAX + 1]; struct usbd_xfer **xptr = xlist; @@ -1172,8 +1173,6 @@ } #endif - status = 0; - done = le32toh(hcca->hcca_done_head); /* @@ -1189,12 +1188,13 @@ * and HcInterruptStatus should be checked to determine its cause. */ if (done != 0) { + status = 0; + if (done & ~OHCI_DONE_INTRS) { status |= OHCI_WDH; } if (done & OHCI_DONE_INTRS) { status |= OREAD4(sc, OHCI_INTERRUPT_STATUS); - done &= ~OHCI_DONE_INTRS; } hcca->hcca_done_head = 0; @@ -1203,17 +1203,22 @@ status = OREAD4(sc, OHCI_INTERRUPT_STATUS) & ~OHCI_WDH; } - if (status == 0) { /* nothing to be done (PCI shared - * interrupt) */ + status &= ~OHCI_MIE; + if (status == 0) { + /* + * nothing to be done (PCI shared + * interrupt) + */ goto done; } - status &= ~OHCI_MIE; OWRITE4(sc, OHCI_INTERRUPT_STATUS, status); /* Acknowledge */ status &= sc->sc_eintrs; if (status == 0) { goto done; } + + if (status & (OHCI_SO|OHCI_RD|OHCI_UE|OHCI_RHSC)) { #if 0 if (status & OHCI_SO) { /* XXX do what */ @@ -1245,6 +1250,7 @@ usb_callout_reset(&sc->sc_tmo_rhsc, hz, (void *)(void *)ohci_rhsc_enable, sc); } + } status &= ~(OHCI_RHSC | OHCI_WDH | OHCI_SO); if (status != 0) { /* Block unprocessed interrupts. XXX */ From owner-p4-projects@FreeBSD.ORG Mon Dec 3 19:27:22 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E8AA16A41B; Mon, 3 Dec 2007 19:27:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 37D0416A418 for ; Mon, 3 Dec 2007 19:27:22 +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 2FCDE13C44B for ; Mon, 3 Dec 2007 19:27:22 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB3JRLAT092446 for ; Mon, 3 Dec 2007 19:27:21 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB3JRLQf092443 for perforce@freebsd.org; Mon, 3 Dec 2007 19:27:21 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 3 Dec 2007 19:27:21 GMT Message-Id: <200712031927.lB3JRLQf092443@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 130111 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2007 19:27:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=130111 Change 130111 by hselasky@hselasky_laptop001 on 2007/12/03 19:27:06 Style code correctly. Affected files ... .. //depot/projects/usb/src/sys/arm/at91/ohci_atmelarm.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.c#47 edit Differences ... ==== //depot/projects/usb/src/sys/arm/at91/ohci_atmelarm.c#14 (text) ==== @@ -113,13 +113,12 @@ strlcpy(sc->sc_ohci.sc_vendor, "Atmel", sizeof(sc->sc_ohci.sc_vendor)); - err = usbd_config_td_setup(&(sc->sc_ohci.sc_config_td), sc, + err = usbd_config_td_setup(&(sc->sc_ohci.sc_config_td), sc, &(sc->sc_ohci.sc_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_ohci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, NULL, (void *)(void *)ohci_interrupt, sc, &(sc->sc_ohci.sc_intr_hdl)); ==== //depot/projects/usb/src/sys/dev/usb/ohci.c#47 (text+ko) ==== @@ -1132,7 +1132,7 @@ ohci_interrupt_td(ohci_softc_t *sc, struct thread *ctd) { enum { - FINISH_LIST_MAX = 16, + FINISH_LIST_MAX = 16, }; struct usbd_xfer *xlist[FINISH_LIST_MAX + 1]; @@ -1204,7 +1204,7 @@ } status &= ~OHCI_MIE; - if (status == 0) { + if (status == 0) { /* * nothing to be done (PCI shared * interrupt) @@ -1217,39 +1217,38 @@ if (status == 0) { goto done; } - - if (status & (OHCI_SO|OHCI_RD|OHCI_UE|OHCI_RHSC)) { + if (status & (OHCI_SO | OHCI_RD | OHCI_UE | OHCI_RHSC)) { #if 0 - if (status & OHCI_SO) { - /* XXX do what */ - } + if (status & OHCI_SO) { + /* XXX do what */ + } #endif - if (status & OHCI_RD) { - device_printf(sc->sc_bus.bdev, "resume detect\n"); - /* XXX process resume detect */ - } - if (status & OHCI_UE) { - device_printf(sc->sc_bus.bdev, "unrecoverable error, " - "controller halted\n"); - OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_RESET); - /* XXX what else */ - } - if (status & OHCI_RHSC) { - /* - * Disable RHSC interrupt for now, because it will be - * on until the port has been reset. - */ - sc->sc_eintrs &= ~OHCI_RHSC; - OWRITE4(sc, OHCI_INTERRUPT_DISABLE, OHCI_RHSC); + if (status & OHCI_RD) { + device_printf(sc->sc_bus.bdev, "resume detect\n"); + /* XXX process resume detect */ + } + if (status & OHCI_UE) { + device_printf(sc->sc_bus.bdev, "unrecoverable error, " + "controller halted\n"); + OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_RESET); + /* XXX what else */ + } + if (status & OHCI_RHSC) { + /* + * Disable RHSC interrupt for now, because it will be + * on until the port has been reset. + */ + sc->sc_eintrs &= ~OHCI_RHSC; + OWRITE4(sc, OHCI_INTERRUPT_DISABLE, OHCI_RHSC); - if (!usbd_std_root_transfer(&(sc->sc_root_intr), ctd, - &ohci_root_intr_done)) { - mtx_lock(&(sc->sc_bus.mtx)); + if (!usbd_std_root_transfer(&(sc->sc_root_intr), ctd, + &ohci_root_intr_done)) { + mtx_lock(&(sc->sc_bus.mtx)); + } + /* do not allow RHSC interrupts > 1 per second */ + usb_callout_reset(&sc->sc_tmo_rhsc, hz, + (void *)(void *)ohci_rhsc_enable, sc); } - /* do not allow RHSC interrupts > 1 per second */ - usb_callout_reset(&sc->sc_tmo_rhsc, hz, - (void *)(void *)ohci_rhsc_enable, sc); - } } status &= ~(OHCI_RHSC | OHCI_WDH | OHCI_SO); if (status != 0) { From owner-p4-projects@FreeBSD.ORG Mon Dec 3 20:36:48 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E4EA16A469; Mon, 3 Dec 2007 20:36: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 E35B216A420 for ; Mon, 3 Dec 2007 20:36:47 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E8AF813C4EA for ; Mon, 3 Dec 2007 20:36:47 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB3Kalse003904 for ; Mon, 3 Dec 2007 20:36:47 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB3KaZ42003900 for perforce@freebsd.org; Mon, 3 Dec 2007 20:36:35 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 3 Dec 2007 20:36:35 GMT Message-Id: <200712032036.lB3KaZ42003900@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130113 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2007 20:36:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=130113 Change 130113 by kmacy@kmacy_home:ethng on 2007/12/03 20:35:53 IFC #130107 Affected files ... .. //depot/projects/ethng/src/ObsoleteFiles.inc#9 integrate .. //depot/projects/ethng/src/UPDATING#8 integrate .. //depot/projects/ethng/src/cddl/Makefile.inc#2 integrate .. //depot/projects/ethng/src/cddl/lib/libnvpair/Makefile#2 integrate .. //depot/projects/ethng/src/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/ethng/src/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/ethng/src/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/ethng/src/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/ethng/src/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/ethng/src/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/ethng/src/contrib/bind9/CHANGES#2 integrate .. //depot/projects/ethng/src/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/ethng/src/contrib/bind9/FAQ#2 integrate .. //depot/projects/ethng/src/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/ethng/src/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/bind9/README#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/check/check-tool.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/check/named-checkzone.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/dig/host.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/dig/nslookup.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/named/client.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/named/control.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/named/server.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/rndc/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/configure.in#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/arm/man.dig.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/arm/man.host.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/arm/man.named.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/arm/man.rndc.html#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#2 delete .. //depot/projects/ethng/src/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/misc/migration#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/ethng/src/contrib/bind9/doc/rfc/rfc4398.txt#1 branch .. //depot/projects/ethng/src/contrib/bind9/doc/rfc/rfc4408.txt#1 branch .. //depot/projects/ethng/src/contrib/bind9/doc/rfc/rfc4470.txt#1 branch .. //depot/projects/ethng/src/contrib/bind9/doc/rfc/rfc4634.txt#1 branch .. //depot/projects/ethng/src/contrib/bind9/doc/rfc/rfc4641.txt#1 branch .. //depot/projects/ethng/src/contrib/bind9/lib/bind/api#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/bind/config.h.in#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/bind/configure#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/bind/configure.in#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/bind/irs/gai_strerror.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/bind/irs/irs_data.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/bind/make/rules.in#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/bind/resolv/res_data.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/bind9/check.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/api#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/dispatch.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/include/dns/db.h#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/include/dns/dispatch.h#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/journal.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/master.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/rdataslab.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/rootns.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/sdb.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/sdlz.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/view.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/isc/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/isc/alpha/Makefile.in#1 branch .. //depot/projects/ethng/src/contrib/bind9/lib/isc/alpha/include/Makefile.in#1 branch .. //depot/projects/ethng/src/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#1 branch .. //depot/projects/ethng/src/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/isc/arm/include/isc/atomic.h#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/isc/hmacsha.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/isc/ia64/Makefile.in#1 branch .. //depot/projects/ethng/src/contrib/bind9/lib/isc/ia64/include/Makefile.in#1 branch .. //depot/projects/ethng/src/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#1 branch .. //depot/projects/ethng/src/contrib/bind9/lib/isc/include/isc/platform.h.in#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/isc/include/isc/string.h#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/isc/mips/Makefile.in#1 branch .. //depot/projects/ethng/src/contrib/bind9/lib/isc/mips/include/Makefile.in#1 branch .. //depot/projects/ethng/src/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#1 branch .. //depot/projects/ethng/src/contrib/bind9/lib/isc/noatomic/Makefile.in#1 branch .. //depot/projects/ethng/src/contrib/bind9/lib/isc/noatomic/include/Makefile.in#1 branch .. //depot/projects/ethng/src/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#1 branch .. //depot/projects/ethng/src/contrib/bind9/lib/isc/powerpc/Makefile.in#1 branch .. //depot/projects/ethng/src/contrib/bind9/lib/isc/powerpc/include/Makefile.in#1 branch .. //depot/projects/ethng/src/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in#1 branch .. //depot/projects/ethng/src/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/isc/sparc64/Makefile.in#1 branch .. //depot/projects/ethng/src/contrib/bind9/lib/isc/sparc64/include/Makefile.in#1 branch .. //depot/projects/ethng/src/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in#1 branch .. //depot/projects/ethng/src/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/isc/unix/socket.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/isc/unix/syslog.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/isc/x86_32/Makefile.in#1 branch .. //depot/projects/ethng/src/contrib/bind9/lib/isc/x86_32/include/Makefile.in#1 branch .. //depot/projects/ethng/src/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in#1 branch .. //depot/projects/ethng/src/contrib/bind9/lib/isc/x86_64/Makefile.in#1 branch .. //depot/projects/ethng/src/contrib/bind9/lib/isc/x86_64/include/Makefile.in#1 branch .. //depot/projects/ethng/src/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in#1 branch .. //depot/projects/ethng/src/contrib/bind9/lib/isccc/symtab.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/isccfg/api#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/lwres/context.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/lwres/getipnode.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/lwres/lwres_gnba.c#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate .. //depot/projects/ethng/src/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/ethng/src/contrib/bind9/version#2 integrate .. //depot/projects/ethng/src/contrib/binutils/opcodes/ppc-dis.c#2 integrate .. //depot/projects/ethng/src/contrib/less/NEWS#4 integrate .. //depot/projects/ethng/src/contrib/less/README#4 integrate .. //depot/projects/ethng/src/contrib/less/less.man#4 integrate .. //depot/projects/ethng/src/contrib/less/less.nro#4 integrate .. //depot/projects/ethng/src/contrib/less/lessecho.man#4 integrate .. //depot/projects/ethng/src/contrib/less/lessecho.nro#4 integrate .. //depot/projects/ethng/src/contrib/less/lesskey.man#4 integrate .. //depot/projects/ethng/src/contrib/less/lesskey.nro#4 integrate .. //depot/projects/ethng/src/contrib/less/search.c#4 integrate .. //depot/projects/ethng/src/contrib/less/version.c#4 integrate .. //depot/projects/ethng/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/tcpdump.c#3 integrate .. //depot/projects/ethng/src/etc/defaults/periodic.conf#2 integrate .. //depot/projects/ethng/src/etc/etc.amd64/ttys#3 integrate .. //depot/projects/ethng/src/etc/etc.arm/ttys#4 integrate .. //depot/projects/ethng/src/etc/etc.i386/ttys#3 integrate .. //depot/projects/ethng/src/etc/etc.ia64/ttys#3 integrate .. //depot/projects/ethng/src/etc/etc.powerpc/ttys#3 integrate .. //depot/projects/ethng/src/etc/etc.sparc64/ttys#3 integrate .. //depot/projects/ethng/src/etc/freebsd-update.conf#3 integrate .. //depot/projects/ethng/src/etc/gss/mech#2 integrate .. //depot/projects/ethng/src/etc/periodic/security/100.chksetuid#2 integrate .. //depot/projects/ethng/src/gnu/lib/libobjc/Makefile#3 integrate .. //depot/projects/ethng/src/gnu/usr.bin/groff/tmac/mdoc.local#5 integrate .. //depot/projects/ethng/src/include/assert.h#2 integrate .. //depot/projects/ethng/src/include/dirent.h#2 integrate .. //depot/projects/ethng/src/include/elf.h#2 integrate .. //depot/projects/ethng/src/kerberos5/lib/Makefile.inc#2 integrate .. //depot/projects/ethng/src/lib/bind/bind/Makefile#2 integrate .. //depot/projects/ethng/src/lib/bind/bind/config.h#2 integrate .. //depot/projects/ethng/src/lib/bind/bind/port_before.h#2 integrate .. //depot/projects/ethng/src/lib/bind/config.h#2 integrate .. //depot/projects/ethng/src/lib/bind/config.mk#2 integrate .. //depot/projects/ethng/src/lib/bind/isc/isc/platform.h#2 integrate .. //depot/projects/ethng/src/lib/bind/lwres/Makefile#2 integrate .. //depot/projects/ethng/src/lib/csu/common/crtbrand.c#2 integrate .. //depot/projects/ethng/src/lib/libc/amd64/Makefile.inc#2 integrate .. //depot/projects/ethng/src/lib/libc/gdtoa/_ldtoa.c#2 integrate .. //depot/projects/ethng/src/lib/libc/gdtoa/machdep_ldisQ.c#2 integrate .. //depot/projects/ethng/src/lib/libc/gdtoa/machdep_ldisx.c#2 integrate .. //depot/projects/ethng/src/lib/libc/gen/Symbol.map#2 integrate .. //depot/projects/ethng/src/lib/libc/gen/closedir.c#2 integrate .. //depot/projects/ethng/src/lib/libc/gen/readdir.c#2 integrate .. //depot/projects/ethng/src/lib/libc/gen/seekdir.c#2 integrate .. //depot/projects/ethng/src/lib/libc/gen/telldir.c#2 integrate .. //depot/projects/ethng/src/lib/libc/i386/Makefile.inc#2 integrate .. //depot/projects/ethng/src/lib/libc/ia64/Makefile.inc#2 integrate .. //depot/projects/ethng/src/lib/libc/nameser/ns_parse.c#2 integrate .. //depot/projects/ethng/src/lib/libc/resolv/res_data.c#2 integrate .. //depot/projects/ethng/src/lib/libc/resolv/res_init.c#2 integrate .. //depot/projects/ethng/src/lib/libc/rpc/authdes_prot.c#2 integrate .. //depot/projects/ethng/src/lib/libc/rpc/authunix_prot.c#2 integrate .. //depot/projects/ethng/src/lib/libc/rpc/key_prot_xdr.c#2 integrate .. //depot/projects/ethng/src/lib/libc/rpc/rpc_callmsg.c#2 integrate .. //depot/projects/ethng/src/lib/libc/rpc/rpc_prot.c#2 integrate .. //depot/projects/ethng/src/lib/libc/rpc/rpcb_prot.c#2 integrate .. //depot/projects/ethng/src/lib/libc/rpc/rpcb_st_xdr.c#2 integrate .. //depot/projects/ethng/src/lib/libc/sparc64/Makefile.inc#2 integrate .. //depot/projects/ethng/src/lib/libc/sparc64/fpu/fpu_explode.c#2 integrate .. //depot/projects/ethng/src/lib/libc/stdlib/malloc.3#2 integrate .. //depot/projects/ethng/src/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/ethng/src/lib/libdisk/libdisk.3#3 integrate .. //depot/projects/ethng/src/lib/libdisk/libdisk.h#2 integrate .. //depot/projects/ethng/src/lib/libelf/elf.3#3 integrate .. //depot/projects/ethng/src/lib/libelf/gelf_xlatetof.3#2 integrate .. //depot/projects/ethng/src/lib/libelf/libelf_data.c#2 integrate .. //depot/projects/ethng/src/lib/libelf/libelf_xlate.c#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/Makefile#2 integrate .. //depot/projects/ethng/src/lib/libgssapi/gss_acquire_cred.c#2 integrate .. //depot/projects/ethng/src/lib/libkse/Makefile#3 integrate .. //depot/projects/ethng/src/lib/libkse/arch/amd64/include/atomic_ops.h#3 integrate .. //depot/projects/ethng/src/lib/libkse/arch/amd64/include/pthread_md.h#3 integrate .. //depot/projects/ethng/src/lib/libkse/arch/arm/include/atomic_ops.h#3 integrate .. //depot/projects/ethng/src/lib/libkse/arch/i386/include/atomic_ops.h#3 integrate .. //depot/projects/ethng/src/lib/libkse/arch/i386/include/pthread_md.h#3 integrate .. //depot/projects/ethng/src/lib/libkse/arch/ia64/include/atomic_ops.h#3 integrate .. //depot/projects/ethng/src/lib/libkse/arch/ia64/include/pthread_md.h#3 integrate .. //depot/projects/ethng/src/lib/libkse/arch/powerpc/include/atomic_ops.h#3 integrate .. //depot/projects/ethng/src/lib/libkse/arch/powerpc/include/pthread_md.h#3 integrate .. //depot/projects/ethng/src/lib/libkse/arch/sparc64/include/atomic_ops.h#3 integrate .. //depot/projects/ethng/src/lib/libkse/arch/sparc64/include/pthread_md.h#3 integrate .. //depot/projects/ethng/src/lib/libkse/kse.map#2 integrate .. //depot/projects/ethng/src/lib/libkse/sys/lock.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/sys/lock.h#3 integrate .. //depot/projects/ethng/src/lib/libkse/sys/thr_error.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_accept.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_aio_suspend.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_atfork.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_destroy.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_get_np.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getdetachstate.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getguardsize.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getinheritsched.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getschedparam.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getschedpolicy.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getscope.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getstack.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getstackaddr.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_getstacksize.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_init.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setdetachstate.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setguardsize.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setinheritsched.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setschedparam.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setschedpolicy.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setscope.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setstack.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setstackaddr.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_attr_setstacksize.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_barrier.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_barrierattr.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_cancel.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_clean.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_close.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_concurrency.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_cond.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_condattr_destroy.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_condattr_init.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_condattr_pshared.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_connect.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_creat.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_create.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_detach.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_equal.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_execve.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_exit.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_fcntl.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_find_thread.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_fork.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_fsync.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_getschedparam.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_info.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_init.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_join.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_kern.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_kill.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_main_np.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_mattr_init.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_mattr_kind_np.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_mattr_pshared.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_msync.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_multi_np.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_mutex.c#4 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_mutex_prioceiling.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_mutex_protocol.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_mutexattr_destroy.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_nanosleep.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_once.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_open.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_pause.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_poll.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_priority_queue.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_private.h#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_pselect.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_pspinlock.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_raise.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_read.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_readv.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_resume_np.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_rtld.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_rwlock.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_rwlockattr.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_select.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_self.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_seterrno.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_setprio.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_setschedparam.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_sig.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_sigaction.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_sigaltstack.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_sigmask.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_sigpending.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_sigprocmask.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_sigsuspend.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_sigwait.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_single_np.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_sleep.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_spec.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_spinlock.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_stack.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_suspend_np.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_switch_np.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_symbols.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_system.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_tcdrain.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_vfork.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_wait.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_wait4.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_waitpid.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_write.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_writev.c#3 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_yield.c#3 integrate .. //depot/projects/ethng/src/lib/libpmc/Makefile#2 integrate .. //depot/projects/ethng/src/lib/libpmc/pmc.3#2 integrate .. //depot/projects/ethng/src/lib/libpmc/pmc_allocate.3#1 branch .. //depot/projects/ethng/src/lib/libpmc/pmc_attach.3#1 branch .. //depot/projects/ethng/src/lib/libpmc/pmc_capabilities.3#1 branch .. //depot/projects/ethng/src/lib/libpmc/pmc_configure_logfile.3#1 branch .. //depot/projects/ethng/src/lib/libpmc/pmc_disable.3#1 branch .. //depot/projects/ethng/src/lib/libpmc/pmc_event_names_of_class.3#1 branch .. //depot/projects/ethng/src/lib/libpmc/pmc_get_driver_stats.3#1 branch .. //depot/projects/ethng/src/lib/libpmc/pmc_get_msr.3#1 branch .. //depot/projects/ethng/src/lib/libpmc/pmc_init.3#1 branch .. //depot/projects/ethng/src/lib/libpmc/pmc_name_of_capability.3#1 branch .. //depot/projects/ethng/src/lib/libpmc/pmc_read.3#1 branch .. //depot/projects/ethng/src/lib/libpmc/pmc_set.3#1 branch .. //depot/projects/ethng/src/lib/libpmc/pmc_start.3#1 branch .. //depot/projects/ethng/src/lib/libpmc/pmclog.c#2 integrate .. //depot/projects/ethng/src/lib/libpmc/pmclog.h#2 integrate .. //depot/projects/ethng/src/lib/libthr/Makefile#4 integrate .. //depot/projects/ethng/src/lib/libthr/pthread.map#2 integrate .. //depot/projects/ethng/src/lib/libthr/thread/thr_mutex.c#3 integrate .. //depot/projects/ethng/src/lib/libthr/thread/thr_private.h#4 integrate .. //depot/projects/ethng/src/lib/libthr/thread/thr_rtld.c#2 integrate .. //depot/projects/ethng/src/lib/libthr/thread/thr_sem.c#2 integrate .. //depot/projects/ethng/src/lib/libthr/thread/thr_sig.c#2 integrate .. //depot/projects/ethng/src/lib/libthr/thread/thr_suspend_np.c#2 integrate .. //depot/projects/ethng/src/lib/libthr/thread/thr_umtx.c#2 integrate .. //depot/projects/ethng/src/lib/libthr/thread/thr_umtx.h#2 integrate .. //depot/projects/ethng/src/lib/libutil/pty.c#2 integrate .. //depot/projects/ethng/src/libexec/rtld-elf/powerpc/reloc.c#2 integrate .. //depot/projects/ethng/src/libexec/rtld-elf/sparc64/rtld_machdep.h#2 integrate .. //depot/projects/ethng/src/libexec/tftpd/Makefile#2 integrate .. //depot/projects/ethng/src/libexec/tftpd/tftpd.8#2 integrate .. //depot/projects/ethng/src/libexec/tftpd/tftpd.c#2 integrate .. //depot/projects/ethng/src/release/Makefile#6 integrate .. //depot/projects/ethng/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#12 integrate .. //depot/projects/ethng/src/release/doc/share/sgml/release.ent#4 integrate .. //depot/projects/ethng/src/release/picobsd/tinyware/msg/msg.c#2 integrate .. //depot/projects/ethng/src/sbin/atacontrol/atacontrol.8#2 integrate .. //depot/projects/ethng/src/sbin/clri/clri.c#2 integrate .. //depot/projects/ethng/src/sbin/devd/Makefile#2 integrate .. //depot/projects/ethng/src/sbin/geom/class/nop/gnop.8#2 integrate .. //depot/projects/ethng/src/sbin/init/init.c#2 integrate .. //depot/projects/ethng/src/sbin/ipfw/ipfw.8#5 integrate .. //depot/projects/ethng/src/sbin/mdconfig/mdconfig.8#4 integrate .. //depot/projects/ethng/src/sbin/mount/mount.8#3 integrate .. //depot/projects/ethng/src/sbin/newfs/newfs.8#2 integrate .. //depot/projects/ethng/src/sbin/newfs/newfs.c#2 integrate .. //depot/projects/ethng/src/sbin/newfs/newfs.h#2 integrate .. //depot/projects/ethng/src/sbin/ping6/ping6.8#2 integrate .. //depot/projects/ethng/src/sbin/ping6/ping6.c#2 integrate .. //depot/projects/ethng/src/sbin/sysctl/sysctl.8#5 integrate .. //depot/projects/ethng/src/share/colldef/sv_SE.ISO8859-1.src#2 integrate .. //depot/projects/ethng/src/share/colldef/sv_SE.ISO8859-15.src#2 integrate .. //depot/projects/ethng/src/share/man/man4/aac.4#3 integrate .. //depot/projects/ethng/src/share/man/man4/agp.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/enc.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/hwpmc.4#3 integrate .. //depot/projects/ethng/src/share/man/man4/ichsmb.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/msk.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/nfe.4#3 integrate .. //depot/projects/ethng/src/share/man/man4/rl.4#2 integrate .. //depot/projects/ethng/src/share/man/man9/Makefile#9 integrate .. //depot/projects/ethng/src/share/man/man9/rwlock.9#2 integrate .. //depot/projects/ethng/src/share/man/man9/stack.9#1 branch .. //depot/projects/ethng/src/share/man/man9/sx.9#2 integrate .. //depot/projects/ethng/src/share/man/man9/timeout.9#2 integrate .. //depot/projects/ethng/src/share/misc/iso3166#2 integrate .. //depot/projects/ethng/src/share/mk/bsd.sys.mk#2 integrate .. //depot/projects/ethng/src/share/mk/sys.mk#5 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/prof_machdep.c#2 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/ethng/src/sys/amd64/conf/GENERIC#8 integrate .. //depot/projects/ethng/src/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/ethng/src/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/ethng/src/sys/amd64/include/stack.h#1 branch .. //depot/projects/ethng/src/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/ethng/src/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/ethng/src/sys/arm/arm/cpufunc.c#5 integrate .. //depot/projects/ethng/src/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/ethng/src/sys/arm/arm/nexus_io.c#2 delete .. //depot/projects/ethng/src/sys/arm/arm/nexus_io_asm.S#2 delete .. //depot/projects/ethng/src/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/ethng/src/sys/arm/arm/stack_machdep.c#1 branch .. //depot/projects/ethng/src/sys/arm/conf/AVILA#3 integrate .. //depot/projects/ethng/src/sys/arm/conf/BWCT#2 integrate .. //depot/projects/ethng/src/sys/arm/conf/CRB#3 integrate .. //depot/projects/ethng/src/sys/arm/conf/EP80219#2 integrate .. //depot/projects/ethng/src/sys/arm/conf/HL200#2 integrate .. //depot/projects/ethng/src/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/ethng/src/sys/arm/conf/KB920X#2 integrate .. //depot/projects/ethng/src/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/ethng/src/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/ethng/src/sys/arm/include/asmacros.h#3 integrate .. //depot/projects/ethng/src/sys/arm/include/atomic.h#2 integrate .. //depot/projects/ethng/src/sys/arm/include/stack.h#1 branch .. //depot/projects/ethng/src/sys/arm/sa11x0/files.sa11x0#2 integrate .. //depot/projects/ethng/src/sys/boot/i386/gptboot/gptldr.S#2 integrate .. //depot/projects/ethng/src/sys/boot/i386/pmbr/pmbr.s#2 integrate .. //depot/projects/ethng/src/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/ethng/src/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/ethng/src/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/ethng/src/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/ethng/src/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/ethng/src/sys/compat/opensolaris/rpc/xdr.h#2 integrate .. //depot/projects/ethng/src/sys/compat/opensolaris/sys/atomic.h#2 integrate .. //depot/projects/ethng/src/sys/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/ethng/src/sys/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/ethng/src/sys/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/ethng/src/sys/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/ethng/src/sys/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/ethng/src/sys/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/ethng/src/sys/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/ethng/src/sys/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/ethng/src/sys/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/ethng/src/sys/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/ethng/src/sys/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/ethng/src/sys/compat/opensolaris/sys/proc.h#4 integrate .. //depot/projects/ethng/src/sys/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/ethng/src/sys/compat/opensolaris/sys/time.h#2 integrate .. //depot/projects/ethng/src/sys/compat/opensolaris/sys/types.h#2 integrate .. //depot/projects/ethng/src/sys/conf/NOTES#5 integrate .. //depot/projects/ethng/src/sys/conf/files#11 integrate .. //depot/projects/ethng/src/sys/conf/files.amd64#10 integrate .. //depot/projects/ethng/src/sys/conf/files.arm#3 integrate .. //depot/projects/ethng/src/sys/conf/files.i386#8 integrate .. //depot/projects/ethng/src/sys/conf/files.ia64#3 integrate .. //depot/projects/ethng/src/sys/conf/files.pc98#4 integrate .. //depot/projects/ethng/src/sys/conf/files.powerpc#3 integrate .. //depot/projects/ethng/src/sys/conf/files.sparc64#2 integrate .. //depot/projects/ethng/src/sys/conf/files.sun4v#3 integrate .. //depot/projects/ethng/src/sys/conf/kmod.mk#3 integrate .. //depot/projects/ethng/src/sys/conf/options#6 integrate .. //depot/projects/ethng/src/sys/conf/options.amd64#2 integrate .. //depot/projects/ethng/src/sys/conf/options.i386#2 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/fil.c#4 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_auth.c#4 integrate .. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/common/avl/avl.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/sys/procset.h#2 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#2 integrate .. //depot/projects/ethng/src/sys/contrib/pf/net/pf.c#6 integrate .. //depot/projects/ethng/src/sys/contrib/pf/net/pf_if.c#3 integrate .. //depot/projects/ethng/src/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/ethng/src/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/ethng/src/sys/dev/acpica/acpi_battery.c#3 integrate .. //depot/projects/ethng/src/sys/dev/agp/agp_i810.c#2 integrate .. //depot/projects/ethng/src/sys/dev/amr/amr.c#2 integrate .. //depot/projects/ethng/src/sys/dev/amr/amr_cam.c#2 integrate .. //depot/projects/ethng/src/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/ethng/src/sys/dev/an/if_an.c#5 integrate .. //depot/projects/ethng/src/sys/dev/asmc/asmc.c#2 integrate .. //depot/projects/ethng/src/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/ethng/src/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/ethng/src/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/ethng/src/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/ethng/src/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/ethng/src/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/ethng/src/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/ethng/src/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/ethng/src/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_80003es2lan.c#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_80003es2lan.h#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_82540.c#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_82541.c#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_82541.h#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_82542.c#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_82543.c#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_82543.h#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_82571.c#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_82571.h#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_82575.c#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_82575.h#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_api.c#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_api.h#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_defines.h#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_hw.h#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_ich8lan.c#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_ich8lan.h#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_mac.c#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_mac.h#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_manage.c#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_manage.h#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_nvm.c#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_nvm.h#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_osdep.h#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_phy.c#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_phy.h#2 integrate .. //depot/projects/ethng/src/sys/dev/em/e1000_regs.h#2 integrate .. //depot/projects/ethng/src/sys/dev/em/if_em.c#3 integrate .. //depot/projects/ethng/src/sys/dev/em/if_em.h#3 integrate .. //depot/projects/ethng/src/sys/dev/hwpmc/hwpmc_x86.c#3 integrate .. //depot/projects/ethng/src/sys/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/ethng/src/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/ethng/src/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/ethng/src/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/ethng/src/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/ethng/src/sys/dev/nfe/if_nfe.c#5 integrate .. //depot/projects/ethng/src/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/ethng/src/sys/dev/nve/if_nve.c#2 integrate .. //depot/projects/ethng/src/sys/dev/random/yarrow.c#2 integrate .. //depot/projects/ethng/src/sys/dev/re/if_re.c#4 integrate .. //depot/projects/ethng/src/sys/dev/si/si_pci.c#2 integrate .. //depot/projects/ethng/src/sys/dev/sio/sio_isa.c#2 integrate .. //depot/projects/ethng/src/sys/dev/sio/sio_puc.c#2 integrate .. //depot/projects/ethng/src/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/ethng/src/sys/dev/snp/snp.c#2 integrate .. //depot/projects/ethng/src/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/ethng/src/sys/dev/sound/pcm/channel.c#2 integrate .. //depot/projects/ethng/src/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/ethng/src/sys/dev/ti/if_ti.c#2 integrate .. //depot/projects/ethng/src/sys/dev/usb/if_rum.c#5 integrate .. //depot/projects/ethng/src/sys/dev/usb/if_zyd.c#8 integrate .. //depot/projects/ethng/src/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/ethng/src/sys/dev/vge/if_vge.c#2 integrate .. //depot/projects/ethng/src/sys/dev/vx/if_vx_pci.c#2 integrate .. //depot/projects/ethng/src/sys/dev/wpi/if_wpi.c#3 integrate .. //depot/projects/ethng/src/sys/dev/wpi/if_wpireg.h#2 integrate .. //depot/projects/ethng/src/sys/geom/eli/g_eli_crypto.c#3 integrate .. //depot/projects/ethng/src/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/ethng/src/sys/i386/conf/NOTES#4 integrate .. //depot/projects/ethng/src/sys/i386/conf/XBOX#2 integrate .. //depot/projects/ethng/src/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/ethng/src/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/ethng/src/sys/i386/i386/genassym.c#3 integrate .. //depot/projects/ethng/src/sys/i386/i386/intr_machdep.c#4 integrate .. //depot/projects/ethng/src/sys/i386/i386/pmap.c#6 integrate .. //depot/projects/ethng/src/sys/i386/i386/stack_machdep.c#1 branch .. //depot/projects/ethng/src/sys/i386/include/stack.h#1 branch .. //depot/projects/ethng/src/sys/i386/isa/prof_machdep.c#2 integrate .. //depot/projects/ethng/src/sys/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/ethng/src/sys/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/ethng/src/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/ethng/src/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/ethng/src/sys/ia64/ia64/db_machdep.c#3 integrate .. //depot/projects/ethng/src/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/ethng/src/sys/ia64/ia64/stack_machdep.c#1 branch .. //depot/projects/ethng/src/sys/ia64/include/atomic.h#2 integrate .. //depot/projects/ethng/src/sys/kern/kern_clock.c#4 integrate .. //depot/projects/ethng/src/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/ethng/src/sys/kern/kern_linker.c#4 integrate .. //depot/projects/ethng/src/sys/kern/kern_lock.c#4 integrate .. //depot/projects/ethng/src/sys/kern/kern_mutex.c#4 integrate .. //depot/projects/ethng/src/sys/kern/kern_proc.c#5 integrate .. //depot/projects/ethng/src/sys/kern/kern_rwlock.c#5 integrate .. //depot/projects/ethng/src/sys/kern/kern_sysctl.c#4 integrate .. //depot/projects/ethng/src/sys/kern/kern_timeout.c#5 edit .. //depot/projects/ethng/src/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/ethng/src/sys/kern/subr_bus.c#2 integrate .. //depot/projects/ethng/src/sys/kern/subr_stack.c#2 integrate .. //depot/projects/ethng/src/sys/kern/subr_witness.c#5 integrate .. //depot/projects/ethng/src/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/ethng/src/sys/kern/tty_pty.c#3 integrate .. //depot/projects/ethng/src/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/ethng/src/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/ethng/src/sys/modules/amr/Makefile#2 integrate .. //depot/projects/ethng/src/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/ethng/src/sys/net/ieee8023ad_lacp.c#2 integrate .. //depot/projects/ethng/src/sys/net/if_enc.c#2 integrate .. //depot/projects/ethng/src/sys/net/if_lagg.c#5 integrate .. //depot/projects/ethng/src/sys/net/pfil.c#2 integrate .. //depot/projects/ethng/src/sys/net/pfil.h#2 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211.h#5 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211_ht.c#5 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211_node.c#5 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211_output.c#5 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211_proto.c#5 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211_scan_sta.c#3 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211_var.h#5 integrate .. //depot/projects/ethng/src/sys/netatalk/aarp.c#4 integrate .. //depot/projects/ethng/src/sys/netatalk/ddp_output.c#3 integrate .. //depot/projects/ethng/src/sys/netgraph/ng_cisco.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/ip_input.c#4 integrate .. //depot/projects/ethng/src/sys/netinet/libalias/alias_util.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_output.c#7 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_subr.c#7 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_syncache.c#5 integrate .. //depot/projects/ethng/src/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/ethng/src/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/ethng/src/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/ethng/src/sys/netipsec/ipsec_input.c#3 integrate .. //depot/projects/ethng/src/sys/netipsec/ipsec_output.c#2 integrate .. //depot/projects/ethng/src/sys/netipsec/xform.h#2 integrate .. //depot/projects/ethng/src/sys/netipsec/xform_ipip.c#2 integrate .. //depot/projects/ethng/src/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/ethng/src/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/ethng/src/sys/pc98/include/stack.h#1 branch .. //depot/projects/ethng/src/sys/pci/if_rl.c#2 integrate .. //depot/projects/ethng/src/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/ethng/src/sys/pci/if_sf.c#2 integrate .. //depot/projects/ethng/src/sys/pci/if_ste.c#2 integrate .. //depot/projects/ethng/src/sys/pci/if_vr.c#3 integrate .. //depot/projects/ethng/src/sys/pci/if_xl.c#3 integrate .. //depot/projects/ethng/src/sys/pci/xrpu.c#2 delete .. //depot/projects/ethng/src/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/ethng/src/sys/powerpc/include/atomic.h#2 integrate .. //depot/projects/ethng/src/sys/powerpc/include/stack.h#1 branch .. //depot/projects/ethng/src/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/ethng/src/sys/powerpc/powerpc/intr_machdep.c#4 integrate .. //depot/projects/ethng/src/sys/powerpc/powerpc/stack_machdep.c#1 branch .. //depot/projects/ethng/src/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/ethng/src/sys/sparc64/include/stack.h#1 branch .. //depot/projects/ethng/src/sys/sparc64/pci/ofw_pcibus.c#4 integrate .. //depot/projects/ethng/src/sys/sparc64/pci/psycho.c#4 integrate .. //depot/projects/ethng/src/sys/sparc64/pci/psychovar.h#2 integrate .. //depot/projects/ethng/src/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/ethng/src/sys/sparc64/sparc64/intr_machdep.c#3 integrate .. //depot/projects/ethng/src/sys/sparc64/sparc64/stack_machdep.c#1 branch .. //depot/projects/ethng/src/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/ethng/src/sys/sun4v/include/pcpu.h#3 integrate .. //depot/projects/ethng/src/sys/sun4v/include/stack.h#1 branch .. //depot/projects/ethng/src/sys/sun4v/include/stdarg.h#2 integrate .. //depot/projects/ethng/src/sys/sun4v/sun4v/db_trace.c#2 integrate .. //depot/projects/ethng/src/sys/sun4v/sun4v/stack_machdep.c#1 branch .. //depot/projects/ethng/src/sys/sys/_elf_solaris.h#2 delete .. //depot/projects/ethng/src/sys/sys/callout.h#4 integrate .. //depot/projects/ethng/src/sys/sys/elf.h#2 integrate .. //depot/projects/ethng/src/sys/sys/elf_common.h#2 integrate .. //depot/projects/ethng/src/sys/sys/kernel.h#3 integrate .. //depot/projects/ethng/src/sys/sys/linker.h#4 integrate .. //depot/projects/ethng/src/sys/sys/lockmgr.h#2 integrate .. //depot/projects/ethng/src/sys/sys/mutex.h#2 integrate .. //depot/projects/ethng/src/sys/sys/param.h#9 integrate .. //depot/projects/ethng/src/sys/sys/pcpu.h#3 integrate .. //depot/projects/ethng/src/sys/sys/pmc.h#2 integrate .. //depot/projects/ethng/src/sys/sys/pmclog.h#2 integrate .. //depot/projects/ethng/src/sys/sys/resource.h#2 integrate .. //depot/projects/ethng/src/sys/sys/signal.h#2 integrate .. //depot/projects/ethng/src/sys/sys/stack.h#2 integrate .. //depot/projects/ethng/src/sys/sys/stat.h#2 integrate .. //depot/projects/ethng/src/sys/sys/sysctl.h#4 integrate .. //depot/projects/ethng/src/sys/sys/time.h#2 integrate .. //depot/projects/ethng/src/sys/sys/types.h#2 integrate .. //depot/projects/ethng/src/sys/sys/umtx.h#2 integrate .. //depot/projects/ethng/src/sys/sys/user.h#3 integrate .. //depot/projects/ethng/src/sys/sys/xrpuio.h#2 delete .. //depot/projects/ethng/src/sys/ufs/ffs/ffs_alloc.c#4 integrate .. //depot/projects/ethng/src/sys/vm/redzone.c#2 integrate .. //depot/projects/ethng/src/sys/vm/vm_contig.c#4 integrate .. //depot/projects/ethng/src/sys/vm/vm_page.c#7 integrate .. //depot/projects/ethng/src/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/ethng/src/sys/vm/vm_pageout.h#2 integrate .. //depot/projects/ethng/src/sys/vm/vnode_pager.c#3 integrate .. //depot/projects/ethng/src/tools/regression/lib/libc/stdio/test-printfloat.c#2 integrate .. //depot/projects/ethng/src/tools/regression/lib/libc/stdio/test-scanfloat.c#2 integrate .. //depot/projects/ethng/src/tools/regression/netinet/tcpconnect/README.tcp-md5#1 branch .. //depot/projects/ethng/src/tools/regression/netinet/tcpconnect/tcpconnect.c#2 integrate .. //depot/projects/ethng/src/tools/sched/schedgraph.py#3 integrate .. //depot/projects/ethng/src/usr.bin/Makefile#4 integrate .. //depot/projects/ethng/src/usr.bin/fstat/zfs/Makefile#2 integrate .. //depot/projects/ethng/src/usr.bin/login/login.1#2 integrate .. //depot/projects/ethng/src/usr.bin/make/main.c#2 integrate .. //depot/projects/ethng/src/usr.bin/netstat/Makefile#2 integrate .. //depot/projects/ethng/src/usr.bin/procstat/Makefile#1 branch .. //depot/projects/ethng/src/usr.bin/procstat/procstat.1#1 branch .. //depot/projects/ethng/src/usr.bin/procstat/procstat.c#1 branch .. //depot/projects/ethng/src/usr.bin/procstat/procstat.h#1 branch .. //depot/projects/ethng/src/usr.bin/procstat/procstat_args.c#1 branch .. //depot/projects/ethng/src/usr.bin/procstat/procstat_basic.c#1 branch .. //depot/projects/ethng/src/usr.bin/procstat/procstat_bin.c#1 branch .. //depot/projects/ethng/src/usr.bin/procstat/procstat_cred.c#1 branch .. //depot/projects/ethng/src/usr.bin/procstat/procstat_files.c#1 branch .. //depot/projects/ethng/src/usr.bin/procstat/procstat_kstack.c#1 branch .. //depot/projects/ethng/src/usr.bin/procstat/procstat_threads.c#1 branch .. //depot/projects/ethng/src/usr.bin/procstat/procstat_vm.c#1 branch .. //depot/projects/ethng/src/usr.bin/rpcgen/rpc_cout.c#2 integrate .. //depot/projects/ethng/src/usr.bin/tail/read.c#4 integrate .. //depot/projects/ethng/src/usr.sbin/acpi/acpidb/Makefile#2 integrate .. //depot/projects/ethng/src/usr.sbin/kldxref/Makefile#2 integrate .. //depot/projects/ethng/src/usr.sbin/newsyslog/newsyslog.conf.5#2 integrate .. //depot/projects/ethng/src/usr.sbin/nscd/Makefile#4 integrate .. //depot/projects/ethng/src/usr.sbin/pmcstat/pmcstat_log.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rpc.yppasswdd/Makefile#2 integrate .. //depot/projects/ethng/src/usr.sbin/zic/zic.c#2 integrate Differences ... ==== //depot/projects/ethng/src/ObsoleteFiles.inc#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.118 2007/11/16 04:03:08 marcel Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.123 2007/11/29 21:49:08 brooks 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,14 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071129: Disabled static versions of libkse by default +.if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no" +OLD_FILES+=usr/lib/libkse.a +OLD_FILES+=usr/lib/libkse_p.a +OLD_FILES+=usr/lib/libkse_pic.a +.endif +# 20071129: Removed a Solaris compatibility header +OLD_FILES+=usr/include/sys/_elf_solaris.h # 20071108: Removed very crunch OLDCARD support file OLD_FILES+=etc/defaults/pccard.conf # 20071104: Removed bsdlabel, fdisk and gpt from rescue on ia64. @@ -204,7 +212,7 @@ # 20070605: sched_core removal OLD_FILES+=usr/share/man/man4/sched_core.4.gz # 20070603: BIND 9.4.1 import -OLD_LIBS+=lib/liblwres.so.10 +OLD_LIBS+=usr/lib/liblwres.so.10 # 20070521: shared library version bump OLD_LIBS+=lib/libatm.so.4 OLD_LIBS+=lib/libbegemot.so.2 @@ -3963,6 +3971,21 @@ # - usr/share/tmac/mm/locale # - usr/share/tmac/mm/se_locale # - var/yp/Makefile + +# 20071120: shared library version bump +OLD_LIBS+=usr/lib/libasn1.so.8 +OLD_LIBS+=usr/lib/libgssapi.so.8 +OLD_LIBS+=usr/lib/libgssapi_krb5.so.8 +OLD_LIBS+=usr/lib/libhdb.so.8 +OLD_LIBS+=usr/lib/libkadm5clnt.so.8 +OLD_LIBS+=usr/lib/libkadm5srv.so.8 +OLD_LIBS+=usr/lib/libkafs5.so.8 +OLD_LIBS+=usr/lib/libkrb5.so.8 +OLD_LIBS+=usr/lib/libobjc.so.2 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libgssapi.so.8 +OLD_LIBS+=usr/lib32/libobjc.so.2 +.endif # 20070519: GCC 4.2 OLD_LIBS+=usr/lib/libg2c.a OLD_LIBS+=usr/lib/libg2c.so ==== //depot/projects/ethng/src/UPDATING#8 (text+ko) ==== @@ -21,6 +21,10 @@ developers choose to disable these features on build machines to maximize performance. +20071128: + The ADAPTIVE_GIANT kernel option has been retired because its + functionality is the default now. + 20071118: The AT keyboard emulation of sunkbd(4) has been turned on by default. In order to make the special symbols of the Sun @@ -945,4 +949,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.512 2007/11/18 18:11:16 marius Exp $ +$FreeBSD: src/UPDATING,v 1.513 2007/11/28 13:04:11 matteo Exp $ ==== //depot/projects/ethng/src/cddl/Makefile.inc#2 (text+ko) ==== @@ -1,3 +1,6 @@ -# $FreeBSD: src/cddl/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $ +# $FreeBSD: src/cddl/Makefile.inc,v 1.3 2007/11/28 22:58:09 jb Exp $ + +OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../contrib/opensolaris +OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/contrib/opensolaris -CFLAGS+= -D_SOLARIS_C_SOURCE +IGNORE_PRAGMA= YES ==== //depot/projects/ethng/src/cddl/lib/libnvpair/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ +# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.3 2007/11/28 22:58:09 jb Exp $ .PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair .PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair @@ -10,8 +10,8 @@ nvpair_alloc_fixed.c \ nvpair.c +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../include # XXX CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common .include ==== //depot/projects/ethng/src/contrib/bind9/CHANGES#2 (text+ko) ==== @@ -1,5 +1,117 @@ - --- 9.4.1-P1 released --- + --- 9.4.2 released --- + --- 9.4.2rc2 released --- + +2259. [bug] Reverse incorrect LIBINTERFACE bump of libisc + in 9.4.2rc1. Applications built against 9.4.2rc1 + will need to be rebuilt. + +2258. [bug] Fallback from IXFR/TSIG to SOA/AXFR/TSIG broken. + [RT #17241] + +2257. [bug] win32: Use the full path to vcredist_x86.exe when + calling it. [RT #17222] + +2256. [bug] win32: Correctly register the installation location of + bindevt.dll. [RT #17159] + +2255. [bug] L.ROOT-SERVERS.NET is now 199.7.83.42. + +2254. [bug] timer.c:dispatch() failed to lock timer->lock + when reading timer->idle allowing it to see + intermediate values as timer->idle was reset by + isc_timer_touch(). [RT #17243] + + --- 9.4.2rc1 released --- + +2251. [doc] Update memstatistics-file documentation to reflect + reality. Note there is behaviour change for BIND 9.5. + [RT #17113] + +2249. [bug] Only set Authentic Data bit if client requested + DNSSEC, per RFC 3655 [RT #17175] + +2248. [cleanup] Fix several errors reported by Coverity. [RT #17160] + +2245. [bug] Validating lack of DS records at trust anchors wasn't + working. [RT #17151] + +2238. [bug] It was possible to trigger a REQUIRE when a + validation was cancelled. [RT #17106] + +2237. [bug] libbind: res_init() was not thread aware. [RT #17123] + +2236. [bug] dnssec-signzone failed to preserve the case of + of wildcard owner names. [RT #17085] + +2235. [bug] was not being installed. [RT #17135] + +2234. [port] Correct some compiler warnings on SCO OSr5 [RT #17134] + +2232. [bug] dns_adb_findaddrinfo() could fail and return + ISC_R_SUCCESS. [RT #17137] + +2231. [bug] Building dlzbdb (contrib/dlz/bin/dlzbdb) was broken. + [RT #17088] + +2230. [bug] We could INSIST reading a corrupted journal. + [RT #17132] + +2228. [contrib] contrib: Change 2188 was incomplete. + +2227. [cleanup] Tidied up the FAQ. [RT #17121] + +2225. [bug] More support for systems with no IPv4 addresses. + [RT #17111] + +2224. [bug] Defer journal compaction if a xfrin is in progress. + [RT #17119] + +2223. [bug] Make a new journal when compacting. [RT #17119] + +2221. [bug] Set the event result code to reflect the actual + record returned to caller when a cache update is + rejected due to a more credible answer existing. + [RT #17017] + +2220. [bug] win32: Address a race condition in final shutdown of + the Windows socket code. [RT #17028] + +2219. [bug] Apply zone consistancy checks to additions, not + removals, when updating. [RT #17049] >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 3 21:18:45 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4918F16A421; Mon, 3 Dec 2007 21:18:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 92E9316A41A for ; Mon, 3 Dec 2007 21:18:44 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9A8F713C4CC for ; Mon, 3 Dec 2007 21:18:44 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB3LIiOT020636 for ; Mon, 3 Dec 2007 21:18:44 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB3LIVj0020632 for perforce@freebsd.org; Mon, 3 Dec 2007 21:18:31 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 3 Dec 2007 21:18:31 GMT Message-Id: <200712032118.lB3LIVj0020632@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130114 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2007 21:18:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=130114 Change 130114 by kmacy@kmacy:storage:toestack on 2007/12/03 21:18:07 IFethng 130113 Affected files ... .. //depot/projects/toestack/ObsoleteFiles.inc#7 integrate .. //depot/projects/toestack/UPDATING#8 integrate .. //depot/projects/toestack/cddl/Makefile.inc#2 integrate .. //depot/projects/toestack/cddl/lib/libnvpair/Makefile#2 integrate .. //depot/projects/toestack/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/toestack/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/toestack/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/toestack/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/toestack/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/toestack/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/toestack/contrib/bind9/CHANGES#2 integrate .. //depot/projects/toestack/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/toestack/contrib/bind9/FAQ#2 integrate .. //depot/projects/toestack/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/toestack/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/toestack/contrib/bind9/README#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/check/check-tool.c#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/check/named-checkzone.c#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/dig/host.c#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/dig/nslookup.c#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/named/client.c#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/named/control.c#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/named/server.c#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/rndc/Makefile.in#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/toestack/contrib/bind9/configure.in#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/arm/man.dig.html#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/arm/man.host.html#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/arm/man.named.html#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/arm/man.rndc.html#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#2 delete .. //depot/projects/toestack/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/misc/migration#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/toestack/contrib/bind9/doc/rfc/rfc4398.txt#1 branch .. //depot/projects/toestack/contrib/bind9/doc/rfc/rfc4408.txt#1 branch .. //depot/projects/toestack/contrib/bind9/doc/rfc/rfc4470.txt#1 branch .. //depot/projects/toestack/contrib/bind9/doc/rfc/rfc4634.txt#1 branch .. //depot/projects/toestack/contrib/bind9/doc/rfc/rfc4641.txt#1 branch .. //depot/projects/toestack/contrib/bind9/lib/bind/api#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/bind/config.h.in#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/bind/configure#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/bind/configure.in#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/bind/irs/gai_strerror.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/bind/irs/irs_data.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/bind/make/rules.in#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/bind/resolv/res_data.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/bind9/check.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/api#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/dispatch.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/include/dns/db.h#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/include/dns/dispatch.h#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/journal.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/master.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/rdataslab.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/rootns.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/sdb.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/sdlz.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/view.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/isc/Makefile.in#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/isc/alpha/Makefile.in#1 branch .. //depot/projects/toestack/contrib/bind9/lib/isc/alpha/include/Makefile.in#1 branch .. //depot/projects/toestack/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#1 branch .. //depot/projects/toestack/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/isc/arm/include/isc/atomic.h#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/isc/hmacsha.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/isc/ia64/Makefile.in#1 branch .. //depot/projects/toestack/contrib/bind9/lib/isc/ia64/include/Makefile.in#1 branch .. //depot/projects/toestack/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#1 branch .. //depot/projects/toestack/contrib/bind9/lib/isc/include/isc/platform.h.in#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/isc/include/isc/string.h#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/isc/mips/Makefile.in#1 branch .. //depot/projects/toestack/contrib/bind9/lib/isc/mips/include/Makefile.in#1 branch .. //depot/projects/toestack/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#1 branch .. //depot/projects/toestack/contrib/bind9/lib/isc/noatomic/Makefile.in#1 branch .. //depot/projects/toestack/contrib/bind9/lib/isc/noatomic/include/Makefile.in#1 branch .. //depot/projects/toestack/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#1 branch .. //depot/projects/toestack/contrib/bind9/lib/isc/powerpc/Makefile.in#1 branch .. //depot/projects/toestack/contrib/bind9/lib/isc/powerpc/include/Makefile.in#1 branch .. //depot/projects/toestack/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in#1 branch .. //depot/projects/toestack/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/isc/sparc64/Makefile.in#1 branch .. //depot/projects/toestack/contrib/bind9/lib/isc/sparc64/include/Makefile.in#1 branch .. //depot/projects/toestack/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in#1 branch .. //depot/projects/toestack/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/isc/unix/socket.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/isc/unix/syslog.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/isc/x86_32/Makefile.in#1 branch .. //depot/projects/toestack/contrib/bind9/lib/isc/x86_32/include/Makefile.in#1 branch .. //depot/projects/toestack/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in#1 branch .. //depot/projects/toestack/contrib/bind9/lib/isc/x86_64/Makefile.in#1 branch .. //depot/projects/toestack/contrib/bind9/lib/isc/x86_64/include/Makefile.in#1 branch .. //depot/projects/toestack/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in#1 branch .. //depot/projects/toestack/contrib/bind9/lib/isccc/symtab.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/isccfg/api#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/lwres/context.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/lwres/getipnode.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/lwres/lwres_gnba.c#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate .. //depot/projects/toestack/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/toestack/contrib/bind9/version#2 integrate .. //depot/projects/toestack/contrib/binutils/opcodes/ppc-dis.c#2 integrate .. //depot/projects/toestack/contrib/less/NEWS#4 integrate .. //depot/projects/toestack/contrib/less/README#4 integrate .. //depot/projects/toestack/contrib/less/less.man#4 integrate .. //depot/projects/toestack/contrib/less/less.nro#4 integrate .. //depot/projects/toestack/contrib/less/lessecho.man#4 integrate .. //depot/projects/toestack/contrib/less/lessecho.nro#4 integrate .. //depot/projects/toestack/contrib/less/lesskey.man#4 integrate .. //depot/projects/toestack/contrib/less/lesskey.nro#4 integrate .. //depot/projects/toestack/contrib/less/search.c#4 integrate .. //depot/projects/toestack/contrib/less/version.c#4 integrate .. //depot/projects/toestack/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/toestack/contrib/tcpdump/tcpdump.c#3 integrate .. //depot/projects/toestack/etc/defaults/periodic.conf#2 integrate .. //depot/projects/toestack/etc/etc.amd64/ttys#3 integrate .. //depot/projects/toestack/etc/etc.arm/ttys#3 integrate .. //depot/projects/toestack/etc/etc.i386/ttys#3 integrate .. //depot/projects/toestack/etc/etc.ia64/ttys#3 integrate .. //depot/projects/toestack/etc/etc.powerpc/ttys#3 integrate .. //depot/projects/toestack/etc/etc.sparc64/ttys#3 integrate .. //depot/projects/toestack/etc/freebsd-update.conf#3 integrate .. //depot/projects/toestack/etc/gss/mech#2 integrate .. //depot/projects/toestack/etc/periodic/security/100.chksetuid#2 integrate .. //depot/projects/toestack/gnu/lib/libobjc/Makefile#3 integrate .. //depot/projects/toestack/gnu/usr.bin/groff/tmac/mdoc.local#5 integrate .. //depot/projects/toestack/include/assert.h#2 integrate .. //depot/projects/toestack/include/dirent.h#2 integrate .. //depot/projects/toestack/include/elf.h#2 integrate .. //depot/projects/toestack/kerberos5/lib/Makefile.inc#2 integrate .. //depot/projects/toestack/lib/bind/bind/Makefile#2 integrate .. //depot/projects/toestack/lib/bind/bind/config.h#2 integrate .. //depot/projects/toestack/lib/bind/bind/port_before.h#2 integrate .. //depot/projects/toestack/lib/bind/config.h#2 integrate .. //depot/projects/toestack/lib/bind/config.mk#2 integrate .. //depot/projects/toestack/lib/bind/isc/isc/platform.h#2 integrate .. //depot/projects/toestack/lib/bind/lwres/Makefile#2 integrate .. //depot/projects/toestack/lib/csu/common/crtbrand.c#2 integrate .. //depot/projects/toestack/lib/libc/amd64/Makefile.inc#2 integrate .. //depot/projects/toestack/lib/libc/gdtoa/_ldtoa.c#2 integrate .. //depot/projects/toestack/lib/libc/gdtoa/machdep_ldisQ.c#2 integrate .. //depot/projects/toestack/lib/libc/gdtoa/machdep_ldisx.c#2 integrate .. //depot/projects/toestack/lib/libc/gen/Symbol.map#2 integrate .. //depot/projects/toestack/lib/libc/gen/closedir.c#2 integrate .. //depot/projects/toestack/lib/libc/gen/readdir.c#2 integrate .. //depot/projects/toestack/lib/libc/gen/seekdir.c#2 integrate .. //depot/projects/toestack/lib/libc/gen/telldir.c#2 integrate .. //depot/projects/toestack/lib/libc/i386/Makefile.inc#2 integrate .. //depot/projects/toestack/lib/libc/ia64/Makefile.inc#2 integrate .. //depot/projects/toestack/lib/libc/nameser/ns_parse.c#2 integrate .. //depot/projects/toestack/lib/libc/resolv/res_data.c#2 integrate .. //depot/projects/toestack/lib/libc/resolv/res_init.c#2 integrate .. //depot/projects/toestack/lib/libc/rpc/authdes_prot.c#2 integrate .. //depot/projects/toestack/lib/libc/rpc/authunix_prot.c#2 integrate .. //depot/projects/toestack/lib/libc/rpc/key_prot_xdr.c#2 integrate .. //depot/projects/toestack/lib/libc/rpc/rpc_callmsg.c#2 integrate .. //depot/projects/toestack/lib/libc/rpc/rpc_prot.c#2 integrate .. //depot/projects/toestack/lib/libc/rpc/rpcb_prot.c#2 integrate .. //depot/projects/toestack/lib/libc/rpc/rpcb_st_xdr.c#2 integrate .. //depot/projects/toestack/lib/libc/sparc64/Makefile.inc#2 integrate .. //depot/projects/toestack/lib/libc/sparc64/fpu/fpu_explode.c#2 integrate .. //depot/projects/toestack/lib/libc/stdlib/malloc.3#2 integrate .. //depot/projects/toestack/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/toestack/lib/libdisk/libdisk.3#3 integrate .. //depot/projects/toestack/lib/libdisk/libdisk.h#2 integrate .. //depot/projects/toestack/lib/libelf/elf.3#3 integrate .. //depot/projects/toestack/lib/libelf/gelf_xlatetof.3#2 integrate .. //depot/projects/toestack/lib/libelf/libelf_data.c#2 integrate .. //depot/projects/toestack/lib/libelf/libelf_xlate.c#2 integrate .. //depot/projects/toestack/lib/libgssapi/Makefile#2 integrate .. //depot/projects/toestack/lib/libgssapi/gss_acquire_cred.c#2 integrate .. //depot/projects/toestack/lib/libkse/Makefile#2 integrate .. //depot/projects/toestack/lib/libkse/arch/amd64/include/atomic_ops.h#2 integrate .. //depot/projects/toestack/lib/libkse/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/toestack/lib/libkse/arch/arm/include/atomic_ops.h#2 integrate .. //depot/projects/toestack/lib/libkse/arch/i386/include/atomic_ops.h#2 integrate .. //depot/projects/toestack/lib/libkse/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/toestack/lib/libkse/arch/ia64/include/atomic_ops.h#2 integrate .. //depot/projects/toestack/lib/libkse/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/toestack/lib/libkse/arch/powerpc/include/atomic_ops.h#2 integrate .. //depot/projects/toestack/lib/libkse/arch/powerpc/include/pthread_md.h#2 integrate .. //depot/projects/toestack/lib/libkse/arch/sparc64/include/atomic_ops.h#2 integrate .. //depot/projects/toestack/lib/libkse/arch/sparc64/include/pthread_md.h#2 integrate .. //depot/projects/toestack/lib/libkse/kse.map#2 integrate .. //depot/projects/toestack/lib/libkse/sys/lock.c#2 integrate .. //depot/projects/toestack/lib/libkse/sys/lock.h#2 integrate .. //depot/projects/toestack/lib/libkse/sys/thr_error.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_accept.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_aio_suspend.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_atfork.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_attr_destroy.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_attr_get_np.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_attr_getdetachstate.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_attr_getguardsize.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_attr_getinheritsched.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_attr_getschedparam.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_attr_getschedpolicy.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_attr_getscope.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_attr_getstack.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_attr_getstackaddr.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_attr_getstacksize.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_attr_init.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_attr_setdetachstate.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_attr_setguardsize.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_attr_setinheritsched.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_attr_setschedparam.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_attr_setschedpolicy.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_attr_setscope.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_attr_setstack.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_attr_setstackaddr.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_attr_setstacksize.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_barrier.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_barrierattr.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_cancel.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_clean.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_close.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_concurrency.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_cond.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_condattr_destroy.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_condattr_init.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_condattr_pshared.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_connect.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_creat.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_create.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_detach.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_equal.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_execve.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_exit.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_fcntl.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_find_thread.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_fork.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_fsync.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_getschedparam.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_info.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_init.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_join.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_kern.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_kill.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_main_np.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_mattr_init.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_mattr_kind_np.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_mattr_pshared.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_msync.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_multi_np.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_mutex.c#3 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_mutex_prioceiling.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_mutex_protocol.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_mutexattr_destroy.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_nanosleep.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_once.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_open.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_pause.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_poll.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_priority_queue.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_private.h#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_pselect.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_pspinlock.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_raise.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_read.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_readv.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_resume_np.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_rtld.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_rwlock.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_rwlockattr.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_select.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_self.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_seterrno.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_setprio.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_setschedparam.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_sig.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_sigaction.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_sigaltstack.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_sigmask.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_sigpending.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_sigprocmask.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_sigsuspend.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_sigwait.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_single_np.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_sleep.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_spec.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_spinlock.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_stack.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_suspend_np.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_switch_np.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_symbols.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_system.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_tcdrain.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_vfork.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_wait.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_wait4.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_waitpid.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_write.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_writev.c#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_yield.c#2 integrate .. //depot/projects/toestack/lib/libpmc/Makefile#2 integrate .. //depot/projects/toestack/lib/libpmc/pmc.3#2 integrate .. //depot/projects/toestack/lib/libpmc/pmc_allocate.3#1 branch .. //depot/projects/toestack/lib/libpmc/pmc_attach.3#1 branch .. //depot/projects/toestack/lib/libpmc/pmc_capabilities.3#1 branch .. //depot/projects/toestack/lib/libpmc/pmc_configure_logfile.3#1 branch .. //depot/projects/toestack/lib/libpmc/pmc_disable.3#1 branch .. //depot/projects/toestack/lib/libpmc/pmc_event_names_of_class.3#1 branch .. //depot/projects/toestack/lib/libpmc/pmc_get_driver_stats.3#1 branch .. //depot/projects/toestack/lib/libpmc/pmc_get_msr.3#1 branch .. //depot/projects/toestack/lib/libpmc/pmc_init.3#1 branch .. //depot/projects/toestack/lib/libpmc/pmc_name_of_capability.3#1 branch .. //depot/projects/toestack/lib/libpmc/pmc_read.3#1 branch .. //depot/projects/toestack/lib/libpmc/pmc_set.3#1 branch .. //depot/projects/toestack/lib/libpmc/pmc_start.3#1 branch .. //depot/projects/toestack/lib/libpmc/pmclog.c#2 integrate .. //depot/projects/toestack/lib/libpmc/pmclog.h#2 integrate .. //depot/projects/toestack/lib/libthr/Makefile#4 integrate .. //depot/projects/toestack/lib/libthr/pthread.map#2 integrate .. //depot/projects/toestack/lib/libthr/thread/thr_mutex.c#3 integrate .. //depot/projects/toestack/lib/libthr/thread/thr_private.h#3 integrate .. //depot/projects/toestack/lib/libthr/thread/thr_rtld.c#2 integrate .. //depot/projects/toestack/lib/libthr/thread/thr_sem.c#2 integrate .. //depot/projects/toestack/lib/libthr/thread/thr_sig.c#2 integrate .. //depot/projects/toestack/lib/libthr/thread/thr_suspend_np.c#2 integrate .. //depot/projects/toestack/lib/libthr/thread/thr_umtx.c#2 integrate .. //depot/projects/toestack/lib/libthr/thread/thr_umtx.h#2 integrate .. //depot/projects/toestack/lib/libutil/pty.c#2 integrate .. //depot/projects/toestack/libexec/rtld-elf/powerpc/reloc.c#2 integrate .. //depot/projects/toestack/libexec/rtld-elf/sparc64/rtld_machdep.h#2 integrate .. //depot/projects/toestack/libexec/tftpd/Makefile#2 integrate .. //depot/projects/toestack/libexec/tftpd/tftpd.8#2 integrate .. //depot/projects/toestack/libexec/tftpd/tftpd.c#2 integrate .. //depot/projects/toestack/release/Makefile#5 integrate .. //depot/projects/toestack/release/doc/en_US.ISO8859-1/relnotes/article.sgml#10 integrate .. //depot/projects/toestack/release/doc/share/sgml/release.ent#3 integrate .. //depot/projects/toestack/release/picobsd/tinyware/msg/msg.c#2 integrate .. //depot/projects/toestack/sbin/atacontrol/atacontrol.8#2 integrate .. //depot/projects/toestack/sbin/clri/clri.c#2 integrate .. //depot/projects/toestack/sbin/devd/Makefile#2 integrate .. //depot/projects/toestack/sbin/geom/class/nop/gnop.8#2 integrate .. //depot/projects/toestack/sbin/init/init.c#2 integrate .. //depot/projects/toestack/sbin/ipfw/ipfw.8#5 integrate .. //depot/projects/toestack/sbin/mdconfig/mdconfig.8#4 integrate .. //depot/projects/toestack/sbin/mount/mount.8#3 integrate .. //depot/projects/toestack/sbin/newfs/newfs.8#2 integrate .. //depot/projects/toestack/sbin/newfs/newfs.c#2 integrate .. //depot/projects/toestack/sbin/newfs/newfs.h#2 integrate .. //depot/projects/toestack/sbin/ping6/ping6.8#2 integrate .. //depot/projects/toestack/sbin/ping6/ping6.c#2 integrate .. //depot/projects/toestack/sbin/sysctl/sysctl.8#4 integrate .. //depot/projects/toestack/share/colldef/sv_SE.ISO8859-1.src#2 integrate .. //depot/projects/toestack/share/colldef/sv_SE.ISO8859-15.src#2 integrate .. //depot/projects/toestack/share/man/man4/aac.4#2 integrate .. //depot/projects/toestack/share/man/man4/agp.4#2 integrate .. //depot/projects/toestack/share/man/man4/enc.4#2 integrate .. //depot/projects/toestack/share/man/man4/hwpmc.4#3 integrate .. //depot/projects/toestack/share/man/man4/ichsmb.4#2 integrate .. //depot/projects/toestack/share/man/man4/msk.4#2 integrate .. //depot/projects/toestack/share/man/man4/nfe.4#2 integrate .. //depot/projects/toestack/share/man/man4/rl.4#2 integrate .. //depot/projects/toestack/share/man/man9/Makefile#9 integrate .. //depot/projects/toestack/share/man/man9/rwlock.9#2 integrate .. //depot/projects/toestack/share/man/man9/stack.9#1 branch .. //depot/projects/toestack/share/man/man9/sx.9#2 integrate .. //depot/projects/toestack/share/man/man9/timeout.9#2 integrate .. //depot/projects/toestack/share/misc/iso3166#2 integrate .. //depot/projects/toestack/share/mk/bsd.sys.mk#2 integrate .. //depot/projects/toestack/share/mk/sys.mk#4 integrate .. //depot/projects/toestack/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/toestack/sys/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/toestack/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/toestack/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/toestack/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/toestack/sys/amd64/amd64/prof_machdep.c#2 integrate .. //depot/projects/toestack/sys/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/toestack/sys/amd64/amd64/vm_machdep.c#4 edit .. //depot/projects/toestack/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/toestack/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/toestack/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/toestack/sys/amd64/include/stack.h#1 branch .. //depot/projects/toestack/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/toestack/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/toestack/sys/arm/arm/cpufunc.c#4 integrate .. //depot/projects/toestack/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/toestack/sys/arm/arm/nexus_io.c#2 delete .. //depot/projects/toestack/sys/arm/arm/nexus_io_asm.S#2 delete .. //depot/projects/toestack/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/toestack/sys/arm/arm/stack_machdep.c#1 branch .. //depot/projects/toestack/sys/arm/conf/AVILA#3 integrate .. //depot/projects/toestack/sys/arm/conf/BWCT#2 integrate .. //depot/projects/toestack/sys/arm/conf/CRB#3 integrate .. //depot/projects/toestack/sys/arm/conf/EP80219#2 integrate .. //depot/projects/toestack/sys/arm/conf/HL200#2 integrate .. //depot/projects/toestack/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/toestack/sys/arm/conf/KB920X#2 integrate .. //depot/projects/toestack/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/toestack/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/toestack/sys/arm/include/asmacros.h#3 integrate .. //depot/projects/toestack/sys/arm/include/atomic.h#2 integrate .. //depot/projects/toestack/sys/arm/include/stack.h#1 branch .. //depot/projects/toestack/sys/arm/sa11x0/files.sa11x0#2 integrate .. //depot/projects/toestack/sys/boot/i386/gptboot/gptldr.S#2 integrate .. //depot/projects/toestack/sys/boot/i386/pmbr/pmbr.s#2 integrate .. //depot/projects/toestack/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/toestack/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/toestack/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/toestack/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/toestack/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/toestack/sys/compat/opensolaris/rpc/xdr.h#2 integrate .. //depot/projects/toestack/sys/compat/opensolaris/sys/atomic.h#2 integrate .. //depot/projects/toestack/sys/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/toestack/sys/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/toestack/sys/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/toestack/sys/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/toestack/sys/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/toestack/sys/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/toestack/sys/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/toestack/sys/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/toestack/sys/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/toestack/sys/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/toestack/sys/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/toestack/sys/compat/opensolaris/sys/proc.h#3 integrate .. //depot/projects/toestack/sys/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/toestack/sys/compat/opensolaris/sys/time.h#2 integrate .. //depot/projects/toestack/sys/compat/opensolaris/sys/types.h#2 integrate .. //depot/projects/toestack/sys/conf/NOTES#4 integrate .. //depot/projects/toestack/sys/conf/files.amd64#8 integrate .. //depot/projects/toestack/sys/conf/files.arm#3 integrate .. //depot/projects/toestack/sys/conf/files.i386#7 integrate .. //depot/projects/toestack/sys/conf/files.ia64#3 integrate .. //depot/projects/toestack/sys/conf/files.pc98#4 integrate .. //depot/projects/toestack/sys/conf/files.powerpc#3 integrate .. //depot/projects/toestack/sys/conf/files.sparc64#2 integrate .. //depot/projects/toestack/sys/conf/files.sun4v#3 integrate .. //depot/projects/toestack/sys/conf/kmod.mk#3 integrate .. //depot/projects/toestack/sys/conf/options#4 integrate .. //depot/projects/toestack/sys/conf/options.amd64#2 integrate .. //depot/projects/toestack/sys/conf/options.i386#2 integrate .. //depot/projects/toestack/sys/contrib/ipfilter/netinet/fil.c#4 integrate .. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_auth.c#4 integrate .. //depot/projects/toestack/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate .. //depot/projects/toestack/sys/contrib/opensolaris/common/avl/avl.c#2 integrate .. //depot/projects/toestack/sys/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate .. //depot/projects/toestack/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate .. //depot/projects/toestack/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate .. //depot/projects/toestack/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/projects/toestack/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate .. //depot/projects/toestack/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/toestack/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate .. //depot/projects/toestack/sys/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate .. //depot/projects/toestack/sys/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate .. //depot/projects/toestack/sys/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate .. //depot/projects/toestack/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate .. //depot/projects/toestack/sys/contrib/opensolaris/uts/common/sys/procset.h#2 integrate .. //depot/projects/toestack/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate .. //depot/projects/toestack/sys/contrib/opensolaris/uts/common/sys/vmem.h#2 integrate .. //depot/projects/toestack/sys/contrib/pf/net/pf.c#5 integrate .. //depot/projects/toestack/sys/contrib/pf/net/pf_if.c#3 integrate .. //depot/projects/toestack/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/toestack/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/toestack/sys/dev/acpica/acpi_battery.c#3 integrate .. //depot/projects/toestack/sys/dev/agp/agp_i810.c#2 integrate .. //depot/projects/toestack/sys/dev/amr/amr.c#2 integrate .. //depot/projects/toestack/sys/dev/amr/amr_cam.c#2 integrate .. //depot/projects/toestack/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/toestack/sys/dev/an/if_an.c#4 integrate .. //depot/projects/toestack/sys/dev/asmc/asmc.c#2 integrate .. //depot/projects/toestack/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/toestack/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/toestack/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/toestack/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/toestack/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/toestack/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/toestack/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/toestack/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/toestack/sys/dev/cxgb/cxgb_main.c#15 integrate .. //depot/projects/toestack/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_80003es2lan.c#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_80003es2lan.h#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_82540.c#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_82541.c#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_82541.h#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_82542.c#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_82543.c#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_82543.h#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_82571.c#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_82571.h#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_82575.c#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_82575.h#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_api.c#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_api.h#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_defines.h#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_hw.h#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_ich8lan.c#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_ich8lan.h#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_mac.c#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_mac.h#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_manage.c#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_manage.h#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_nvm.c#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_nvm.h#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_osdep.h#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_phy.c#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_phy.h#2 integrate .. //depot/projects/toestack/sys/dev/em/e1000_regs.h#2 integrate .. //depot/projects/toestack/sys/dev/em/if_em.c#3 integrate .. //depot/projects/toestack/sys/dev/em/if_em.h#3 integrate .. //depot/projects/toestack/sys/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/projects/toestack/sys/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/toestack/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/toestack/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/toestack/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/toestack/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/toestack/sys/dev/nfe/if_nfe.c#5 integrate .. //depot/projects/toestack/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/toestack/sys/dev/nve/if_nve.c#2 integrate .. //depot/projects/toestack/sys/dev/random/yarrow.c#2 integrate .. //depot/projects/toestack/sys/dev/re/if_re.c#3 integrate .. //depot/projects/toestack/sys/dev/si/si_pci.c#2 integrate .. //depot/projects/toestack/sys/dev/sio/sio_isa.c#2 integrate .. //depot/projects/toestack/sys/dev/sio/sio_puc.c#2 integrate .. //depot/projects/toestack/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/toestack/sys/dev/snp/snp.c#2 integrate .. //depot/projects/toestack/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/toestack/sys/dev/sound/pcm/channel.c#2 integrate .. //depot/projects/toestack/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/toestack/sys/dev/ti/if_ti.c#2 integrate .. //depot/projects/toestack/sys/dev/usb/if_rum.c#5 integrate .. //depot/projects/toestack/sys/dev/usb/if_zyd.c#8 integrate .. //depot/projects/toestack/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/toestack/sys/dev/vge/if_vge.c#2 integrate .. //depot/projects/toestack/sys/dev/vx/if_vx_pci.c#2 integrate .. //depot/projects/toestack/sys/dev/wpi/if_wpi.c#3 integrate .. //depot/projects/toestack/sys/dev/wpi/if_wpireg.h#2 integrate .. //depot/projects/toestack/sys/geom/eli/g_eli_crypto.c#2 integrate .. //depot/projects/toestack/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/toestack/sys/i386/conf/NOTES#3 integrate .. //depot/projects/toestack/sys/i386/conf/XBOX#2 integrate .. //depot/projects/toestack/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/toestack/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/toestack/sys/i386/i386/genassym.c#3 integrate .. //depot/projects/toestack/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/toestack/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/toestack/sys/i386/i386/stack_machdep.c#1 branch .. //depot/projects/toestack/sys/i386/include/stack.h#1 branch .. //depot/projects/toestack/sys/i386/isa/prof_machdep.c#2 integrate .. //depot/projects/toestack/sys/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/toestack/sys/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/toestack/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/toestack/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/toestack/sys/ia64/ia64/db_machdep.c#3 integrate .. //depot/projects/toestack/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/toestack/sys/ia64/ia64/stack_machdep.c#1 branch .. //depot/projects/toestack/sys/ia64/include/atomic.h#2 integrate .. //depot/projects/toestack/sys/kern/kern_clock.c#4 integrate .. //depot/projects/toestack/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/toestack/sys/kern/kern_linker.c#4 integrate .. //depot/projects/toestack/sys/kern/kern_lock.c#4 integrate .. //depot/projects/toestack/sys/kern/kern_mutex.c#4 integrate .. //depot/projects/toestack/sys/kern/kern_proc.c#5 integrate .. //depot/projects/toestack/sys/kern/kern_rwlock.c#5 integrate .. //depot/projects/toestack/sys/kern/kern_sysctl.c#3 integrate .. //depot/projects/toestack/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/toestack/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/toestack/sys/kern/subr_bus.c#2 integrate .. //depot/projects/toestack/sys/kern/subr_stack.c#2 integrate .. //depot/projects/toestack/sys/kern/subr_witness.c#5 integrate .. //depot/projects/toestack/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/toestack/sys/kern/tty_pty.c#3 integrate .. //depot/projects/toestack/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/toestack/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/toestack/sys/modules/amr/Makefile#2 integrate .. //depot/projects/toestack/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/toestack/sys/net/ieee8023ad_lacp.c#2 integrate .. //depot/projects/toestack/sys/net/if.c#4 integrate .. //depot/projects/toestack/sys/net/if_enc.c#2 integrate .. //depot/projects/toestack/sys/net/if_lagg.c#4 integrate .. //depot/projects/toestack/sys/net/pfil.c#2 integrate .. //depot/projects/toestack/sys/net/pfil.h#2 integrate .. //depot/projects/toestack/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/toestack/sys/net80211/ieee80211.h#5 integrate .. //depot/projects/toestack/sys/net80211/ieee80211_ht.c#5 integrate .. //depot/projects/toestack/sys/net80211/ieee80211_node.c#5 integrate .. //depot/projects/toestack/sys/net80211/ieee80211_output.c#4 integrate .. //depot/projects/toestack/sys/net80211/ieee80211_proto.c#5 integrate .. //depot/projects/toestack/sys/net80211/ieee80211_scan_sta.c#3 integrate .. //depot/projects/toestack/sys/net80211/ieee80211_var.h#5 integrate .. //depot/projects/toestack/sys/netatalk/aarp.c#4 integrate .. //depot/projects/toestack/sys/netatalk/ddp_output.c#3 integrate .. //depot/projects/toestack/sys/netgraph/ng_cisco.c#2 integrate .. //depot/projects/toestack/sys/netinet/if_ether.c#12 edit .. //depot/projects/toestack/sys/netinet/ip_input.c#4 integrate .. //depot/projects/toestack/sys/netinet/libalias/alias_util.c#2 integrate .. //depot/projects/toestack/sys/netinet/tcp_output.c#5 integrate .. //depot/projects/toestack/sys/netinet/tcp_subr.c#8 integrate .. //depot/projects/toestack/sys/netinet/tcp_syncache.c#7 integrate .. //depot/projects/toestack/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/toestack/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/toestack/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/toestack/sys/netipsec/ipsec_input.c#3 integrate .. //depot/projects/toestack/sys/netipsec/ipsec_output.c#2 integrate .. //depot/projects/toestack/sys/netipsec/xform.h#2 integrate .. //depot/projects/toestack/sys/netipsec/xform_ipip.c#2 integrate .. //depot/projects/toestack/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/toestack/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/toestack/sys/pc98/include/stack.h#1 branch .. //depot/projects/toestack/sys/pci/if_rl.c#2 integrate .. //depot/projects/toestack/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/toestack/sys/pci/if_sf.c#2 integrate .. //depot/projects/toestack/sys/pci/if_ste.c#2 integrate .. //depot/projects/toestack/sys/pci/if_vr.c#3 integrate .. //depot/projects/toestack/sys/pci/if_xl.c#3 integrate .. //depot/projects/toestack/sys/pci/xrpu.c#2 delete .. //depot/projects/toestack/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/toestack/sys/powerpc/include/atomic.h#2 integrate .. //depot/projects/toestack/sys/powerpc/include/stack.h#1 branch .. //depot/projects/toestack/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/toestack/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/toestack/sys/powerpc/powerpc/stack_machdep.c#1 branch .. //depot/projects/toestack/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/toestack/sys/sparc64/include/stack.h#1 branch .. //depot/projects/toestack/sys/sparc64/pci/ofw_pcibus.c#4 integrate .. //depot/projects/toestack/sys/sparc64/pci/psycho.c#4 integrate .. //depot/projects/toestack/sys/sparc64/pci/psychovar.h#2 integrate .. //depot/projects/toestack/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/toestack/sys/sparc64/sparc64/intr_machdep.c#3 integrate .. //depot/projects/toestack/sys/sparc64/sparc64/stack_machdep.c#1 branch .. //depot/projects/toestack/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/toestack/sys/sun4v/include/pcpu.h#3 integrate .. //depot/projects/toestack/sys/sun4v/include/stack.h#1 branch .. //depot/projects/toestack/sys/sun4v/include/stdarg.h#2 integrate .. //depot/projects/toestack/sys/sun4v/sun4v/db_trace.c#2 integrate .. //depot/projects/toestack/sys/sun4v/sun4v/stack_machdep.c#1 branch .. //depot/projects/toestack/sys/sys/_elf_solaris.h#2 delete .. //depot/projects/toestack/sys/sys/callout.h#4 integrate .. //depot/projects/toestack/sys/sys/elf.h#2 integrate .. //depot/projects/toestack/sys/sys/elf_common.h#2 integrate .. //depot/projects/toestack/sys/sys/kernel.h#3 integrate .. //depot/projects/toestack/sys/sys/linker.h#4 integrate .. //depot/projects/toestack/sys/sys/lockmgr.h#2 integrate .. //depot/projects/toestack/sys/sys/mutex.h#2 integrate .. //depot/projects/toestack/sys/sys/param.h#10 integrate .. //depot/projects/toestack/sys/sys/pcpu.h#3 integrate .. //depot/projects/toestack/sys/sys/pmc.h#2 integrate .. //depot/projects/toestack/sys/sys/pmclog.h#2 integrate .. //depot/projects/toestack/sys/sys/resource.h#2 integrate .. //depot/projects/toestack/sys/sys/signal.h#2 integrate .. //depot/projects/toestack/sys/sys/stack.h#2 integrate .. //depot/projects/toestack/sys/sys/stat.h#2 integrate .. //depot/projects/toestack/sys/sys/sysctl.h#4 integrate .. //depot/projects/toestack/sys/sys/time.h#2 integrate .. //depot/projects/toestack/sys/sys/types.h#2 integrate .. //depot/projects/toestack/sys/sys/umtx.h#2 integrate .. //depot/projects/toestack/sys/sys/user.h#3 integrate .. //depot/projects/toestack/sys/sys/xrpuio.h#2 delete .. //depot/projects/toestack/sys/ufs/ffs/ffs_alloc.c#4 integrate .. //depot/projects/toestack/sys/vm/redzone.c#2 integrate .. //depot/projects/toestack/sys/vm/vm_contig.c#4 integrate .. //depot/projects/toestack/sys/vm/vm_extern.h#6 edit .. //depot/projects/toestack/sys/vm/vm_page.c#6 integrate .. //depot/projects/toestack/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/toestack/sys/vm/vm_pageout.h#2 integrate .. //depot/projects/toestack/sys/vm/vnode_pager.c#3 integrate .. //depot/projects/toestack/tools/regression/lib/libc/stdio/test-printfloat.c#2 integrate .. //depot/projects/toestack/tools/regression/lib/libc/stdio/test-scanfloat.c#2 integrate .. //depot/projects/toestack/tools/regression/netinet/tcpconnect/README.tcp-md5#1 branch .. //depot/projects/toestack/tools/regression/netinet/tcpconnect/tcpconnect.c#2 integrate .. //depot/projects/toestack/tools/sched/schedgraph.py#3 integrate .. //depot/projects/toestack/usr.bin/Makefile#4 integrate .. //depot/projects/toestack/usr.bin/fstat/zfs/Makefile#2 integrate .. //depot/projects/toestack/usr.bin/login/login.1#2 integrate .. //depot/projects/toestack/usr.bin/make/main.c#2 integrate .. //depot/projects/toestack/usr.bin/netstat/Makefile#2 integrate .. //depot/projects/toestack/usr.bin/procstat/Makefile#1 branch .. //depot/projects/toestack/usr.bin/procstat/procstat.1#1 branch .. //depot/projects/toestack/usr.bin/procstat/procstat.c#1 branch .. //depot/projects/toestack/usr.bin/procstat/procstat.h#1 branch .. //depot/projects/toestack/usr.bin/procstat/procstat_args.c#1 branch .. //depot/projects/toestack/usr.bin/procstat/procstat_basic.c#1 branch .. //depot/projects/toestack/usr.bin/procstat/procstat_bin.c#1 branch .. //depot/projects/toestack/usr.bin/procstat/procstat_cred.c#1 branch .. //depot/projects/toestack/usr.bin/procstat/procstat_files.c#1 branch .. //depot/projects/toestack/usr.bin/procstat/procstat_kstack.c#1 branch .. //depot/projects/toestack/usr.bin/procstat/procstat_threads.c#1 branch .. //depot/projects/toestack/usr.bin/procstat/procstat_vm.c#1 branch .. //depot/projects/toestack/usr.bin/rpcgen/rpc_cout.c#2 integrate .. //depot/projects/toestack/usr.bin/tail/read.c#4 integrate .. //depot/projects/toestack/usr.sbin/acpi/acpidb/Makefile#2 integrate .. //depot/projects/toestack/usr.sbin/kldxref/Makefile#2 integrate .. //depot/projects/toestack/usr.sbin/newsyslog/newsyslog.conf.5#2 integrate .. //depot/projects/toestack/usr.sbin/nscd/Makefile#3 integrate .. //depot/projects/toestack/usr.sbin/pmcstat/pmcstat_log.c#2 integrate .. //depot/projects/toestack/usr.sbin/rpc.yppasswdd/Makefile#2 integrate .. //depot/projects/toestack/usr.sbin/zic/zic.c#2 integrate Differences ... ==== //depot/projects/toestack/ObsoleteFiles.inc#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.118 2007/11/16 04:03:08 marcel Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.123 2007/11/29 21:49:08 brooks 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,14 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071129: Disabled static versions of libkse by default +.if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no" +OLD_FILES+=usr/lib/libkse.a +OLD_FILES+=usr/lib/libkse_p.a +OLD_FILES+=usr/lib/libkse_pic.a +.endif +# 20071129: Removed a Solaris compatibility header +OLD_FILES+=usr/include/sys/_elf_solaris.h # 20071108: Removed very crunch OLDCARD support file OLD_FILES+=etc/defaults/pccard.conf # 20071104: Removed bsdlabel, fdisk and gpt from rescue on ia64. @@ -204,7 +212,7 @@ # 20070605: sched_core removal OLD_FILES+=usr/share/man/man4/sched_core.4.gz # 20070603: BIND 9.4.1 import -OLD_LIBS+=lib/liblwres.so.10 +OLD_LIBS+=usr/lib/liblwres.so.10 # 20070521: shared library version bump OLD_LIBS+=lib/libatm.so.4 OLD_LIBS+=lib/libbegemot.so.2 @@ -3963,6 +3971,21 @@ # - usr/share/tmac/mm/locale # - usr/share/tmac/mm/se_locale # - var/yp/Makefile + +# 20071120: shared library version bump +OLD_LIBS+=usr/lib/libasn1.so.8 +OLD_LIBS+=usr/lib/libgssapi.so.8 +OLD_LIBS+=usr/lib/libgssapi_krb5.so.8 +OLD_LIBS+=usr/lib/libhdb.so.8 +OLD_LIBS+=usr/lib/libkadm5clnt.so.8 +OLD_LIBS+=usr/lib/libkadm5srv.so.8 +OLD_LIBS+=usr/lib/libkafs5.so.8 +OLD_LIBS+=usr/lib/libkrb5.so.8 +OLD_LIBS+=usr/lib/libobjc.so.2 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libgssapi.so.8 +OLD_LIBS+=usr/lib32/libobjc.so.2 +.endif # 20070519: GCC 4.2 OLD_LIBS+=usr/lib/libg2c.a OLD_LIBS+=usr/lib/libg2c.so ==== //depot/projects/toestack/UPDATING#8 (text+ko) ==== @@ -21,6 +21,10 @@ developers choose to disable these features on build machines to maximize performance. +20071128: + The ADAPTIVE_GIANT kernel option has been retired because its + functionality is the default now. + 20071118: The AT keyboard emulation of sunkbd(4) has been turned on by default. In order to make the special symbols of the Sun @@ -945,4 +949,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.512 2007/11/18 18:11:16 marius Exp $ +$FreeBSD: src/UPDATING,v 1.513 2007/11/28 13:04:11 matteo Exp $ ==== //depot/projects/toestack/cddl/Makefile.inc#2 (text+ko) ==== @@ -1,3 +1,6 @@ -# $FreeBSD: src/cddl/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $ +# $FreeBSD: src/cddl/Makefile.inc,v 1.3 2007/11/28 22:58:09 jb Exp $ + +OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../contrib/opensolaris +OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/contrib/opensolaris -CFLAGS+= -D_SOLARIS_C_SOURCE +IGNORE_PRAGMA= YES ==== //depot/projects/toestack/cddl/lib/libnvpair/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ +# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.3 2007/11/28 22:58:09 jb Exp $ .PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair .PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair @@ -10,8 +10,8 @@ nvpair_alloc_fixed.c \ nvpair.c +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../include # XXX CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common .include ==== //depot/projects/toestack/contrib/bind9/CHANGES#2 (text+ko) ==== @@ -1,5 +1,117 @@ - --- 9.4.1-P1 released --- + --- 9.4.2 released --- + --- 9.4.2rc2 released --- + +2259. [bug] Reverse incorrect LIBINTERFACE bump of libisc + in 9.4.2rc1. Applications built against 9.4.2rc1 + will need to be rebuilt. + +2258. [bug] Fallback from IXFR/TSIG to SOA/AXFR/TSIG broken. + [RT #17241] + +2257. [bug] win32: Use the full path to vcredist_x86.exe when + calling it. [RT #17222] + +2256. [bug] win32: Correctly register the installation location of + bindevt.dll. [RT #17159] + +2255. [bug] L.ROOT-SERVERS.NET is now 199.7.83.42. + +2254. [bug] timer.c:dispatch() failed to lock timer->lock + when reading timer->idle allowing it to see + intermediate values as timer->idle was reset by + isc_timer_touch(). [RT #17243] + + --- 9.4.2rc1 released --- + +2251. [doc] Update memstatistics-file documentation to reflect + reality. Note there is behaviour change for BIND 9.5. + [RT #17113] + +2249. [bug] Only set Authentic Data bit if client requested + DNSSEC, per RFC 3655 [RT #17175] + +2248. [cleanup] Fix several errors reported by Coverity. [RT #17160] + +2245. [bug] Validating lack of DS records at trust anchors wasn't + working. [RT #17151] + +2238. [bug] It was possible to trigger a REQUIRE when a + validation was cancelled. [RT #17106] + +2237. [bug] libbind: res_init() was not thread aware. [RT #17123] + +2236. [bug] dnssec-signzone failed to preserve the case of + of wildcard owner names. [RT #17085] + +2235. [bug] was not being installed. [RT #17135] + +2234. [port] Correct some compiler warnings on SCO OSr5 [RT #17134] + +2232. [bug] dns_adb_findaddrinfo() could fail and return + ISC_R_SUCCESS. [RT #17137] + +2231. [bug] Building dlzbdb (contrib/dlz/bin/dlzbdb) was broken. + [RT #17088] + +2230. [bug] We could INSIST reading a corrupted journal. + [RT #17132] + +2228. [contrib] contrib: Change 2188 was incomplete. + +2227. [cleanup] Tidied up the FAQ. [RT #17121] + +2225. [bug] More support for systems with no IPv4 addresses. + [RT #17111] + +2224. [bug] Defer journal compaction if a xfrin is in progress. + [RT #17119] + +2223. [bug] Make a new journal when compacting. [RT #17119] + +2221. [bug] Set the event result code to reflect the actual + record returned to caller when a cache update is + rejected due to a more credible answer existing. + [RT #17017] + +2220. [bug] win32: Address a race condition in final shutdown of >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 3 21:27:55 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D454816A418; Mon, 3 Dec 2007 21:27: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 7DEF416A41A for ; Mon, 3 Dec 2007 21:27:54 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 870E113C43E for ; Mon, 3 Dec 2007 21:27:54 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB3LRs64022105 for ; Mon, 3 Dec 2007 21:27:54 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB3LRsju022102 for perforce@freebsd.org; Mon, 3 Dec 2007 21:27:54 GMT (envelope-from swise@FreeBSD.org) Date: Mon, 3 Dec 2007 21:27:54 GMT Message-Id: <200712032127.lB3LRsju022102@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 130115 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2007 21:27:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=130115 Change 130115 by swise@swise:vic10:iwarp on 2007/12/03 21:27:10 Fixed refcnt logic on cma and core modules. - got rid of atomics since we need spinlocks anyway to do conditional waiting. - added logic in destroy paths to only cv_wait() if the refcnt is not 0. - added logic in deref to broadcast only if refcnt transitions to 0. Affected files ... .. //depot/projects/iwarp/sys/contrib/rdma/ib_addr.h#4 edit .. //depot/projects/iwarp/sys/contrib/rdma/rdma_addr.c#3 edit .. //depot/projects/iwarp/sys/contrib/rdma/rdma_cma.c#7 edit .. //depot/projects/iwarp/sys/contrib/rdma/rdma_device.c#4 edit .. //depot/projects/iwarp/sys/contrib/rdma/rdma_iwcm.c#4 edit .. //depot/projects/iwarp/sys/sys/linux_compat.h#7 edit Differences ... ==== //depot/projects/iwarp/sys/contrib/rdma/ib_addr.h#4 (text+ko) ==== @@ -37,7 +37,7 @@ #define MAX_ADDR_LEN ETHER_ADDR_LEN /* XXX doesn't support IB! */ struct rdma_addr_client { - atomic_t refcount; + int refcount; struct cv comp; struct mtx lock; }; ==== //depot/projects/iwarp/sys/contrib/rdma/rdma_addr.c#3 (text+ko) ==== @@ -94,17 +94,18 @@ void rdma_addr_register_client(struct rdma_addr_client *client) { - atomic_set(&client->refcount, 1); mtx_init(&client->lock, "rdma_addr client lock", NULL, MTX_DEF); cv_init(&client->comp, "rdma_addr cv"); + client->refcount = 1; } EXPORT_SYMBOL(rdma_addr_register_client); static inline void put_client(struct rdma_addr_client *client) { mtx_lock(&client->lock); - if (atomic_dec_and_test(&client->refcount)) - cv_signal(&client->comp); + if (--client->refcount == 0) { + cv_broadcast(&client->comp); + } mtx_unlock(&client->lock); } @@ -112,7 +113,10 @@ { put_client(client); mtx_lock(&client->lock); - cv_wait(&client->comp, &client->lock); + if (client->refcount) { + cv_wait(&client->comp, &client->lock); + } + mtx_unlock(&client->lock); } EXPORT_SYMBOL(rdma_addr_unregister_client); @@ -287,7 +291,9 @@ req->callback = callback; req->context = context; req->client = client; - atomic_inc(&client->refcount); + mtx_lock(&client->lock); + client->refcount++; + mtx_unlock(&client->lock); src_in = (struct sockaddr_in *) &req->src_addr; dst_in = (struct sockaddr_in *) &req->dst_addr; @@ -306,7 +312,9 @@ break; default: ret = req->status; - atomic_dec(&client->refcount); + mtx_lock(&client->lock); + client->refcount--; + mtx_unlock(&client->lock); free(req, M_DEVBUF); break; } ==== //depot/projects/iwarp/sys/contrib/rdma/rdma_cma.c#7 (text+ko) ==== @@ -138,7 +138,7 @@ struct cv comp; int refcount; struct cv wait_remove; - atomic_t dev_remove; + int dev_remove; int backlog; int timeout_ms; @@ -367,9 +367,7 @@ static void cma_deref_id(struct rdma_id_private *id_priv) { mtx_lock(&id_priv->lock); - printf("%s id %p refcount %d\n", __FUNCTION__, id_priv, id_priv->refcount); if (--id_priv->refcount == 0) { - printf("%s cv_bcast %p \n", __FUNCTION__, id_priv); cv_broadcast(&id_priv->comp); } mtx_unlock(&id_priv->lock); @@ -382,7 +380,7 @@ mtx_lock(&id_priv->lock); if (id_priv->state == state) { - atomic_inc(&id_priv->dev_remove); + id_priv->dev_remove++; ret = 0; } else ret = EINVAL; @@ -393,7 +391,7 @@ static void cma_enable_remove(struct rdma_id_private *id_priv) { mtx_lock(&id_priv->lock); - if (atomic_dec_and_test(&id_priv->dev_remove)) + if (--id_priv->dev_remove == 0) cv_broadcast(&id_priv->wait_remove); mtx_unlock(&id_priv->lock); } @@ -420,9 +418,7 @@ mtx_init(&id_priv->lock, "rdma_cm_id_priv", NULL, MTX_DUPOK|MTX_DEF); cv_init(&id_priv->comp, "rdma_cm_id_priv"); id_priv->refcount = 1; - printf("%s id %p refcount %d\n", __FUNCTION__, id_priv, id_priv->refcount); cv_init(&id_priv->wait_remove, "id priv wait remove"); - atomic_set(&id_priv->dev_remove, 0); LIST_INIT(&id_priv->listen_list); arc4rand(&id_priv->seq_num, sizeof id_priv->seq_num, 0); @@ -791,7 +787,8 @@ cma_deref_id(id_priv); mtx_lock(&id_priv->lock); if (id_priv->refcount) - cv_wait_unlock(&id_priv->comp, &id_priv->lock); + cv_wait(&id_priv->comp, &id_priv->lock); + mtx_unlock(&id_priv->lock); free(id_priv, M_DEVBUF); } @@ -1153,7 +1150,9 @@ goto out; } - atomic_inc(&conn_id->dev_remove); + mtx_lock(&conn_id->lock); + conn_id->dev_remove++; + mtx_unlock(&conn_id->lock); mtx_lock(&lock); ret = cma_acquire_dev(conn_id); mtx_unlock(&lock); @@ -1322,7 +1321,9 @@ goto out; } conn_id = container_of(new_cm_id, struct rdma_id_private, id); - atomic_inc(&conn_id->dev_remove); + mtx_lock(&conn_id->lock); + ++conn_id->dev_remove; + mtx_unlock(&conn_id->lock); conn_id->state = CMA_CONNECT; ifa = ifa_ifwithaddr((struct sockaddr *)&iw_event->local_addr); @@ -1590,7 +1591,9 @@ struct rdma_id_private *id_priv = work->id; int destroy = 0; - atomic_inc(&id_priv->dev_remove); + mtx_lock(&id_priv->lock); + ++id_priv->dev_remove; + mtx_unlock(&id_priv->lock); if (!cma_comp_exch(id_priv, work->old_state, work->new_state)) goto out; @@ -1697,7 +1700,6 @@ mtx_lock(&id_priv->lock); id_priv->refcount++; - printf("%s id %p refcount %d\n", __FUNCTION__, id_priv, id_priv->refcount); mtx_unlock(&id_priv->lock); #ifdef IB_SUPPORTED switch (rdma_node_get_transport(id->device->node_type)) { @@ -1773,7 +1775,9 @@ struct rdma_cm_event event; memset(&event, 0, sizeof event); - atomic_inc(&id_priv->dev_remove); + mtx_lock(&id_priv->lock); + ++id_priv->dev_remove; + mtx_unlock(&id_priv->lock); /* * Grab mutex to block rdma_destroy_id() from removing the device while @@ -1879,7 +1883,6 @@ mtx_lock(&id_priv->lock); id_priv->refcount++; - printf("%s id %p refcount %d\n", __FUNCTION__, id_priv, id_priv->refcount); mtx_unlock(&id_priv->lock); memcpy(&id->route.addr.dst_addr, dst_addr, ip_addr_size(dst_addr)); if (cma_any_addr(dst_addr)) @@ -2821,7 +2824,10 @@ cma_cancel_operation(id_priv, state); mtx_lock(&id_priv->lock); - cv_wait(&id_priv->wait_remove, &id_priv->lock); + BUG_ON(id_priv->dev_remove < 0); + if (id_priv->dev_remove) + cv_wait(&id_priv->wait_remove, &id_priv->lock); + mtx_unlock(&id_priv->lock); /* Check for destruction from another callback. */ if (!cma_comp(id_priv, CMA_DEVICE_REMOVAL)) @@ -2849,7 +2855,6 @@ LIST_REMOVE(id_priv, list); mtx_lock(&id_priv->lock); id_priv->refcount++; - printf("%s id %p refcount %d\n", __FUNCTION__, id_priv, id_priv->refcount); mtx_unlock(&id_priv->lock); mtx_unlock(&lock); @@ -2863,7 +2868,11 @@ mtx_unlock(&lock); cma_deref_dev(cma_dev); - cv_wait(&cma_dev->comp, &cma_dev->lock); + mtx_lock(&cma_dev->lock); + BUG_ON(cma_dev->refcount < 0); + if (cma_dev->refcount) + cv_wait(&cma_dev->comp, &cma_dev->lock); + mtx_unlock(&cma_dev->lock); } static void cma_remove_one(struct ib_device *device) ==== //depot/projects/iwarp/sys/contrib/rdma/rdma_device.c#4 (text+ko) ==== ==== //depot/projects/iwarp/sys/contrib/rdma/rdma_iwcm.c#4 (text+ko) ==== @@ -211,7 +211,9 @@ { struct iwcm_id_private *cm_id_priv; cm_id_priv = container_of(cm_id, struct iwcm_id_private, id); + mtx_lock(&cm_id_priv->lock); atomic_inc(&cm_id_priv->refcount); + mtx_unlock(&cm_id_priv->lock); } static void rem_ref(struct iw_cm_id *cm_id) @@ -432,7 +434,9 @@ destroy_cm_id(cm_id); mtx_lock(&cm_id_priv->lock); - cv_wait(&cm_id_priv->destroy_comp, &cm_id_priv->lock); + if (atomic_read(&cm_id_priv->refcount)) + cv_wait(&cm_id_priv->destroy_comp, &cm_id_priv->lock); + mtx_unlock(&cm_id_priv->lock); free_cm_id(cm_id_priv); } @@ -950,7 +954,9 @@ } } + mtx_lock(&cm_id_priv->lock); atomic_inc(&cm_id_priv->refcount); + mtx_unlock(&cm_id_priv->lock); if (TAILQ_EMPTY(&cm_id_priv->work_list)) { TAILQ_INSERT_TAIL(&cm_id_priv->work_list, work, list); taskqueue_enqueue(iwcm_wq, &work->task); ==== //depot/projects/iwarp/sys/sys/linux_compat.h#7 (text+ko) ==== @@ -153,7 +153,7 @@ static inline void idr_destroy(struct idr *idp) { struct idr *i, *tmp; - for (i=idp;i;i=tmp) { + for (i=idp->next;i;i=tmp) { tmp=(i)->next; free(i, M_TEMP); } From owner-p4-projects@FreeBSD.ORG Mon Dec 3 22:21:54 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB2B316A475; Mon, 3 Dec 2007 22:21: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 58E0616A419 for ; Mon, 3 Dec 2007 22:21:53 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 64DAE13C458 for ; Mon, 3 Dec 2007 22:21:53 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB3MLrYw045699 for ; Mon, 3 Dec 2007 22:21:53 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB3MLraK045696 for perforce@freebsd.org; Mon, 3 Dec 2007 22:21:53 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 3 Dec 2007 22:21:53 GMT Message-Id: <200712032221.lB3MLraK045696@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130119 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2007 22:21:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=130119 Change 130119 by kmacy@kmacy_home:ethng on 2007/12/03 22:21:49 build fixes for previous IFC Affected files ... .. //depot/projects/ethng/src/sys/amd64/amd64/vm_machdep.c#4 edit .. //depot/projects/ethng/src/sys/netinet/if_ether.c#8 edit .. //depot/projects/ethng/src/sys/vm/vm_contig.c#5 edit .. //depot/projects/ethng/src/sys/vm/vm_extern.h#4 edit Differences ... ==== //depot/projects/ethng/src/sys/amd64/amd64/vm_machdep.c#4 (text+ko) ==== @@ -573,7 +573,7 @@ } void * -contigmalloc2(vm_page_t m, vm_pindex_t npages, int flags) +contigmapping(vm_page_t m, vm_pindex_t npages, int flags) { return (void *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(m)); } ==== //depot/projects/ethng/src/sys/netinet/if_ether.c#8 (text+ko) ==== @@ -224,8 +224,8 @@ RT_ADDREF(rt); la->la_rt = rt; rt->rt_flags |= RTF_LLINFO; - callout_init_rwlock(&la->la_timer, &rt->rt_lock, - CALLOUT_RETURNUNLOCKED_RW); + callout_init_rw(&la->la_timer, &rt->rt_lock, + CALLOUT_RETURNUNLOCKED); #ifdef INET /* @@ -362,15 +362,17 @@ struct sockaddr_dl *sdl; int error; - if (m->m_flags & M_BCAST) { /* broadcast */ - (void)memcpy(desten, ifp->if_broadcastaddr, ifp->if_addrlen); - return (0); + if (m) { + if (m->m_flags & M_BCAST) { /* broadcast */ + (void)memcpy(desten, ifp->if_broadcastaddr, ifp->if_addrlen); + return (0); + } + if (m->m_flags & M_MCAST && ifp->if_type != IFT_ARCNET) {/* multicast */ + ETHER_MAP_IP_MULTICAST(&SIN(dst)->sin_addr, desten); + return (0); + } } - if (m->m_flags & M_MCAST && ifp->if_type != IFT_ARCNET) {/* multicast */ - ETHER_MAP_IP_MULTICAST(&SIN(dst)->sin_addr, desten); - return (0); - } - + if (rt0 != NULL) { error = rt_check(&rt, &rt0, dst); if (error) { @@ -413,7 +415,7 @@ sdl->sdl_family == AF_LINK && sdl->sdl_alen != 0) { bcopy(LLADDR(sdl), desten, sdl->sdl_alen); - + /* * If entry has an expiry time and it is approaching, * send an ARP request. @@ -449,10 +451,12 @@ * response yet. Replace the held mbuf with this * latest one. */ - if (la->la_hold) - m_freem(la->la_hold); - la->la_hold = m; - + if (m) { + if (la->la_hold) + m_freem(la->la_hold); + la->la_hold = m; + } + KASSERT(rt->rt_expire > 0, ("sending ARP request for static entry")); /* @@ -730,6 +734,7 @@ } (void)memcpy(LLADDR(sdl), ar_sha(ah), sdl->sdl_alen = ah->ar_hln); + /* * If we receive an arp from a token-ring station over * a token-ring nic then try to save the source @@ -805,12 +810,12 @@ * over who claims what Ether address. */ if (rt->rt_ifp == ifp) { - rtfree(rt); + RTFREE_LOCKED(rt); goto drop; } (void)memcpy(ar_tha(ah), ar_sha(ah), ah->ar_hln); (void)memcpy(ar_sha(ah), enaddr, ah->ar_hln); - rtfree(rt); + RTFREE_LOCKED(rt); /* * Also check that the node which sent the ARP packet @@ -828,10 +833,10 @@ " from %s via %s, expecting %s\n", inet_ntoa(isaddr), ifp->if_xname, rt->rt_ifp->if_xname); - rtfree(rt); + RTFREE_LOCKED(rt); goto drop; } - rtfree(rt); + RTFREE_LOCKED(rt); #ifdef DEBUG_PROXY printf("arp: proxying for %s\n", @@ -936,12 +941,12 @@ } } -void -arp_ifinit(struct ifnet *ifp, struct ifaddr *ifa) +static __inline void +arp_ifinit_internal(struct ifnet *ifp, struct ifaddr *ifa, u_char *enaddr) { if (ntohl(IA_SIN(ifa)->sin_addr.s_addr) != INADDR_ANY) arprequest(ifp, &IA_SIN(ifa)->sin_addr, - &IA_SIN(ifa)->sin_addr, IF_LLADDR(ifp)); + &IA_SIN(ifa)->sin_addr, enaddr); ifa->ifa_rtrequest = arp_rtrequest; ifa->ifa_flags |= RTF_CLONING; } @@ -949,11 +954,13 @@ void arp_ifinit2(struct ifnet *ifp, struct ifaddr *ifa, u_char *enaddr) { - if (ntohl(IA_SIN(ifa)->sin_addr.s_addr) != INADDR_ANY) - arprequest(ifp, &IA_SIN(ifa)->sin_addr, - &IA_SIN(ifa)->sin_addr, enaddr); - ifa->ifa_rtrequest = arp_rtrequest; - ifa->ifa_flags |= RTF_CLONING; + arp_ifinit_internal(ifp, ifa, enaddr); +} + +void +arp_ifinit(struct ifnet *ifp, struct ifaddr *ifa) +{ + arp_ifinit_internal(ifp, ifa, IF_LLADDR(ifp)); } static void ==== //depot/projects/ethng/src/sys/vm/vm_contig.c#5 (text+ko) ==== ==== //depot/projects/ethng/src/sys/vm/vm_extern.h#4 (text+ko) ==== @@ -97,6 +97,11 @@ void vm_thread_swapin(struct thread *td); void vm_thread_swapout(struct thread *td); -void *contigmalloc2(vm_page_t m, vm_pindex_t npages, int flags); +void *contigmapping(vm_page_t m, vm_pindex_t npages, int flags); + +#define VM_HOLD_WRITEABLE 0x1 +int vm_fault_hold_user_pages(vm_offset_t addr, int len, vm_page_t *mp, int *count, int flags); +void vm_fault_unhold_pages(vm_page_t *m, int count); + #endif /* _KERNEL */ #endif /* !_VM_EXTERN_H_ */ From owner-p4-projects@FreeBSD.ORG Tue Dec 4 00:05:10 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A73E16A420; Tue, 4 Dec 2007 00:05:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CDDAE16A419 for ; Tue, 4 Dec 2007 00:05:09 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BAA6913C474 for ; Tue, 4 Dec 2007 00:05:09 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB4059aB064837 for ; Tue, 4 Dec 2007 00:05:09 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB4052HC064818 for perforce@freebsd.org; Tue, 4 Dec 2007 00:05:02 GMT (envelope-from peter@freebsd.org) Date: Tue, 4 Dec 2007 00:05:02 GMT Message-Id: <200712040005.lB4052HC064818@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 130128 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2007 00:05:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=130128 Change 130128 by peter@peter_daintree on 2007/12/04 00:04:43 IFC @130127 Affected files ... .. //depot/projects/hammer/contrib/bind9/CHANGES#9 integrate .. //depot/projects/hammer/contrib/bind9/COPYRIGHT#5 integrate .. //depot/projects/hammer/contrib/bind9/FAQ#7 integrate .. //depot/projects/hammer/contrib/bind9/FAQ.xml#5 integrate .. //depot/projects/hammer/contrib/bind9/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/bind9/README#8 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/check-tool.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkconf.8#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkconf.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkconf.html#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkzone.8#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkzone.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkzone.docbook#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkzone.html#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dig.1#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dig.c#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dig.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dig.html#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dighost.c#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/host.1#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/host.c#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/host.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/host.html#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/include/dig/dig.h#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/nslookup.1#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/nslookup.c#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/nslookup.docbook#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/nslookup.html#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.8#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.html#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.8#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.c#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.html#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/client.c#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/config.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/control.c#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.8#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.html#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.8#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.conf.5#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.conf.docbook#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.conf.html#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.docbook#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.html#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/query.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/server.c#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/update.c#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.8#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.c#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.html#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc-confgen.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.8#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.conf.5#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.conf.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.conf.html#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.html#5 integrate .. //depot/projects/hammer/contrib/bind9/configure.in#6 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM-book.xml#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch01.html#6 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch02.html#6 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch03.html#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch04.html#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch05.html#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch06.html#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch07.html#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch08.html#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch09.html#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch10.html#3 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.html#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.pdf#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.dig.html#3 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-keygen.html#3 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-signzone.html#3 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.host.html#3 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.named-checkconf.html#3 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.named-checkzone.html#3 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.named.html#3 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc-confgen.html#3 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc.conf.html#3 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc.html#3 integrate .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/misc/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/doc/misc/migration#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/rfc/index#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4398.txt#1 branch .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4408.txt#1 branch .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4470.txt#1 branch .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4634.txt#1 branch .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4641.txt#1 branch .. //depot/projects/hammer/contrib/bind9/lib/bind/api#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/config.h.in#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/configure#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/configure.in#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/dst_api.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/hmac_link.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gai_strerror.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irs_data.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/ctl_clnt.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/make/rules.in#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/nameser/ns_parse.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/port_before.h.in#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_data.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_init.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/api#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/check.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/adb.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/api#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dispatch.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dnssec.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/db.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dispatch.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/validator.h#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/journal.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/lookup.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/master.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/message.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/openssl_link.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/openssldh_link.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/openssldsa_link.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rbtdb.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ds_43.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdataslab.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/resolver.c#8 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rootns.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/sdb.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/sdlz.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/tsig.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/validator.c#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/view.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/xfrin.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/zone.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/alpha/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/alpha/include/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/api#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/arm/include/isc/atomic.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/hmacsha.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/ia64/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/ia64/include/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/platform.h.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/string.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/mem.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/mips/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/mips/include/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/noatomic/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/noatomic/include/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/powerpc/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/powerpc/include/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/sparc64/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/sparc64/include/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/timer.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/net.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/socket.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/syslog.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/x86_32/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/x86_32/include/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/x86_64/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/x86_64/include/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isccc/symtab.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccfg/api#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/api#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/context.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/getaddrinfo.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/getipnode.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/lwres_gnba.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_config.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_context.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_noop.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_packet.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/make/rules.in#5 integrate .. //depot/projects/hammer/contrib/bind9/version#9 integrate .. //depot/projects/hammer/include/assert.h#2 integrate .. //depot/projects/hammer/lib/bind/bind/Makefile#7 integrate .. //depot/projects/hammer/lib/bind/bind/config.h#6 integrate .. //depot/projects/hammer/lib/bind/bind/port_before.h#5 integrate .. //depot/projects/hammer/lib/bind/config.h#8 integrate .. //depot/projects/hammer/lib/bind/config.mk#11 integrate .. //depot/projects/hammer/lib/bind/isc/isc/platform.h#5 integrate .. //depot/projects/hammer/lib/bind/lwres/Makefile#8 integrate .. //depot/projects/hammer/lib/csu/common/crtbrand.c#4 integrate .. //depot/projects/hammer/lib/libc/amd64/Makefile.inc#7 integrate .. //depot/projects/hammer/lib/libc/gdtoa/_ldtoa.c#4 integrate .. //depot/projects/hammer/lib/libc/gdtoa/machdep_ldisQ.c#3 integrate .. //depot/projects/hammer/lib/libc/gdtoa/machdep_ldisx.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/closedir.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/readdir.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/seekdir.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/telldir.c#3 integrate .. //depot/projects/hammer/lib/libc/i386/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libc/ia64/Makefile.inc#6 integrate .. //depot/projects/hammer/lib/libc/nameser/ns_parse.c#3 integrate .. //depot/projects/hammer/lib/libc/resolv/res_data.c#4 integrate .. //depot/projects/hammer/lib/libc/resolv/res_init.c#5 integrate .. //depot/projects/hammer/lib/libc/sparc64/Makefile.inc#6 integrate .. //depot/projects/hammer/lib/libkse/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/hammer/lib/libkse/arch/powerpc/include/pthread_md.h#3 integrate .. //depot/projects/hammer/lib/libpmc/pmc.3#13 integrate .. //depot/projects/hammer/lib/libpmc/pmclog.c#5 integrate .. //depot/projects/hammer/lib/libpmc/pmclog.h#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/sparc64/rtld_machdep.h#8 integrate .. //depot/projects/hammer/share/man/man9/Makefile#77 integrate .. //depot/projects/hammer/share/man/man9/stack.9#3 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#40 integrate .. //depot/projects/hammer/sys/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/hammer/sys/amd64/conf/GENERIC#101 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#105 integrate .. //depot/projects/hammer/sys/amd64/include/stack.h#1 branch .. //depot/projects/hammer/sys/arm/arm/db_trace.c#13 integrate .. //depot/projects/hammer/sys/arm/arm/nexus_io.c#7 delete .. //depot/projects/hammer/sys/arm/arm/nexus_io_asm.S#4 delete .. //depot/projects/hammer/sys/arm/arm/pmap.c#45 integrate .. //depot/projects/hammer/sys/arm/arm/stack_machdep.c#1 branch .. //depot/projects/hammer/sys/arm/conf/AVILA#6 integrate .. //depot/projects/hammer/sys/arm/conf/BWCT#2 integrate .. //depot/projects/hammer/sys/arm/conf/CRB#3 integrate .. //depot/projects/hammer/sys/arm/conf/EP80219#4 integrate .. //depot/projects/hammer/sys/arm/conf/HL200#2 integrate .. //depot/projects/hammer/sys/arm/conf/IQ31244#14 integrate .. //depot/projects/hammer/sys/arm/conf/KB920X#6 integrate .. //depot/projects/hammer/sys/arm/conf/SIMICS#11 integrate .. //depot/projects/hammer/sys/arm/conf/SKYEYE#4 integrate .. //depot/projects/hammer/sys/arm/include/asmacros.h#7 integrate .. //depot/projects/hammer/sys/arm/include/atomic.h#19 integrate .. //depot/projects/hammer/sys/arm/include/stack.h#1 branch .. //depot/projects/hammer/sys/arm/sa11x0/files.sa11x0#2 integrate .. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#27 integrate .. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#26 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#43 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#46 integrate .. //depot/projects/hammer/sys/conf/NOTES#130 integrate .. //depot/projects/hammer/sys/conf/files#165 integrate .. //depot/projects/hammer/sys/conf/files.amd64#99 integrate .. //depot/projects/hammer/sys/conf/files.arm#11 integrate .. //depot/projects/hammer/sys/conf/files.i386#85 integrate .. //depot/projects/hammer/sys/conf/files.ia64#41 integrate .. //depot/projects/hammer/sys/conf/files.pc98#64 integrate .. //depot/projects/hammer/sys/conf/files.powerpc#25 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#42 integrate .. //depot/projects/hammer/sys/conf/files.sun4v#5 integrate .. //depot/projects/hammer/sys/conf/options#117 integrate .. //depot/projects/hammer/sys/dev/amr/amr.c#36 integrate .. //depot/projects/hammer/sys/dev/amr/amr_cam.c#19 integrate .. //depot/projects/hammer/sys/dev/amr/amr_pci.c#25 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#55 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pci.c#14 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#21 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#53 integrate .. //depot/projects/hammer/sys/dev/si/si_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/snp/snp.c#24 integrate .. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#13 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/channel.c#26 integrate .. //depot/projects/hammer/sys/dev/usb/if_zyd.c#7 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#59 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#95 integrate .. //depot/projects/hammer/sys/i386/i386/db_trace.c#23 integrate .. //depot/projects/hammer/sys/i386/i386/stack_machdep.c#1 branch .. //depot/projects/hammer/sys/i386/include/stack.h#1 branch .. //depot/projects/hammer/sys/ia64/conf/GENERIC#31 integrate .. //depot/projects/hammer/sys/ia64/ia64/db_machdep.c#6 integrate .. //depot/projects/hammer/sys/ia64/ia64/stack_machdep.c#1 branch .. //depot/projects/hammer/sys/kern/kern_descrip.c#71 integrate .. //depot/projects/hammer/sys/kern/kern_linker.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_lock.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#62 integrate .. //depot/projects/hammer/sys/kern/subr_stack.c#4 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#79 integrate .. //depot/projects/hammer/sys/modules/amr/Makefile#4 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#70 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#47 integrate .. //depot/projects/hammer/sys/pc98/include/stack.h#1 branch .. //depot/projects/hammer/sys/pci/xrpu.c#14 delete .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#34 integrate .. //depot/projects/hammer/sys/powerpc/include/stack.h#1 branch .. //depot/projects/hammer/sys/powerpc/powerpc/db_trace.c#14 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/stack_machdep.c#1 branch .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#56 integrate .. //depot/projects/hammer/sys/sparc64/include/stack.h#1 branch .. //depot/projects/hammer/sys/sparc64/pci/psycho.c#37 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/db_trace.c#14 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/stack_machdep.c#1 branch .. //depot/projects/hammer/sys/sun4v/conf/GENERIC#7 integrate .. //depot/projects/hammer/sys/sun4v/include/stack.h#1 branch .. //depot/projects/hammer/sys/sun4v/sun4v/db_trace.c#2 integrate .. //depot/projects/hammer/sys/sun4v/sun4v/stack_machdep.c#1 branch .. //depot/projects/hammer/sys/sys/elf_common.h#9 integrate .. //depot/projects/hammer/sys/sys/linker.h#20 integrate .. //depot/projects/hammer/sys/sys/pmc.h#9 integrate .. //depot/projects/hammer/sys/sys/pmclog.h#4 integrate .. //depot/projects/hammer/sys/sys/stack.h#3 integrate .. //depot/projects/hammer/sys/sys/sysctl.h#37 integrate .. //depot/projects/hammer/sys/sys/user.h#23 integrate .. //depot/projects/hammer/sys/sys/xrpuio.h#3 delete .. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#35 integrate .. //depot/projects/hammer/sys/vm/redzone.c#2 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#65 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-printfloat.c#9 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-scanfloat.c#6 integrate .. //depot/projects/hammer/usr.bin/Makefile#55 integrate .. //depot/projects/hammer/usr.bin/procstat/Makefile#1 branch .. //depot/projects/hammer/usr.bin/procstat/procstat.1#1 branch .. //depot/projects/hammer/usr.bin/procstat/procstat.c#1 branch .. //depot/projects/hammer/usr.bin/procstat/procstat.h#1 branch .. //depot/projects/hammer/usr.bin/procstat/procstat_args.c#1 branch .. //depot/projects/hammer/usr.bin/procstat/procstat_basic.c#1 branch .. //depot/projects/hammer/usr.bin/procstat/procstat_bin.c#1 branch .. //depot/projects/hammer/usr.bin/procstat/procstat_cred.c#1 branch .. //depot/projects/hammer/usr.bin/procstat/procstat_files.c#1 branch .. //depot/projects/hammer/usr.bin/procstat/procstat_kstack.c#1 branch .. //depot/projects/hammer/usr.bin/procstat/procstat_threads.c#1 branch .. //depot/projects/hammer/usr.bin/procstat/procstat_vm.c#1 branch .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat_log.c#8 integrate .. //depot/projects/hammer/usr.sbin/zic/zic.c#5 integrate Differences ... ==== //depot/projects/hammer/contrib/bind9/CHANGES#9 (text+ko) ==== @@ -1,5 +1,117 @@ - --- 9.4.1-P1 released --- + --- 9.4.2 released --- + --- 9.4.2rc2 released --- + +2259. [bug] Reverse incorrect LIBINTERFACE bump of libisc + in 9.4.2rc1. Applications built against 9.4.2rc1 + will need to be rebuilt. + +2258. [bug] Fallback from IXFR/TSIG to SOA/AXFR/TSIG broken. + [RT #17241] + +2257. [bug] win32: Use the full path to vcredist_x86.exe when + calling it. [RT #17222] + +2256. [bug] win32: Correctly register the installation location of + bindevt.dll. [RT #17159] + +2255. [bug] L.ROOT-SERVERS.NET is now 199.7.83.42. + +2254. [bug] timer.c:dispatch() failed to lock timer->lock + when reading timer->idle allowing it to see + intermediate values as timer->idle was reset by + isc_timer_touch(). [RT #17243] + + --- 9.4.2rc1 released --- + +2251. [doc] Update memstatistics-file documentation to reflect + reality. Note there is behaviour change for BIND 9.5. + [RT #17113] + +2249. [bug] Only set Authentic Data bit if client requested + DNSSEC, per RFC 3655 [RT #17175] + +2248. [cleanup] Fix several errors reported by Coverity. [RT #17160] + +2245. [bug] Validating lack of DS records at trust anchors wasn't + working. [RT #17151] + +2238. [bug] It was possible to trigger a REQUIRE when a + validation was cancelled. [RT #17106] + +2237. [bug] libbind: res_init() was not thread aware. [RT #17123] + +2236. [bug] dnssec-signzone failed to preserve the case of + of wildcard owner names. [RT #17085] + +2235. [bug] was not being installed. [RT #17135] + +2234. [port] Correct some compiler warnings on SCO OSr5 [RT #17134] + +2232. [bug] dns_adb_findaddrinfo() could fail and return + ISC_R_SUCCESS. [RT #17137] + +2231. [bug] Building dlzbdb (contrib/dlz/bin/dlzbdb) was broken. + [RT #17088] + +2230. [bug] We could INSIST reading a corrupted journal. + [RT #17132] + +2228. [contrib] contrib: Change 2188 was incomplete. + +2227. [cleanup] Tidied up the FAQ. [RT #17121] + +2225. [bug] More support for systems with no IPv4 addresses. + [RT #17111] + +2224. [bug] Defer journal compaction if a xfrin is in progress. + [RT #17119] + +2223. [bug] Make a new journal when compacting. [RT #17119] + +2221. [bug] Set the event result code to reflect the actual + record returned to caller when a cache update is + rejected due to a more credible answer existing. + [RT #17017] + +2220. [bug] win32: Address a race condition in final shutdown of + the Windows socket code. [RT #17028] + +2219. [bug] Apply zone consistancy checks to additions, not + removals, when updating. [RT #17049] + +2218. [bug] Remove unnecessary REQUIRE from dns_validator_create(). + [RT #16976] + +2216. [cleanup] Fix a number of errors reported by Coverity. + [RT #17094] + +2215. [bug] Bad REQUIRE check isc_hmacsha1_verify(). [RT #17094] + +2214. [bug] Deregister OpenSSL lock callback when cleaning + up. Reorder OpenSSL cleanup so that RAND_cleanup() + is called before the locks are destroyed. [RT #17098] + +2213. [bug] SIG0 diagnostic failure messages were looking at the + wrong status code. [RT #17101] + +2212. [func] 'host -m' now causes memory statistics and active + memory to be printed at exit. [RT 17028] + +2210. [bug] Deleting class specific records via UPDATE could + fail. [RT #17074] + +2209. [port] osx: linking against user supplied static OpenSSL + libraries failed as the system ones were still being + found. [RT #17078] + +2208. [port] win32: make sure both build methods produce the + same output. [RT #17058] + +2207. [port] Some implementations of getaddrinfo() fail to set + ai_canonname correctly. [RT #17061] + + --- 9.4.2b1 released --- 2206. [security] "allow-query-cache" and "allow-recursion" now cross inherit from each other. @@ -16,12 +128,32 @@ [RT #16987] +2205. [bug] libbind: change #2119 broke thread support. [RT #16982] + 2203. [security] Query id generation was cryptographically weak. [RT # 16915] 2202. [security] The default acls for allow-query-cache and allow-recursion were not being applied. [RT #16960] +2200. [bug] The search for cached NSEC records was stopping to + early leading to excessive DLV queries. [RT #16930] + +2199. [bug] win32: don't call WSAStartup() while loading dlls. + [RT #16911] + +2198. [bug] win32: RegCloseKey() could be called when + RegOpenKeyEx() failed. [RT #16911] + +2197. [bug] Add INSIST to catch negative responses which are + not setting the event result code appropriately. + [RT #16909] + +2196. [port] win32: yield processor while waiting for once to + to complete. [RT #16958] + +2194. [bug] Close journal before calling 'done' in xfrin.c. + 2193. [port] win32: BINDInstall.exe is now linked statically. [RT #16906] @@ -29,6 +161,145 @@ Studio's redistributable dlls if building with Visual Stdio 2005 or later. +2189. [bug] Handle socket() returning EINTR. [RT #15949] + +2188. [contrib] queryperf: autoconf changes to make the search for + libresolv or libbind more robust. [RT #16299] + +2187. [bug] query_addds(), query_addwildcardproof() and + query_addnxrrsetnsec() should take a version + arguement. [RT #16368] + +2186. [port] cygwin: libbind: check for struct sockaddr_storage + independently of IPv6. [RT #16482] + +2185. [port] sunos: libbind: check for ssize_t, memmove() and + memchr(). [RT #16463] + +2183. [bug] dnssec-signzone didn't handle offline private keys + well. [RT #16832] + +2182. [bug] dns_dispatch_createtcp() and dispatch_createudp() + could return ISC_R_SUCCESS when they ran out of + memory. [RT #16365] + +2181. [port] sunos: libbind: add paths.h from BIND 8. [RT #16462] + +2180. [cleanup] Remove bit test from 'compress_test' as they + are no longer needed. [RT #16497] + +2178. [bug] 'rndc reload' of a slave or stub zone resulted in + a reference leak. [RT #16867] + +2177. [bug] Array bounds overrun on read (rcodetext) at + debug level 10+. [RT #16798] + +2176. [contrib] dbus update to handle race condition during + initialisation (Bugzilla 235809). [RT #16842] + +2175. [bug] win32: windows broadcast condition variable support + was broken. [RT #16592] + +2174. [bug] I/O errors should always be fatal when reading + master files. [RT #16825] + +2173. [port] win32: When compiling with MSVS 2005 SP1 we also + need to ship Microsoft.VC80.MFCLOC. + +2171. [bug] Handle breaks in DNSSEC trust chains where the parent + servers are not DS aware (DS queries to the parent + return a referral to the child). + +2170. [func] Add acache processing to test suite. [RT #16711] + +2169. [bug] host, nslookup: when reporting NXDOMAIN report the + given name and not the last name searched for. + [RT #16763] + +2168. [bug] nsupdate: in non-interactive mode treat syntax errors + as fatal errors. [RT #16785] + +2167. [bug] When re-using a automatic zone named failed to + attach it to the new view. [RT #16786] + +2166. [bug] When running in batch mode, dig could misinterpret + a server address as a name to be looked up, causing + unexpected output. [RT #16743] + +2164. [bug] The code to determine how named-checkzone / + named-compilezone was called failed under windows. + [RT #16764] + +2162. [func] Allow "rrset-order fixed" to be disabled at compile + time. [RT #16665] + +2161. [bug] 'rndc flush' could report a false success. [RT #16698] + +2160. [bug] libisc wasn't handling NULL ifa_addr pointers returned + from getifaddrs(). [RT #16708] + +2159. [bug] Array bounds overrun in acache processing. [RT #16710] + +2158. [bug] ns_client_isself() failed to initialise key + leading to a REQUIRE failure. [RT #16688] + +2156. [bug] Fix node reference leaks in lookup.c:lookup_find(), + resolver.c:validated() and resolver.c:cache_name(). + Fix a memory leak in rbtdb.c:free_noqname(). + Make lookup.c:lookup_find() robust against + event leaks. [RT #16685] + +2155. [contrib] SQLite sdb module from jaboydjr@netwalk.com. + [RT #16694] + +2153. [bug] nsupdate could leak memory. [RT #16691] + +2152. [cleanup] Use sizeof(buf) instead of fixed number in + dighost.c:get_trusted_key(). [RT #16678] + +2151. [bug] Missing newline in usage message for journalprint. + [RT #16679] + +2150. [bug] 'rrset-order cyclic' uniformly distribute the + starting point for the first response for a given + RRset. [RT #16655] + +2149. [bug] isc_mem_checkdestroyed() failed to abort on + if there were still active memory contexts. + [RT #16672] + +2147. [bug] libbind: remove potential buffer overflow from + hmac_link.c. [RT #16437] + +2146. [cleanup] Silence Linux's spurious "obsolete setsockopt + SO_BSDCOMPAT" message. [RT #16641] + +2145. [bug] Check DS/DLV digest lengths for known digests. + [RT #16622] + +2144. [cleanup] Suppress logging of SERVFAIL from forwarders. + [RT #16619] + +2143. [bug] We failed to restart the IPv6 client when the + kernel failed to return the destination the + packet was sent to. [RT #16613] + +2142. [bug] Handle master files with a modification time that + matches the epoch. [RT# 16612] + +2141. [bug] dig/host should not be setting IDN_ASCCHECK (IDN + equivalent of LDH checks). [RT #16609] + +2140. [bug] libbind: missing unlock on pthread_key_create() + failures. [RT #16654] + +2139. [bug] dns_view_find() was being called with wrong type + in adb.c. [RT #16670] + +2119. [compat] libbind: allow res_init() to succeed enough to + return the default domain even if it was unable + to allocate memory. + --- 9.4.1 released --- 2172. [bug] query_addsoa() was being called with a non zone db. @@ -524,7 +795,7 @@ hex strings with comments. [RT #15814] 1974. [doc] List each of the zone types and associated zone - options seperately in the ARM. + options separately in the ARM. 1973. [func] TSIG HMACSHA1, HMACSHA224, HMACSHA256, HMACSHA384 and HMACSHA512 support. [RT #13606] @@ -551,7 +822,7 @@ 1965. [func] Suppress spurious "recusion requested but not available" warning with 'dig +qr'. [RT #15780]. -1964. [func] Seperate out MX and SRV to CNAME checks. [RT #15723] +1964. [func] Separate out MX and SRV to CNAME checks. [RT #15723] 1963. [port] Tru64 4.0E doesn't support send() and recv(). [RT #15586] @@ -771,7 +1042,7 @@ 1898. [bug] Extend ISC_SOCKADDR_FORMATSIZE and ISC_NETADDR_FORMATSIZE to allow for scope details. -1897. [func] x86 and x86_64 now have seperate atomic locking +1897. [func] x86 and x86_64 now have separate atomic locking implementations. 1896. [bug] Recursive clients soft quota support wasn't working @@ -825,7 +1096,7 @@ [RT #14892] 1878. [func] Detect duplicates of UDP queries we are recursing on - and drop them. New stats category "duplicates". + and drop them. New stats category "duplicate". [RT #2471] 1877. [bug] Fix unreasonably low quantum on call to @@ -1769,7 +2040,7 @@ [RT #6427] 1555. [func] 'rrset-order cyclic' no longer has a random starting - point. [RT #7572] + point per query. [RT #7572] 1554. [bug] dig, host, nslookup failed when no nameservers were specified in /etc/resolv.conf. [RT #8232] @@ -6250,7 +6521,7 @@ and has been removed. 170. [cleanup] Remove inter server consistancy checks from zone, - these should return as a seperate module in 9.1. + these should return as a separate module in 9.1. dns_zone_checkservers(), dns_zone_checkparents(), dns_zone_checkchildren(), dns_zone_checkglue(). ==== //depot/projects/hammer/contrib/bind9/COPYRIGHT#5 (text+ko) ==== @@ -1,7 +1,7 @@ Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") Copyright (C) 1996-2003 Internet Software Consortium. -Permission to use, copy, modify, and distribute this software for any +Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. @@ -13,7 +13,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -$Id: COPYRIGHT,v 1.9.18.3 2007/01/08 02:41:59 marka Exp $ +$Id: COPYRIGHT,v 1.9.18.4 2007/08/28 07:19:54 tbox Exp $ Portions Copyright (C) 1996-2001 Nominum, Inc. ==== //depot/projects/hammer/contrib/bind9/FAQ#7 (text+ko) ==== @@ -4,97 +4,71 @@ Copyright © 2000-2003 Internet Software Consortium. -------------------------------------------------------------------------------- +----------------------------------------------------------------------- -Q: Why doesn't -u work on Linux 2.2.x when I build with --enable-threads? +1. Compilation and Installation Questions -A: Linux threads do not fully implement the Posix threads (pthreads) standard. In - particular, setuid() operates only on the current thread, not the full process. - Because of this limitation, BIND 9 cannot use setuid() on Linux as it can on - all other supported platforms. setuid() cannot be called before creating - threads, since the server does not start listening on reserved ports until - after threads have started. +Q: I'm trying to compile BIND 9, and "make" is failing due to files not + being found. Why? - In the 2.2.18 or 2.3.99-pre3 and newer kernels, the ability to preserve - capabilities across a setuid() call is present. This allows BIND 9 to call - setuid() early, while retaining the ability to bind reserved ports. This is a - Linux-specific hack. +A: Using a parallel or distributed "make" to build BIND 9 is not + supported, and doesn't work. If you are using one of these, use normal + make or gmake instead. - On a 2.2 kernel, BIND 9 does drop many root privileges, so it should be less of - a security risk than a root process that has not dropped privileges. +Q: Isn't "make install" supposed to generate a default named.conf? - If Linux threads ever work correctly, this restriction will go away. +A: Short Answer: No. - Configuring BIND9 with the --disable-threads option (the default) causes a - non-threaded version to be built, which will allow -u to be used. + Long Answer: There really isn't a default configuration which fits any + site perfectly. There are lots of decisions that need to be made and + there is no consensus on what the defaults should be. For example + FreeBSD uses /etc/namedb as the location where the configuration files + for named are stored. Others use /var/named. -Q: Why do I get the following errors: + What addresses to listen on? For a laptop on the move a lot you may + only want to listen on the loop back interfaces. - general: errno2result.c:109: unexpected error: - general: unable to convert errno to isc_result: 14: Bad address - client: UDP client handler shutting down due to fatal receive error: unexpected error + Who do you offer recursive service to? Is there are firewall to + consider? If so is it stateless or stateful. Are you directly on the + Internet? Are you on a private network? Are you on a NAT'd network? The + answers to all these questions change how you configure even a caching + name server. -A: This is the result of a Linux kernel bug. +2. Configuration and Setup Questions - See: http://marc.theaimsgroup.com/?l=linux-netdev&m=113081708031466&w=2 +Q: Why does named log the warning message "no TTL specified - using SOA + MINTTL instead"? -Q: Why does named log the warning message "no TTL specified - using SOA MINTTL - instead"? - -A: Your zone file is illegal according to RFC1035. It must either have a line - like: +A: Your zone file is illegal according to RFC1035. It must either have a + line like: $TTL 86400 - at the beginning, or the first record in it must have a TTL field, like the - "84600" in this example: + at the beginning, or the first record in it must have a TTL field, like + the "84600" in this example: example.com. 86400 IN SOA ns hostmaster ( 1 3600 1800 1814400 3600 ) -Q: Why do I see 5 (or more) copies of named on Linux? +Q: Why do I get errors like "dns_zone_load: zone foo/IN: loading master + file bar: ran out of space"? -A: Linux threads each show up as a process under ps. The approximate number of - threads running is n+4, where n is the number of CPUs. Note that the amount of - memory used is not cumulative; if each process is using 10M of memory, only a - total of 10M is used. - - Newer versions of Linux's ps command hide the individual threads and require -L - to display them. - -Q: Why does BIND 9 log "permission denied" errors accessing its configuration - files or zones on my Linux system even though it is running as root? +A: This is often caused by TXT records with missing close quotes. Check + that all TXT records containing quoted strings have both open and close + quotes. -A: On Linux, BIND 9 drops most of its root privileges on startup. This including - the privilege to open files owned by other users. Therefore, if the server is - running as root, the configuration files and zone files should also be owned by - root. - -Q: Why do I get errors like "dns_zone_load: zone foo/IN: loading master file bar: - ran out of space"? - -A: This is often caused by TXT records with missing close quotes. Check that all - TXT records containing quoted strings have both open and close quotes. - -Q: How do I produce a usable core file from a multi-threaded named on Linux? - -A: If the Linux kernel is 2.4.7 or newer, multi-threaded core dumps are usable - (that is, the correct thread is dumped). Otherwise, if using a 2.2 kernel, - apply the kernel patch found in contrib/linux/coredump-patch and rebuild the - kernel. This patch will cause multi-threaded programs to dump the correct - thread. - Q: How do I restrict people from looking up the server version? -A: Put a "version" option containing something other than the real version in the - "options" section of named.conf. Note doing this will not prevent attacks and - may impede people trying to diagnose problems with your server. Also it is - possible to "fingerprint" nameservers to determine their version. +A: Put a "version" option containing something other than the real version + in the "options" section of named.conf. Note doing this will not + prevent attacks and may impede people trying to diagnose problems with + your server. Also it is possible to "fingerprint" nameservers to + determine their version. Q: How do I restrict only remote users from looking up the server version? -A: The following view statement will intercept lookups as the internal view that - holds the version information will be matched last. The caveats of the previous - answer still apply, of course. +A: The following view statement will intercept lookups as the internal + view that holds the version information will be matched last. The + caveats of the previous answer still apply, of course. view "chaos" chaos { match-clients { ; }; @@ -105,121 +79,47 @@ }; }; -Q: What do "no source of entropy found" or "could not open entropy source foo" - mean? +Q: What do "no source of entropy found" or "could not open entropy source + foo" mean? -A: The server requires a source of entropy to perform certain operations, mostly - DNSSEC related. These messages indicate that you have no source of entropy. On - systems with /dev/random or an equivalent, it is used by default. A source of - entropy can also be defined using the random-device option in named.conf. +A: The server requires a source of entropy to perform certain operations, + mostly DNSSEC related. These messages indicate that you have no source + of entropy. On systems with /dev/random or an equivalent, it is used by + default. A source of entropy can also be defined using the + random-device option in named.conf. -Q: I installed BIND 9 and restarted named, but it's still BIND 8. Why? +Q: I'm trying to use TSIG to authenticate dynamic updates or zone + transfers. I'm sure I have the keys set up correctly, but the server is + rejecting the TSIG. Why? -A: BIND 9 is installed under /usr/local by default. BIND 8 is often installed - under /usr. Check that the correct named is running. - -Q: I'm trying to use TSIG to authenticate dynamic updates or zone transfers. I'm - sure I have the keys set up correctly, but the server is rejecting the TSIG. - Why? +A: This may be a clock skew problem. Check that the the clocks on the + client and server are properly synchronised (e.g., using ntp). -A: This may be a clock skew problem. Check that the the clocks on the client and - server are properly synchronised (e.g., using ntp). - -Q: I'm trying to compile BIND 9, and "make" is failing due to files not being - found. Why? - -A: Using a parallel or distributed "make" to build BIND 9 is not supported, and - doesn't work. If you are using one of these, use normal make or gmake instead. - -Q: I have a BIND 9 master and a BIND 8.2.3 slave, and the master is logging error - messages like "notify to 10.0.0.1#53 failed: unexpected end of input". What's - wrong? - -A: This error message is caused by a known bug in BIND 8.2.3 and is fixed in BIND - 8.2.4. It can be safely ignored - the notify has been acted on by the slave - despite the error message. - -Q: I keep getting log messages like the following. Why? - - Dec 4 23:47:59 client 10.0.0.1#1355: updating zone 'example.com/IN': update - failed: 'RRset exists (value dependent)' prerequisite not satisfied (NXRRSET) - -A: DNS updates allow the update request to test to see if certain conditions are - met prior to proceeding with the update. The message above is saying that - conditions were not met and the update is not proceeding. See doc/rfc/ - rfc2136.txt for more details on prerequisites. - -Q: I keep getting log messages like the following. Why? - - Jun 21 12:00:00.000 client 10.0.0.1#1234: update denied - -A: Someone is trying to update your DNS data using the RFC2136 Dynamic Update - protocol. Windows 2000 machines have a habit of sending dynamic update requests - to DNS servers without being specifically configured to do so. If the update - requests are coming from a Windows 2000 machine, see http:// - support.microsoft.com/support/kb/articles/q246/8/04.asp for information about - how to turn them off. - Q: I see a log message like the following. Why? couldn't open pid file '/var/run/named.pid': Permission denied -A: You are most likely running named as a non-root user, and that user does not - have permission to write in /var/run. The common ways of fixing this are to - create a /var/run/named directory owned by the named user and set pid-file to " - /var/run/named/named.pid", or set pid-file to "named.pid", which will put the - file in the directory specified by the directory option (which, in this case, - must be writable by the named user). +A: You are most likely running named as a non-root user, and that user + does not have permission to write in /var/run. The common ways of + fixing this are to create a /var/run/named directory owned by the named + user and set pid-file to "/var/run/named/named.pid", or set pid-file to + "named.pid", which will put the file in the directory specified by the + directory option (which, in this case, must be writable by the named + user). -Q: When I do a "dig . ns", many of the A records for the root servers are missing. - Why? +Q: I can query the nameserver from the nameserver but not from other + machines. Why? -A: This is normal and harmless. It is a somewhat confusing side effect of the way - BIND 9 does RFC2181 trust ranking and of the efforts BIND 9 makes to avoid - promoting glue into answers. +A: This is usually the result of the firewall configuration stopping the + queries and / or the replies. - When BIND 9 first starts up and primes its cache, it receives the root server - addresses as additional data in an authoritative response from a root server, - and these records are eligible for inclusion as additional data in responses. - Subsequently it receives a subset of the root server addresses as additional - data in a non-authoritative (referral) response from a root server. This causes - the addresses to now be considered non-authoritative (glue) data, which is not - eligible for inclusion in responses. +Q: How can I make a server a slave for both an internal and an external + view at the same time? When I tried, both views on the slave were + transferred from the same view on the master. - The server does have a complete set of root server addresses cached at all - times, it just may not include all of them as additional data, depending on - whether they were last received as answers or as glue. You can always look up - the addresses with explicit queries like "dig a.root-servers.net A". - -Q: Zone transfers from my BIND 9 master to my Windows 2000 slave fail. Why? +A: You will need to give the master and slave multiple IP addresses and + use those to make sure you reach the correct view on the other machine. -A: This may be caused by a bug in the Windows 2000 DNS server where DNS messages - larger than 16K are not handled properly. This can be worked around by setting - the option "transfer-format one-answer;". Also check whether your zone contains - domain names with embedded spaces or other special characters, like "John\ - 032Doe\213s\032Computer", since such names have been known to cause Windows - 2000 slaves to incorrectly reject the zone. - -Q: Why don't my zones reload when I do an "rndc reload" or SIGHUP? - >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 4 04:11:36 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5EF516A41A; Tue, 4 Dec 2007 04:11: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 1640D16A418 for ; Tue, 4 Dec 2007 04:11:36 +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 0F8A913C4CC for ; Tue, 4 Dec 2007 04:11:36 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB44BZEk016723 for ; Tue, 4 Dec 2007 04:11:35 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB44BZCY016718 for perforce@freebsd.org; Tue, 4 Dec 2007 04:11:35 GMT (envelope-from sam@freebsd.org) Date: Tue, 4 Dec 2007 04:11:35 GMT Message-Id: <200712040411.lB44BZCY016718@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 130135 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2007 04:11:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=130135 Change 130135 by sam@sam_ebb on 2007/12/04 04:11:00 sync w/ vap code base Affected files ... .. //depot/projects/vap/sbin/ifconfig/ifconfig.8#5 edit .. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#9 edit Differences ... ==== //depot/projects/vap/sbin/ifconfig/ifconfig.8#5 (text+ko) ==== @@ -28,7 +28,7 @@ .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 .\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.144 2007/11/04 08:32:26 thompsa Exp $ .\" -.Dd October 31, 2007 +.Dd Deceober 3, 2007 .Dt IFCONFIG 8 .Os .Sh NAME @@ -580,6 +580,28 @@ Disabling the internal bridging is useful when traffic is to be processed with packet filtering. +.It Cm ampdu +When operating in 802.11n enable use of A-MPDU for transmitting +and receiving packets. +To disable use of A-MPDU +.Fl ampdu +can be used. +To control A-MPDU receive only use +.Cm ampdurx ; +for transmit only use +.Cm ampdutx . +.It Cm amsdu +When operating in 802.11n enable use of A-MSDU for transmitting +and receiving packets. +Note that A-MSDU receive must be supported but transmit support +is optional. +To disable use of A-MSDU +.Fl amsdu +can be used. +To enable A-MSDU receive use +.Cm amsdurx ; +for transmit only use +.Cm amsdutx . .It Cm authmode Ar mode Set the desired authentication mode in infrastructure mode. Not all adaptors support all modes. @@ -755,18 +777,33 @@ of the extension channel by appending ``+'' or ``-'' for above and below, respectively; e.g. ``2437:ht/40+'' specifies 40MHz wide HT operation with the center channel at frequency 2437 and the extension channel above. -.It Cm doth -Enable inclusion of an 802.11h country information element in beacon -frames transmitted when operating as an access point. -By default 802.11h is enabled if the device is capable. -To disable 802.11h use -.Fl doth . +.It Cm country Ar code +Set the country code for regulatory constraints. +The +.Ar code +is either a 2-letter ISO country code specification or the numeric +mapping of the code. .It Cm deftxkey Ar index Set the default key to use for transmission. Typically this is only set when using WEP encryption. The .Cm weptxkey is an alias for this request; it is provided for backwards compatibility. +.It Cm dfs +Enable DFS support on the access point. +When DFS is enabled channels marked as requiring DFS follow +the DFS specification for monitoring and handling radar events. +To disable DFS support, use +.Fl dfs . +.It Cm doth +Enable 802.11h support on the access point. +When 802.11h is enabled management frames indicate spectrum management +in the capabilities and include country and +power constraint information elements. +Also, channel changes are handled in a staged fashion +with Channel Switch Announcements (CSA). +To disable 802.11h support, use +.Fl doth . .It Cm dtimperiod Ar period Set the DTIM @@ -794,6 +831,31 @@ command to identify the channels where turbo mode may be used. To disable Dynamic Turbo mode use .Fl dturbo . +.It Cm dwds +Enable Dynamic Wireless Distribution System (DWDS) support on +the access point or station. +When DWDS is enabled on an ap, stations that associate and pass 4-address +frames generate ``DWDS discovery events'' to a user application +that can create a WDS interface associated with that station. +Once plumbed into the system this interface establishes a conduit +by which encapsulated wireless traffic can be passed. +When DWDS is enabled on a station, 4-address frames are permitted to +flow between the station and the peer access point. +To disable DWDS support, use +.Fl dwds . +.It Cm ff +Enable the use of Atheros Fast Frames when communicating with +another Fast Frames-capable station. +Fast Frames are an encapsulation technique by which two 802.3 +frames are transmitted in a single 802.11 frame. +This can noticeably improve throughput but requires that the +receiving station understand how to decapsulate the frame. +Fast frame use is negotiated using the Atheros 802.11 vendor-specific +protocol extension so enabling use is safe when communicating with +non-Atheros devices. +By default, use of fast frames is enabled if the device is capable. +To explicitly disable fast frames, use +.Fl ff . .It Cm fragthreshold Ar length Set the threshold for which transmitted frames are broken into fragments. The @@ -816,19 +878,51 @@ undirected probe request frames are answered. To re-enable the broadcast of the SSID etc., use .Fl hidessid . -.It Cm ff -Enable the use of Atheros Fast Frames when communicating with -another Fast Frames-capable station. -Fast Frames are an encapsulation technique by which two 802.3 -frames are transmitted in a single 802.11 frame. -This can noticeably improve throughput but requires that the -receiving station understand how to decapsulate the frame. -Fast frame use is negotiated using the Atheros 802.11 vendor-specific -protocol extension so enabling use is safe when communicating with -non-Atheros devices. -By default, use of fast frames is enabled if the device is capable. -To explicitly disable fast frames, use -.Fl ff . +.It Cm ht +When operating with 802.11n enable HT operation (both HT20 and HT40). +To disable this facility use +.Fl ht . +.It Cm ht20 +When operating with 802.11n enable only HT20 operation +(HT over 20MHz wide channels). +Disabling HT20 use is done with +.Fl ht20 +and is equivalent to specifying +.Fl ht . +.It Cm htcompat +When operating in 802.11n include Vendor Information Elements +in management frames for compatibility with pre-Draft 1.10 +drivers and devices. +To disable this facility use +.Fl htcompat . +.It Cm htprotmode Ar technique +For interfaces operating in 802.11n, use the specified +.Ar technique +for protecting frames in a mixed HT/non-HT network. +The set of valid techniques is +.Cm off , +and +.Cm rts +(RTS/CTS). +Technique names are case insensitive. +.It Cm inact +When operating as an access point or in adhoc mode, check for +inactive stations and when the inactivity limit reaches a +threshold probe the station to see if its still present. +Inactive stations that do not respond to probes are dropped +(disassociated when operating as an access point). +Inactivity processing is done by default, to disable it use +.Fl inact . +.It Cm indoor +Specify the physical location of the wireless device for +regulatory purpose. +This defines the location included in any 802.11h country information +element included in beacons frames transmit when operating as an +access point. +When operating in station mode this setting is ignored if the +access point provides the information in its beacon frame. +See also +.Cm outdoor . .It Cm list active Display the list of channels available for use taking into account any restrictions set with the @@ -913,7 +1007,11 @@ using extended transmit rates. .It Li H High Throughput (HT). -Indicates that the station is using MCS to send/receive frames. +Indicates that the station is using HT transmit rates. +If a `+' follows immediately after then the station associated +using deprecated mechanisms supported only when +.Cm htcompat +is enabled. .It Li P Power Save. Indicates that the station is operating in power save mode. @@ -922,6 +1020,14 @@ Indicates that the station is using QoS encapsulation for data frame. QoS encapsulation is enabled only when WME mode is enabled. +.It Li T +Transitional Security Network (TSN). +Indicates that the station associated using TSN; see also +.Cm tsn +below. +.It Li W +Wi-Fi Protected Setup (WPS). +Indicates that the station associated using WPS. .El .Pp By default information elements received from associated stations @@ -942,6 +1048,16 @@ This rate should be valid for the current operating conditions; if an invalid rate is specified drivers are free to chose an appropriate rate. +.It Cm outdoor +Specify the physical location of the wireless device for +regulatory purpose. +This defines the location included in any 802.11h country information +element included in beacons frames transmit when operating as an +access point. +When operating in station mode this setting is ignored if the +access point provides the information in its beacon frame. +See also +.Cm indoor . .It Cm powersave Enable powersave operation. When operating as a client, the station will conserve power by @@ -977,6 +1093,17 @@ permitted to associate). To allow both 11g and 11b-only stations to associate, use .Fl pureg . +.It Cm puren +When operating as an access point in 802.11n mode allow only +HT-capable stations to associate (legacy stations are not +permitted to associate). +To allow both HT and legacy stations to associate, use +.Fl puren . +.It Cm regdomain Ar code +Set the regulatory domain code for regulatory constraints. +The +.Ar code +is either a SKU string or the numeric mapping of the string. .It Cm roaming Ar mode When operating as a station, control how the system will behave when communication with the current access point @@ -996,12 +1123,11 @@ Manual mode is used by applications such as .Xr wpa_supplicant 8 that want to control the selection of an access point. -.It Cm roam:rssi11a Ar rssi -Set the threshold for controlling roaming when operating in an -802.11a BSS. +.It Cm roam:rssi Ar rssi +Set the threshold for controlling roaming when operating as a station. The .Ar rssi -parameter specifies the receive signal strength in dBm units +parameter specifies the receive signal strength in .5 dBm units at which roaming should be considered. If the current rssi drops below this setting and background scanning is enabled, then the system will check if a more desirable access point is @@ -1014,30 +1140,12 @@ By default .Ar rssi is set to 7 dBm. -.It Cm roam:rssi11b Ar rssi -Set the threshold for controlling roaming when operating in an -802.11b-only BSS. -See -.Cm roam:rssi11a -for a description of this parameter. -By default -.Ar rssi -is set to 7 dBm. -.It Cm roam:rssi11g Ar rssi -Set the threshold for controlling roaming when operating in a -(mixed) 802.11g BSS. -See -.Cm roam:rssi11a -for a description of this parameter. -By default -.Ar rssi -is set to 7 dBm. -.It Cm roam:rate11a Ar rate -Set the threshold for controlling roaming when operating in an -802.11a BSS. +.It Cm roam:rate Ar rate +Set the threshold for controlling roaming when operating as a station. The .Ar rate -parameter specifies the transmit rate in megabits +parameter specifies the legacy transmit rate in megabits, or the +MCS when operating with HT enabled, at which roaming should be considered. If the current transmit rate drops below this setting and background scanning is enabled, then the system will check if a more desirable access point is @@ -1049,25 +1157,9 @@ any selection occurs. By default .Ar rate -is set to 12 Mb/s. -.It Cm roam:rate11b Ar rate -Set the threshold for controlling roaming when operating in an -802.11b-only BSS. -See -.Cm roam:rate11a -for a description of this parameter. -By default -.Ar rate -is set to 1 Mb/s. -.It Cm roam:rate11g Ar rate -Set the threshold for controlling roaming when operating in a -(mixed) 802.11g BSS. -See -.Cm roam:rate11a -for a description of this parameter. -By default -.Ar rate -is set to 5 Mb/s. +is set to 12 Mb/s for 802.11a, +1 Mb/s for 802.11b, and +5.5 Mb/s for 802.11g. .It Cm rtsthreshold Ar length Set the threshold for which transmitted frames are preceded by transmission of an @@ -1086,6 +1178,13 @@ .Cm - disables transmission of RTS frames. Not all adaptors support setting the RTS threshold. +.It Cm shortgi +Enable use of Short Guard Interval when operating in 802.11n +on an HT channel. +NB: this currently enables Short GI on both HT40 and HT20 channels; +this will be split out shortly. +To disable Short GI use +.Fl shortgi . .It Cm ssid Ar ssid Set the desired Service Set Identifier (aka network name). The SSID is a string up to 32 characters @@ -1192,6 +1291,11 @@ As such it only seems to be meaningful to identical or virtually identical equipment. Setting the station name is identical in syntax to setting the SSID. +.It Cm tsn +When operating as an access point with WPA/802.11i allow legacy +stations to associate using static key WEP and open authentication. +To disallow legacy station use of WEP, use +.Fl tsn . .It Cm txpower Ar power Set the power used to transmit frames. The ==== //depot/projects/vap/sbin/ifconfig/ifieee80211.c#9 (text+ko) ==== @@ -77,9 +77,8 @@ #include #include -#include -#include #include +#include #include #include @@ -95,6 +94,21 @@ #include "ifconfig.h" +#ifndef IEEE80211_FIXED_RATE_NONE +#define IEEE80211_FIXED_RATE_NONE 0xff +#endif +/* XXX need these publicly defined or similar */ +#ifndef IEEE80211_NODE_AUTH +#define IEEE80211_NODE_AUTH 0x0001 /* authorized for data */ +#define IEEE80211_NODE_QOS 0x0002 /* QoS enabled */ +#define IEEE80211_NODE_ERP 0x0004 /* ERP enabled */ +#define IEEE80211_NODE_PWR_MGT 0x0010 /* power save mode enabled */ +#define IEEE80211_NODE_HT 0x0040 /* HT enabled */ +#define IEEE80211_NODE_HTCOMPAT 0x0080 /* HT setup w/ vendor OUI's */ +#define IEEE80211_NODE_WPS 0x0100 /* WPS association */ +#define IEEE80211_NODE_TSN 0x0200 /* TSN association */ +#endif + #define MAXCOL 78 static int col; static char spacer; @@ -103,6 +117,50 @@ static void LINE_BREAK(void); static void LINE_CHECK(const char *fmt, ...); +#define REQ_ECM 0x01000000 /* enable if ECM set */ +#define REQ_OUTDOOR 0x02000000 /* enable for outdoor operation */ +#define REQ_FLAGS 0xff000000 /* private flags, don't pass to os */ + +struct freqband { + uint16_t freqStart; /* starting frequency (MHz) */ + uint16_t freqEnd; /* ending frequency (MHz) */ + uint8_t chanWidth; /* channel width (MHz) */ + uint8_t chanSep; /* channel sepaaration (MHz) */ + uint32_t flags; /* common operational constraints */ +}; +struct netband { + const struct freqband *b; /* channel list description */ + uint8_t maxPower; /* regulatory cap on tx power (dBm) */ + uint8_t maxPowerDFS; /* regulatory cap w/ DFS (dBm) */ + uint32_t flags; /* net80211 channel flags */ +}; + +#define MAXFBANDS 10 /* XXX could define per netband */ + +struct regdomain { + enum RegdomainCode sku; /* regdomain code/SKU */ + const char *name; /* printable name */ + enum ISOCountryCode cc; /* country code for 1-1/default map */ + + struct netband bands_11b[MAXFBANDS]; /* 11b operation */ + struct netband bands_11g[MAXFBANDS]; /* 11g operation */ + struct netband bands_11a[MAXFBANDS]; /* 11a operation */ + struct netband bands_11ng[MAXFBANDS]; /* 11ng operation */ + struct netband bands_11na[MAXFBANDS]; /* 11na operation */ +}; + +struct countrycode { + enum ISOCountryCode code; + const struct regdomain *rd; + const char* isoname; + const char* name; +}; + +static const char *modename[] = { + "auto", "11a", "11b", "11g", "fh", "turboA", "turboG", + "sturbo", "11na", "11ng" +}; + /* XXX need max array size */ static const int htrates[16] = { 13, /* IFM_IEEE80211_MCS0 */ @@ -123,18 +181,32 @@ 260, /* IFM_IEEE80211_MCS15 */ }; +static void set80211(int s, int type, int val, int len, void *data); static int get80211(int s, int type, void *data, int len); static int get80211len(int s, int type, void *data, int len, int *plen); static int get80211val(int s, int type, int *val); -static void set80211(int s, int type, int val, int len, void *data); static const char *get_string(const char *val, const char *sep, u_int8_t *buf, int *lenp); static void print_string(const u_int8_t *buf, int len); +static void print_regdomain(const struct ieee80211_regdomain *, int); +static void print_channels(int, const struct ieee80211req_chaninfo *, + int allchans, int verbose); +static void regdomain_makechannels(struct ieee80211_regdomain_req *, + const struct ieee80211_devcaps_req *); +static const struct regdomain *regdomain_lookupbyrd(enum RegdomainCode sku); +static const struct regdomain *regdomain_lookupbyname(const char *name); +static const struct countrycode *countrycode_lookupbycc(enum ISOCountryCode); +static const struct countrycode *countrycode_lookupbyname(const char *); static struct ieee80211req_chaninfo chaninfo; -static struct ifmediareq *ifmr; +static struct ieee80211_regdomain regdomain; +static struct ieee80211_roamparams_req roamparams; +static int gotroam = 0; +static struct ieee80211_txparams_req txparams; +static int gottxparams = 0; static struct ieee80211_channel curchan; static int gotcurchan = 0; +static struct ifmediareq *ifmr; static int htconf = 0; static int gothtconf = 0; @@ -159,7 +231,6 @@ return; if (get80211(s, IEEE80211_IOC_CHANINFO, &chaninfo, sizeof(chaninfo)) < 0) errx(1, "unable to get channel information"); - ifmr = ifmedia_getstate(s); gethtconf(s); } @@ -308,6 +379,160 @@ return &curchan; } +static enum ieee80211_phymode +chan2mode(const struct ieee80211_channel *c) +{ + if (IEEE80211_IS_CHAN_HTA(c)) + return IEEE80211_MODE_11NA; + if (IEEE80211_IS_CHAN_HTG(c)) + return IEEE80211_MODE_11NG; + if (IEEE80211_IS_CHAN_108A(c)) + return IEEE80211_MODE_TURBO_A; + if (IEEE80211_IS_CHAN_108G(c)) + return IEEE80211_MODE_TURBO_G; + if (IEEE80211_IS_CHAN_ST(c)) + return IEEE80211_MODE_STURBO_A; + if (IEEE80211_IS_CHAN_FHSS(c)) + return IEEE80211_MODE_FH; + if (IEEE80211_IS_CHAN_A(c)) + return IEEE80211_MODE_11A; + if (IEEE80211_IS_CHAN_ANYG(c)) + return IEEE80211_MODE_11G; + if (IEEE80211_IS_CHAN_B(c)) + return IEEE80211_MODE_11B; + return IEEE80211_MODE_AUTO; +} + +static void +getroam(int s) +{ + if (gotroam) + return; + if (get80211(s, IEEE80211_IOC_ROAM, + &roamparams, sizeof(roamparams)) < 0) + errx(1, "unable to get roaming parameters"); + gotroam = 1; +} + +static void +setroam_cb(int s, void *arg) +{ + struct ieee80211_roamparams_req *roam = arg; + set80211(s, IEEE80211_IOC_ROAM, 0, sizeof(*roam), roam); +} + +static void +gettxparams(int s) +{ + if (gottxparams) + return; + if (get80211(s, IEEE80211_IOC_TXPARAMS, + &txparams, sizeof(txparams)) < 0) + errx(1, "unable to get transmit parameters"); + gottxparams = 1; +} + +static void +settxparams_cb(int s, void *arg) +{ + struct ieee80211_txparams_req *txp = arg; + set80211(s, IEEE80211_IOC_TXPARAMS, 0, sizeof(*txp), txp); +} + +static void +getregdomain(int s) +{ + static int gotrd = 0; + + if (gotrd) + return; + if (get80211(s, IEEE80211_IOC_REGDOMAIN, + ®domain, sizeof(regdomain)) < 0) + errx(1, "unable to get regulatory domain info"); + gotrd = 1; +} + +static void +getdevcaps(int s, struct ieee80211_devcaps_req *dc) +{ + if (get80211(s, IEEE80211_IOC_DEVCAPS, dc, sizeof(*dc)) < 0) + errx(1, "unable to get device capabilities"); +} + +static void +setregdomain_cb(int s, void *arg) +{ + struct ieee80211_regdomain_req req; + struct ieee80211_regdomain *rd = arg; + struct ieee80211_devcaps_req dc; + + if (rd->country != 0) { + const struct countrycode *cc; + /* + * Check current country seting to make sure it's + * compatible with the new regdomain. If not, then + * override it with any default country for this + * SKU. If we cannot arrange a match, then abort. + */ + cc = countrycode_lookupbycc(rd->country); + if (cc == NULL) + errx(1, "unknown ISO country code %d", rd->country); + if (cc->rd->sku != rd->regdomain) { + const struct regdomain *rp; + /* + * Check if country is incompatible with regdomain. + * To enable multiple regdomains for a country code + * we permit a mismatch between the regdomain and + * the country's associated regdomain when the + * regdomain is setup w/o a default country. For + * example, US is bound to the FCC regdomain but + * we allow US to be combined with FCC3 because FCC3 + * has not default country. This allows bogus + * combinations like FCC3+DK which are resolved when + * constructing the channel list by deferring to the + * regdomain to construct the channel list. + */ + rp = regdomain_lookupbyrd(rd->regdomain); + if (rp == NULL) + errx(1, "country %s (%s) is not usable with " + "regdomain %d", cc->isoname, cc->name, + rd->regdomain); + else if (rp->cc != 0 && rp->cc != cc->code) + errx(1, "country %s (%s) is not usable with " + "regdomain %s", cc->isoname, cc->name, + rp->name); + } + } + req.rd = *rd; + /* + * Fetch the device capabilities and calculate the + * full set of netbands for which we request a new + * channel list be constructed. Once that's done we + * push the regdomain info + channel list to the kernel. + */ + getdevcaps(s, &dc); +#if 0 + if (verbose) { + printf("drivercaps: 0x%x\n", dc.dc_drivercaps); + printf("cryptocaps: 0x%x\n", dc.dc_cryptocaps); + printf("htcaps : 0x%x\n", dc.dc_htcaps); + memcpy(&chaninfo, &dc.dc_chaninfo, sizeof(chaninfo)); + print_channels(s, &dc.dc_chaninfo, 1/*allchans*/, 1/*verbose*/); + } +#endif + regdomain_makechannels(&req, &dc); + if (verbose) { + LINE_INIT(':'); + print_regdomain(rd, 1/*verbose*/); + LINE_BREAK(); + memcpy(&chaninfo, &req.chaninfo, sizeof(chaninfo)); + print_channels(s, &req.chaninfo, 1/*allchans*/, 1/*verbose*/); + } + if (req.chaninfo.ic_nchans == 0) + errx(1, "no channels calculated"); + set80211(s, IEEE80211_IOC_REGDOMAIN, 0, sizeof(req), &req); +} + static int ieee80211_mhz2ieee(int freq, int flags) { @@ -332,7 +557,7 @@ ssid = 0; len = strlen(val); - if (len > 2 && isdigit(val[0]) && val[1] == ':') { + if (len > 2 && isdigit((int)val[0]) && val[1] == ':') { ssid = atoi(val)-1; val += 2; } @@ -503,6 +728,26 @@ } static void +set80211chanswitch(const char *val, int d, int s, const struct afswtch *rafp) +{ + struct ieee80211_chanswitch_req csr; + int v, flags; + + memset(&csr, 0, sizeof(csr)); + getchaninfo(s); + v = atoi(val); + flags = getchannelflags(val, v); + if (v > 255) { /* treat as frequency */ + mapfreq(&csr.csa_chan, v, flags); + } else { + mapchan(&csr.csa_chan, v, flags); + } + csr.csa_mode = 1; + csr.csa_count = 5; + set80211(s, IEEE80211_IOC_CHANSWITCH, 0, sizeof(csr), &csr); +} + +static void set80211authmode(const char *val, int d, int s, const struct afswtch *rafp) { int mode; @@ -609,7 +854,7 @@ int len; u_int8_t data[IEEE80211_KEYBUF_SIZE]; - if (isdigit(val[0]) && val[1] == ':') { + if (isdigit((int)val[0]) && val[1] == ':') { key = atoi(val)-1; val += 2; } @@ -635,7 +880,7 @@ set80211(s, IEEE80211_IOC_WEP, IEEE80211_WEP_ON, 0, NULL); - if (isdigit(val[0]) && val[1] == ':') { + if (isdigit((int)val[0]) && val[1] == ':') { txkey = val[0]-'0'-1; val += 2; @@ -1040,47 +1285,271 @@ set80211(s, IEEE80211_IOC_SCANVALID, atoi(val), 0, NULL); } -static -DECL_CMD_FUNC(set80211roamrssi11a, val, d) +/* + * Parse an optional trailing specification of which netbands + * to apply a parameter to. This is basically the same syntax + * as used for channels but you can concatenate to specify + * multiple. For example: + * 14:abg apply to 11a, 11b, and 11g + * 6:ht apply to 11na and 11ng + * We don't make a big effort to catch silly things; this is + * really a convenience mechanism. + */ +static int +getmodeflags(const char *val) { - set80211(s, IEEE80211_IOC_ROAM_RSSI_11A, atoi(val), 0, NULL); + const char *cp; + int flags; + + flags = 0; + + cp = strchr(val, ':'); + if (cp != NULL) { + for (cp++; isalpha((int) *cp); cp++) { + /* accept mixed case */ + int c = *cp; + if (isupper(c)) + c = tolower(c); + switch (c) { + case 'a': /* 802.11a */ + flags |= IEEE80211_CHAN_A; + break; + case 'b': /* 802.11b */ + flags |= IEEE80211_CHAN_B; + break; + case 'g': /* 802.11g */ + flags |= IEEE80211_CHAN_G; + break; + case 'h': /* ht = 802.11n */ + case 'n': /* 802.11n */ + flags |= IEEE80211_CHAN_HT; + break; + case 'd': /* dt = Atheros Dynamic Turbo */ + flags |= IEEE80211_CHAN_TURBO; + break; + case 't': /* ht, dt, st, t */ + /* dt and unadorned t specify Dynamic Turbo */ + if ((flags & (IEEE80211_CHAN_STURBO|IEEE80211_CHAN_HT)) == 0) + flags |= IEEE80211_CHAN_TURBO; + break; + case 's': /* st = Atheros Static Turbo */ + flags |= IEEE80211_CHAN_STURBO; + break; + default: + errx(-1, "%s: Invalid mode attribute %c\n", + val, *cp); + } + } + } + return flags; } +#define IEEE80211_CHAN_HTA (IEEE80211_CHAN_HT|IEEE80211_CHAN_5GHZ) +#define IEEE80211_CHAN_HTG (IEEE80211_CHAN_HT|IEEE80211_CHAN_2GHZ) + +#define _APPLY(_flags, _base, _param, _v) do { \ + if (_flags & IEEE80211_CHAN_HT) { \ + if ((_flags & (IEEE80211_CHAN_5GHZ|IEEE80211_CHAN_2GHZ)) == 0) {\ + _base.params[IEEE80211_MODE_11NA]._param = _v; \ + _base.params[IEEE80211_MODE_11NG]._param = _v; \ + } else if (_flags & IEEE80211_CHAN_5GHZ) \ + _base.params[IEEE80211_MODE_11NA]._param = _v; \ + else \ + _base.params[IEEE80211_MODE_11NG]._param = _v; \ + } \ + if (_flags & IEEE80211_CHAN_TURBO) { \ + if ((_flags & (IEEE80211_CHAN_5GHZ|IEEE80211_CHAN_2GHZ)) == 0) {\ + _base.params[IEEE80211_MODE_TURBO_A]._param = _v; \ + _base.params[IEEE80211_MODE_TURBO_G]._param = _v; \ + } else if (_flags & IEEE80211_CHAN_5GHZ) \ + _base.params[IEEE80211_MODE_TURBO_A]._param = _v; \ + else \ + _base.params[IEEE80211_MODE_TURBO_G]._param = _v; \ + } \ + if (_flags & IEEE80211_CHAN_STURBO) \ + _base.params[IEEE80211_MODE_STURBO_A]._param = _v; \ + if ((_flags & IEEE80211_CHAN_A) == IEEE80211_CHAN_A) \ + _base.params[IEEE80211_MODE_11A]._param = _v; \ + if ((_flags & IEEE80211_CHAN_G) == IEEE80211_CHAN_G) \ + _base.params[IEEE80211_MODE_11G]._param = _v; \ + if ((_flags & IEEE80211_CHAN_B) == IEEE80211_CHAN_B) \ + _base.params[IEEE80211_MODE_11B]._param = _v; \ +} while (0) +#define _APPLY1(_flags, _base, _param, _v) do { \ + if (_flags & IEEE80211_CHAN_HT) { \ + if (_flags & IEEE80211_CHAN_5GHZ) \ + _base.params[IEEE80211_MODE_11NA]._param = _v; \ + else \ + _base.params[IEEE80211_MODE_11NG]._param = _v; \ + } else if ((_flags & IEEE80211_CHAN_108A) == IEEE80211_CHAN_108A) \ + _base.params[IEEE80211_MODE_TURBO_A]._param = _v; \ + else if ((_flags & IEEE80211_CHAN_108G) == IEEE80211_CHAN_108G) \ + _base.params[IEEE80211_MODE_TURBO_G]._param = _v; \ + else if ((_flags & IEEE80211_CHAN_ST) == IEEE80211_CHAN_ST) \ + _base.params[IEEE80211_MODE_STURBO_A]._param = _v; \ + else if ((_flags & IEEE80211_CHAN_A) == IEEE80211_CHAN_A) \ + _base.params[IEEE80211_MODE_11A]._param = _v; \ + else if ((_flags & IEEE80211_CHAN_G) == IEEE80211_CHAN_G) \ + _base.params[IEEE80211_MODE_11G]._param = _v; \ + else if ((_flags & IEEE80211_CHAN_B) == IEEE80211_CHAN_B) \ + _base.params[IEEE80211_MODE_11B]._param = _v; \ +} while (0) +#define _APPLY_RATE(_flags, _base, _param, _v) do { \ + if (_flags & IEEE80211_CHAN_HT) { \ + if ((_flags & (IEEE80211_CHAN_5GHZ|IEEE80211_CHAN_2GHZ)) == 0) {\ + _base.params[IEEE80211_MODE_11NA]._param = _v|0x80; \ + _base.params[IEEE80211_MODE_11NG]._param = _v|0x80; \ + } else if (_flags & IEEE80211_CHAN_5GHZ) \ + _base.params[IEEE80211_MODE_11NA]._param = _v|0x80; \ + else \ + _base.params[IEEE80211_MODE_11NG]._param = _v|0x80; \ + } \ + if (_flags & IEEE80211_CHAN_TURBO) { \ + if ((_flags & (IEEE80211_CHAN_5GHZ|IEEE80211_CHAN_2GHZ)) == 0) {\ + _base.params[IEEE80211_MODE_TURBO_A]._param = 2*_v; \ + _base.params[IEEE80211_MODE_TURBO_G]._param = 2*_v; \ + } else if (_flags & IEEE80211_CHAN_5GHZ) \ + _base.params[IEEE80211_MODE_TURBO_A]._param = 2*_v; \ + else \ + _base.params[IEEE80211_MODE_TURBO_G]._param = 2*_v; \ + } \ + if (_flags & IEEE80211_CHAN_STURBO) \ + _base.params[IEEE80211_MODE_STURBO_A]._param = 2*_v; \ + if ((_flags & IEEE80211_CHAN_A) == IEEE80211_CHAN_A) \ + _base.params[IEEE80211_MODE_11A]._param = 2*_v; \ + if ((_flags & IEEE80211_CHAN_G) == IEEE80211_CHAN_G) \ + _base.params[IEEE80211_MODE_11G]._param = (_v == 5 ? 11 : 2*_v);\ + if ((_flags & IEEE80211_CHAN_B) == IEEE80211_CHAN_B) \ + _base.params[IEEE80211_MODE_11B]._param = (_v == 5 ? 11 : 2*_v);\ +} while (0) +#define _APPLY_RATE1(_flags, _base, _param, _v) do { \ + if (_flags & IEEE80211_CHAN_HT) { \ + if (_flags & IEEE80211_CHAN_5GHZ) \ + _base.params[IEEE80211_MODE_11NA]._param = _v|0x80; \ + else \ + _base.params[IEEE80211_MODE_11NG]._param = _v|0x80; \ + } else if ((_flags & IEEE80211_CHAN_108A) == IEEE80211_CHAN_108A) \ + _base.params[IEEE80211_MODE_TURBO_A]._param = 2*_v; \ + else if ((_flags & IEEE80211_CHAN_108G) == IEEE80211_CHAN_108G) \ + _base.params[IEEE80211_MODE_TURBO_G]._param = 2*_v; \ + else if ((_flags & IEEE80211_CHAN_ST) == IEEE80211_CHAN_ST) \ + _base.params[IEEE80211_MODE_STURBO_A]._param = 2*_v; \ + else if ((_flags & IEEE80211_CHAN_A) == IEEE80211_CHAN_A) \ + _base.params[IEEE80211_MODE_11A]._param = 2*_v; \ + else if ((_flags & IEEE80211_CHAN_G) == IEEE80211_CHAN_G) \ + _base.params[IEEE80211_MODE_11G]._param = (_v == 5 ? 11 : 2*_v);\ + else if ((_flags & IEEE80211_CHAN_B) == IEEE80211_CHAN_B) \ + _base.params[IEEE80211_MODE_11B]._param = (_v == 5 ? 11 : 2*_v);\ +} while (0) + static -DECL_CMD_FUNC(set80211roamrssi11b, val, d) +DECL_CMD_FUNC(set80211roamrssi, val, d) { - set80211(s, IEEE80211_IOC_ROAM_RSSI_11B, atoi(val), 0, NULL); + double v = atof(val); + int rssi, flags; + + rssi = (int) (2*v); + if (rssi != 2*v) + errx(-1, "invalid rssi (must be .5 dBm units)"); + flags = getmodeflags(val); + getroam(s); + if (flags == 0) { /* NB: no flags => current channel */ + flags = getcurchan(s)->ic_flags; + _APPLY1(flags, roamparams, rssi, rssi); + } else + _APPLY(flags, roamparams, rssi, rssi); + callback_register(setroam_cb, &roamparams); } static -DECL_CMD_FUNC(set80211roamrssi11g, val, d) +DECL_CMD_FUNC(set80211roamrate, val, d) { - set80211(s, IEEE80211_IOC_ROAM_RSSI_11G, atoi(val), 0, NULL); + int v = atoi(val), flags; + + flags = getmodeflags(val); + getroam(s); + if (flags == 0) { /* NB: no flags => current channel */ + flags = getcurchan(s)->ic_flags; + _APPLY_RATE1(flags, roamparams, rate, v); + } else + _APPLY_RATE(flags, roamparams, rate, v); + callback_register(setroam_cb, &roamparams); } static -DECL_CMD_FUNC(set80211roamrate11a, val, d) +DECL_CMD_FUNC(set80211mcastrate, val, d) { - set80211(s, IEEE80211_IOC_ROAM_RATE_11A, 2*atoi(val), 0, NULL); + int v = atoi(val), flags; + + flags = getmodeflags(val); + gettxparams(s); + if (flags == 0) { /* NB: no flags => current channel */ + flags = getcurchan(s)->ic_flags; + _APPLY_RATE1(flags, txparams, mcastrate, v); + } else + _APPLY_RATE(flags, txparams, mcastrate, v); + callback_register(settxparams_cb, &txparams); } static -DECL_CMD_FUNC(set80211roamrate11b, val, d) +DECL_CMD_FUNC(set80211mgtrate, val, d) { - set80211(s, IEEE80211_IOC_ROAM_RATE_11B, 2*atoi(val), 0, NULL); + int v = atoi(val), flags; + + flags = getmodeflags(val); + gettxparams(s); + if (flags == 0) { /* NB: no flags => current channel */ + flags = getcurchan(s)->ic_flags; + _APPLY_RATE1(flags, txparams, mgmtrate, v); + } else + _APPLY_RATE(flags, txparams, mgmtrate, v); + callback_register(settxparams_cb, &txparams); } static -DECL_CMD_FUNC(set80211roamrate11g, val, d) +DECL_CMD_FUNC(set80211ucastrate, val, d) { - set80211(s, IEEE80211_IOC_ROAM_RATE_11G, 2*atoi(val), 0, NULL); + int v, flags; + + gettxparams(s); + flags = getmodeflags(val); + if (isanyarg(val)) { + if (flags == 0) { /* NB: no flags => current channel */ + flags = getcurchan(s)->ic_flags; + _APPLY1(flags, txparams, ucastrate, + IEEE80211_FIXED_RATE_NONE); + } else + _APPLY(flags, txparams, ucastrate, + IEEE80211_FIXED_RATE_NONE); + } else { + v = atoi(val); + if (flags == 0) { /* NB: no flags => current channel */ + flags = getcurchan(s)->ic_flags; + _APPLY_RATE1(flags, txparams, ucastrate, v); + } else + _APPLY_RATE(flags, txparams, ucastrate, v); + } + callback_register(settxparams_cb, &txparams); } static -DECL_CMD_FUNC(set80211mcastrate, val, d) +DECL_CMD_FUNC(set80211maxretry, val, d) { - set80211(s, IEEE80211_IOC_MCAST_RATE, 2*atoi(val), 0, NULL); + int v = atoi(val), flags; + + flags = getmodeflags(val); + gettxparams(s); + if (flags == 0) { /* NB: no flags => current channel */ + flags = getcurchan(s)->ic_flags; + _APPLY1(flags, txparams, maxretry, v); + } else + _APPLY(flags, txparams, maxretry, v); + callback_register(settxparams_cb, &txparams); } +#undef _APPLY_RATE +#undef _APPLY +#undef IEEE80211_CHAN_HTA +#undef IEEE80211_CHAN_HTG static DECL_CMD_FUNC(set80211fragthreshold, val, d) @@ -1109,6 +1578,12 @@ } static void +set80211dfs(const char *val, int d, int s, const struct afswtch *rafp) +{ + set80211(s, IEEE80211_IOC_DFS, d, 0, NULL); +} + +static void set80211shortgi(const char *val, int d, int s, const struct afswtch *rafp) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 4 04:13:38 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE0C016A41A; Tue, 4 Dec 2007 04:13:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6FD1516A417 for ; Tue, 4 Dec 2007 04:13:38 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6AE8213C45B for ; Tue, 4 Dec 2007 04:13:38 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB44DcGb017368 for ; Tue, 4 Dec 2007 04:13:38 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB44DcHx017365 for perforce@freebsd.org; Tue, 4 Dec 2007 04:13:38 GMT (envelope-from sam@freebsd.org) Date: Tue, 4 Dec 2007 04:13:38 GMT Message-Id: <200712040413.lB44DcHx017365@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 130136 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2007 04:13:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=130136 Change 130136 by sam@sam_ebb on 2007/12/04 04:13:28 sync w/ vap code Affected files ... .. //depot/projects/vap/usr.sbin/wlandebug/wlandebug.c#3 edit Differences ... ==== //depot/projects/vap/usr.sbin/wlandebug/wlandebug.c#3 (text+ko) ==== @@ -80,6 +80,10 @@ #define IEEE80211_MSG_INACT 0x00000080 /* inactivity handling */ #define IEEE80211_MSG_ROAM 0x00000040 /* sta-mode roaming */ #define IEEE80211_MSG_RATECTL 0x00000020 /* tx rate control */ +#define IEEE80211_MSG_ACTION 0x00000010 /* action frame handling */ +#define IEEE80211_MSG_WDS 0x00000008 /* WDS handling */ +#define IEEE80211_MSG_IOCTL 0x00000004 /* ioctl handling */ +#define IEEE80211_MSG_ADDBA 0x00000002 /* ADDBA handling */ static struct { const char *name; @@ -112,6 +116,10 @@ { "inact", IEEE80211_MSG_INACT }, { "roam", IEEE80211_MSG_ROAM }, { "rate", IEEE80211_MSG_RATECTL }, + { "action", IEEE80211_MSG_ACTION }, + { "wds", IEEE80211_MSG_WDS }, + { "ioctl", IEEE80211_MSG_IOCTL }, + { "addba", IEEE80211_MSG_ADDBA }, }; static u_int From owner-p4-projects@FreeBSD.ORG Tue Dec 4 04:16:42 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6849016A468; Tue, 4 Dec 2007 04:16:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0505816A420 for ; Tue, 4 Dec 2007 04:16:42 +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 F3D2813C465 for ; Tue, 4 Dec 2007 04:16:41 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB44GfBF017526 for ; Tue, 4 Dec 2007 04:16:41 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB44GfZb017523 for perforce@freebsd.org; Tue, 4 Dec 2007 04:16:41 GMT (envelope-from sam@freebsd.org) Date: Tue, 4 Dec 2007 04:16:41 GMT Message-Id: <200712040416.lB44GfZb017523@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 130137 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2007 04:16:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=130137 Change 130137 by sam@sam_ebb on 2007/12/04 04:16:26 sync w/ vap code Affected files ... .. //depot/projects/vap/tools/tools/net80211/wlanstats/main.c#3 edit .. //depot/projects/vap/tools/tools/net80211/wlanstats/wlanstats.c#3 edit Differences ... ==== //depot/projects/vap/tools/tools/net80211/wlanstats/main.c#3 (text+ko) ==== @@ -46,10 +46,12 @@ #include #include +#include #include #include #include #include +#include #include "wlanstats.h" @@ -146,7 +148,7 @@ int allnodes = 0; int c, mode; - wf = wlanstats_new("ath0", S_DEFAULT); + wf = wlanstats_new("wlan0", S_DEFAULT); while ((c = getopt(argc, argv, "ai:lm:o:")) != -1) { switch (c) { case 'a': ==== //depot/projects/vap/tools/tools/net80211/wlanstats/wlanstats.c#3 (text+ko) ==== @@ -644,6 +644,8 @@ case S_TX_BADSTATE: STAT(tx_badstate); case S_TX_NOTASSOC: STAT(tx_notassoc); case S_TX_CLASSIFY: STAT(tx_classify); + case S_DWDS_MCAST: STAT(dwds_mcast); + case S_DWDS_QDROP: STAT(dwds_qdrop); case S_HT_ASSOC_NOHTCAP:STAT(ht_assoc_nohtcap); case S_HT_ASSOC_DOWNGRADE:STAT(ht_assoc_downgrade); case S_HT_ASSOC_NORATE: STAT(ht_assoc_norate); @@ -784,6 +786,8 @@ case S_TX_BADSTATE: STAT(tx_badstate); case S_TX_NOTASSOC: STAT(tx_notassoc); case S_TX_CLASSIFY: STAT(tx_classify); + case S_DWDS_MCAST: STAT(dwds_mcast); + case S_DWDS_QDROP: STAT(dwds_qdrop); case S_HT_ASSOC_NOHTCAP:STAT(ht_assoc_nohtcap); case S_HT_ASSOC_DOWNGRADE:STAT(ht_assoc_downgrade); case S_HT_ASSOC_NORATE: STAT(ht_assoc_norate); From owner-p4-projects@FreeBSD.ORG Tue Dec 4 04:18:44 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE22C16A420; Tue, 4 Dec 2007 04:18:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 643EE16A41A for ; Tue, 4 Dec 2007 04:18:44 +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 4724213C45B for ; Tue, 4 Dec 2007 04:18:44 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB44IiX0017598 for ; Tue, 4 Dec 2007 04:18:44 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB44Iiwi017595 for perforce@freebsd.org; Tue, 4 Dec 2007 04:18:44 GMT (envelope-from sam@freebsd.org) Date: Tue, 4 Dec 2007 04:18:44 GMT Message-Id: <200712040418.lB44Iiwi017595@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 130138 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2007 04:18:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=130138 Change 130138 by sam@sam_ebb on 2007/12/04 04:18:35 DWDS test app Affected files ... .. //depot/projects/vap/tools/tools/net80211/wlanwds/Makefile#1 add .. //depot/projects/vap/tools/tools/net80211/wlanwds/wlanwds.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Dec 4 04:33:33 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3899D16A469; Tue, 4 Dec 2007 04:33:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C8D6D16A421 for ; Tue, 4 Dec 2007 04:33:32 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C117413C46E for ; Tue, 4 Dec 2007 04:33:32 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB44XWXP022711 for ; Tue, 4 Dec 2007 04:33:32 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB44WKir019823 for perforce@freebsd.org; Tue, 4 Dec 2007 04:32:20 GMT (envelope-from marcel@freebsd.org) Date: Tue, 4 Dec 2007 04:32:20 GMT Message-Id: <200712040432.lB44WKir019823@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130139 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2007 04:33:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=130139 Change 130139 by marcel@marcel_xcllnt on 2007/12/04 04:32:16 IFC @130134 Affected files ... .. //depot/projects/ia64/Makefile#57 integrate .. //depot/projects/ia64/Makefile.inc1#120 integrate .. //depot/projects/ia64/ObsoleteFiles.inc#21 integrate .. //depot/projects/ia64/UPDATING#100 integrate .. //depot/projects/ia64/bin/getfacl/getfacl.c#9 integrate .. //depot/projects/ia64/bin/ln/ln.1#10 integrate .. //depot/projects/ia64/bin/ln/ln.c#13 integrate .. //depot/projects/ia64/bin/mv/mv.1#11 integrate .. //depot/projects/ia64/bin/ps/extern.h#13 integrate .. //depot/projects/ia64/bin/ps/keyword.c#20 integrate .. //depot/projects/ia64/bin/ps/print.c#17 integrate .. //depot/projects/ia64/bin/ps/ps.c#20 integrate .. //depot/projects/ia64/bin/sh/Makefile#12 integrate .. //depot/projects/ia64/bin/sh/eval.c#17 integrate .. //depot/projects/ia64/bin/sh/sh.1#38 integrate .. //depot/projects/ia64/cddl/Makefile.inc#2 integrate .. //depot/projects/ia64/cddl/lib/Makefile#3 integrate .. //depot/projects/ia64/cddl/lib/libnvpair/Makefile#2 integrate .. //depot/projects/ia64/cddl/sbin/zfs/Makefile#2 integrate .. //depot/projects/ia64/cddl/sbin/zpool/Makefile#2 integrate .. //depot/projects/ia64/cddl/usr.bin/Makefile#3 integrate .. //depot/projects/ia64/cddl/usr.bin/ztest/Makefile#2 integrate .. //depot/projects/ia64/cddl/usr.sbin/Makefile#3 integrate .. //depot/projects/ia64/cddl/usr.sbin/zdb/Makefile#2 integrate .. //depot/projects/ia64/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/ia64/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/ia64/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/ia64/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/ia64/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/ia64/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/ia64/contrib/bind9/CHANGES#10 integrate .. //depot/projects/ia64/contrib/bind9/COPYRIGHT#5 integrate .. //depot/projects/ia64/contrib/bind9/FAQ#7 integrate .. //depot/projects/ia64/contrib/bind9/FAQ.xml#5 integrate .. //depot/projects/ia64/contrib/bind9/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/bind9/README#7 integrate .. //depot/projects/ia64/contrib/bind9/bin/check/check-tool.c#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/check/named-checkconf.8#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/check/named-checkconf.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/check/named-checkconf.html#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/check/named-checkzone.8#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/check/named-checkzone.c#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/check/named-checkzone.docbook#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/check/named-checkzone.html#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/dig.1#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/dig.c#6 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/dig.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/dig.html#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/dighost.c#6 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/host.1#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/host.c#6 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/host.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/host.html#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/include/dig/dig.h#6 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/nslookup.1#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/nslookup.c#6 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/nslookup.docbook#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/nslookup.html#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-keygen.8#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-keygen.c#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-keygen.html#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-signzone.8#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-signzone.c#6 integrate .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-signzone.html#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/client.c#6 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/config.c#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/control.c#6 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/lwresd.8#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/lwresd.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/lwresd.html#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/named.8#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/named.conf.5#6 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/named.conf.docbook#6 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/named.conf.html#6 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/named.docbook#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/named.html#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/query.c#7 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/server.c#6 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/update.c#6 integrate .. //depot/projects/ia64/contrib/bind9/bin/nsupdate/nsupdate.8#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/nsupdate/nsupdate.c#6 integrate .. //depot/projects/ia64/contrib/bind9/bin/nsupdate/nsupdate.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/nsupdate/nsupdate.html#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/rndc/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/rndc/rndc-confgen.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/rndc/rndc.8#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/rndc/rndc.conf.5#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/rndc/rndc.conf.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/rndc/rndc.conf.html#5 integrate .. //depot/projects/ia64/contrib/bind9/bin/rndc/rndc.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/rndc/rndc.html#5 integrate .. //depot/projects/ia64/contrib/bind9/configure.in#7 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM-book.xml#6 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch01.html#5 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch02.html#5 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch03.html#6 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch04.html#6 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch05.html#6 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch06.html#6 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch07.html#6 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch08.html#6 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch09.html#6 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.html#6 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.pdf#4 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/man.dig.html#2 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/man.host.html#2 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/man.named.html#2 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/man.rndc.html#2 integrate .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#2 delete .. //depot/projects/ia64/contrib/bind9/doc/misc/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/bind9/doc/misc/migration#4 integrate .. //depot/projects/ia64/contrib/bind9/doc/rfc/index#4 integrate .. //depot/projects/ia64/contrib/bind9/doc/rfc/rfc4398.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/rfc/rfc4408.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/rfc/rfc4470.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/rfc/rfc4634.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/rfc/rfc4641.txt#1 branch .. //depot/projects/ia64/contrib/bind9/lib/bind/api#6 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/config.h.in#5 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/configure#6 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/configure.in#6 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/dst/dst_api.c#6 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/dst/hmac_link.c#5 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/irs/gai_strerror.c#5 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/irs/irs_data.c#5 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/isc/ctl_clnt.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/make/rules.in#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/nameser/ns_parse.c#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/port_before.h.in#5 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/resolv/res_data.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/resolv/res_init.c#5 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind9/api#6 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind9/check.c#6 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/adb.c#6 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/api#7 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/dispatch.c#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/dnssec.c#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/include/dns/db.h#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/include/dns/dispatch.h#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/include/dns/validator.h#6 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/journal.c#5 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/lookup.c#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/master.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/message.c#5 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/openssl_link.c#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/openssldh_link.c#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/openssldsa_link.c#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/rbtdb.c#5 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/rdata/generic/ds_43.c#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/rdataslab.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/resolver.c#10 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/rootns.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/sdb.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/sdlz.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/tsig.c#5 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/validator.c#7 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/view.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/xfrin.c#6 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/zone.c#6 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/alpha/Makefile.in#1 branch .. //depot/projects/ia64/contrib/bind9/lib/isc/alpha/include/Makefile.in#1 branch .. //depot/projects/ia64/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#1 branch .. //depot/projects/ia64/contrib/bind9/lib/isc/api#6 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/arm/include/isc/atomic.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/hmacsha.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/ia64/Makefile.in#1 branch .. //depot/projects/ia64/contrib/bind9/lib/isc/ia64/include/Makefile.in#1 branch .. //depot/projects/ia64/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#1 branch .. //depot/projects/ia64/contrib/bind9/lib/isc/include/isc/platform.h.in#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/include/isc/string.h#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/mem.c#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/mips/Makefile.in#1 branch .. //depot/projects/ia64/contrib/bind9/lib/isc/mips/include/Makefile.in#1 branch .. //depot/projects/ia64/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#1 branch .. //depot/projects/ia64/contrib/bind9/lib/isc/noatomic/Makefile.in#1 branch .. //depot/projects/ia64/contrib/bind9/lib/isc/noatomic/include/Makefile.in#1 branch .. //depot/projects/ia64/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#1 branch .. //depot/projects/ia64/contrib/bind9/lib/isc/powerpc/Makefile.in#1 branch .. //depot/projects/ia64/contrib/bind9/lib/isc/powerpc/include/Makefile.in#1 branch .. //depot/projects/ia64/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in#1 branch .. //depot/projects/ia64/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/sparc64/Makefile.in#1 branch .. //depot/projects/ia64/contrib/bind9/lib/isc/sparc64/include/Makefile.in#1 branch .. //depot/projects/ia64/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in#1 branch .. //depot/projects/ia64/contrib/bind9/lib/isc/timer.c#5 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#6 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/unix/net.c#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/unix/socket.c#6 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/unix/syslog.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/x86_32/Makefile.in#1 branch .. //depot/projects/ia64/contrib/bind9/lib/isc/x86_32/include/Makefile.in#1 branch .. //depot/projects/ia64/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in#1 branch .. //depot/projects/ia64/contrib/bind9/lib/isc/x86_64/Makefile.in#1 branch .. //depot/projects/ia64/contrib/bind9/lib/isc/x86_64/include/Makefile.in#1 branch .. //depot/projects/ia64/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in#1 branch .. //depot/projects/ia64/contrib/bind9/lib/isccc/symtab.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/isccfg/api#5 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/api#6 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/context.c#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/getaddrinfo.c#5 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/getipnode.c#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/lwres_gnba.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_config.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_context.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_noop.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_packet.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#4 integrate .. //depot/projects/ia64/contrib/bind9/make/rules.in#5 integrate .. //depot/projects/ia64/contrib/bind9/version#10 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/ppc-dis.c#6 integrate .. //depot/projects/ia64/contrib/csup/mux.c#2 integrate .. //depot/projects/ia64/contrib/gcc/opts.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/i386fbsd-nat.c#4 integrate .. //depot/projects/ia64/contrib/groff/tmac/doc-common#19 integrate .. //depot/projects/ia64/contrib/groff/tmac/doc-syms#11 integrate .. //depot/projects/ia64/contrib/groff/tmac/groff_mdoc.man#16 integrate .. //depot/projects/ia64/contrib/ipfilter/BSD/Makefile#11 integrate .. //depot/projects/ia64/contrib/ipfilter/BSD/kupgrade#8 integrate .. //depot/projects/ia64/contrib/ipfilter/HISTORY#12 integrate .. //depot/projects/ia64/contrib/ipfilter/Makefile#10 integrate .. //depot/projects/ia64/contrib/ipfilter/ip_fil.c#4 integrate .. //depot/projects/ia64/contrib/ipfilter/iplang/Makefile#3 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsend/iptests.c#9 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsend/sock.c#10 integrate .. //depot/projects/ia64/contrib/ipfilter/l4check/Makefile#2 integrate .. //depot/projects/ia64/contrib/ipfilter/l4check/l4check.c#4 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/Makefile#5 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/alist_new.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/ipft_tx.c#5 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/printnat.c#4 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/printpacket.c#4 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/printpool_live.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/printstate.c#4 integrate .. //depot/projects/ia64/contrib/ipfilter/man/ippool.5#2 integrate .. //depot/projects/ia64/contrib/ipfilter/md5.h#2 integrate .. //depot/projects/ia64/contrib/ipfilter/radix.c#4 integrate .. //depot/projects/ia64/contrib/ipfilter/radix_ipf.h#4 integrate .. //depot/projects/ia64/contrib/ipfilter/test/Makefile#12 integrate .. //depot/projects/ia64/contrib/ipfilter/test/dotest#4 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/Makefile#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/expected/f11#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/f24#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/expected/i19.dist#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/expected/i21#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/in1#6 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/in6#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/ipv6.6#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/expected/n16#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/input/f11#4 integrate .. //depot/projects/ia64/contrib/ipfilter/test/input/f24#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/input/ipv6.6#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/input/l1#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/input/n16#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/nattest#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/f24#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/regress/i21#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/i3#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/in1#5 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/in6#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/ipv6.6#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/regress/n16#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/test.format#5 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/ipf_y.y#5 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/ipfstat.c#5 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/ipmon.c#5 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/ipnat.c#4 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/ipnat_y.y#5 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/lexer.c#4 integrate .. //depot/projects/ia64/contrib/less/FREEBSD-upgrade#1 branch .. //depot/projects/ia64/contrib/less/LICENSE#4 integrate .. //depot/projects/ia64/contrib/less/Makefile.dsm#2 delete .. //depot/projects/ia64/contrib/less/NEWS#6 integrate .. //depot/projects/ia64/contrib/less/README#6 integrate .. //depot/projects/ia64/contrib/less/ch.c#6 integrate .. //depot/projects/ia64/contrib/less/charset.c#6 integrate .. //depot/projects/ia64/contrib/less/command.c#6 integrate .. //depot/projects/ia64/contrib/less/configure#6 integrate .. //depot/projects/ia64/contrib/less/configure.ac#4 integrate .. //depot/projects/ia64/contrib/less/decode.c#6 integrate .. //depot/projects/ia64/contrib/less/defines.ds#6 integrate .. //depot/projects/ia64/contrib/less/defines.h.in#6 integrate .. //depot/projects/ia64/contrib/less/defines.o2#6 integrate .. //depot/projects/ia64/contrib/less/defines.o9#5 integrate .. //depot/projects/ia64/contrib/less/defines.wn#6 integrate .. //depot/projects/ia64/contrib/less/edit.c#5 integrate .. //depot/projects/ia64/contrib/less/filename.c#6 integrate .. //depot/projects/ia64/contrib/less/funcs.h#6 integrate .. //depot/projects/ia64/contrib/less/jump.c#5 integrate .. //depot/projects/ia64/contrib/less/less.h#6 integrate .. //depot/projects/ia64/contrib/less/less.man#6 integrate .. //depot/projects/ia64/contrib/less/less.nro#6 integrate .. //depot/projects/ia64/contrib/less/lessecho.man#3 integrate .. //depot/projects/ia64/contrib/less/lessecho.nro#3 integrate .. //depot/projects/ia64/contrib/less/lesskey.man#6 integrate .. //depot/projects/ia64/contrib/less/lesskey.nro#6 integrate .. //depot/projects/ia64/contrib/less/line.c#7 integrate .. //depot/projects/ia64/contrib/less/main.c#6 integrate .. //depot/projects/ia64/contrib/less/optfunc.c#6 integrate .. //depot/projects/ia64/contrib/less/opttbl.c#6 integrate .. //depot/projects/ia64/contrib/less/screen.c#6 integrate .. //depot/projects/ia64/contrib/less/search.c#6 integrate .. //depot/projects/ia64/contrib/less/signal.c#5 integrate .. //depot/projects/ia64/contrib/less/tags.c#6 integrate .. //depot/projects/ia64/contrib/less/version.c#6 integrate .. //depot/projects/ia64/contrib/libpcap/CHANGES#7 integrate .. //depot/projects/ia64/contrib/libpcap/CREDITS#7 integrate .. //depot/projects/ia64/contrib/libpcap/FILES#6 integrate .. //depot/projects/ia64/contrib/libpcap/INSTALL#2 delete .. //depot/projects/ia64/contrib/libpcap/INSTALL.txt#5 integrate .. //depot/projects/ia64/contrib/libpcap/Makefile.in#5 integrate .. //depot/projects/ia64/contrib/libpcap/README.dag#3 integrate .. //depot/projects/ia64/contrib/libpcap/TODO#3 integrate .. //depot/projects/ia64/contrib/libpcap/VERSION#8 integrate .. //depot/projects/ia64/contrib/libpcap/bpf_image.c#4 integrate .. //depot/projects/ia64/contrib/libpcap/config.h.in#7 integrate .. //depot/projects/ia64/contrib/libpcap/configure#7 integrate .. //depot/projects/ia64/contrib/libpcap/configure.in#7 integrate .. //depot/projects/ia64/contrib/libpcap/fad-getad.c#4 integrate .. //depot/projects/ia64/contrib/libpcap/fad-win32.c#4 integrate .. //depot/projects/ia64/contrib/libpcap/gencode.c#9 integrate .. //depot/projects/ia64/contrib/libpcap/gencode.h#7 integrate .. //depot/projects/ia64/contrib/libpcap/grammar.y#7 integrate .. //depot/projects/ia64/contrib/libpcap/inet.c#6 integrate .. //depot/projects/ia64/contrib/libpcap/lbl/gnuc.h#2 delete .. //depot/projects/ia64/contrib/libpcap/nametoaddr.c#6 integrate .. //depot/projects/ia64/contrib/libpcap/optimize.c#5 integrate .. //depot/projects/ia64/contrib/libpcap/packaging/pcap.spec.in#1 branch .. //depot/projects/ia64/contrib/libpcap/pcap-bpf.c#12 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-bpf.h#5 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-dag.c#5 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-dlpi.c#7 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-int.h#8 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-linux.c#7 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-win32.c#5 integrate .. //depot/projects/ia64/contrib/libpcap/pcap.3#9 integrate .. //depot/projects/ia64/contrib/libpcap/pcap.c#8 integrate .. //depot/projects/ia64/contrib/libpcap/pcap.h#8 integrate .. //depot/projects/ia64/contrib/libpcap/pf.h#3 delete .. //depot/projects/ia64/contrib/libpcap/savefile.c#7 integrate .. //depot/projects/ia64/contrib/libpcap/scanner.l#8 integrate .. //depot/projects/ia64/contrib/libreadline/FREEBSD-upgrade#8 integrate .. //depot/projects/ia64/contrib/libreadline/complete.c#7 integrate .. //depot/projects/ia64/contrib/libreadline/display.c#8 integrate .. //depot/projects/ia64/contrib/libreadline/input.c#6 integrate .. //depot/projects/ia64/contrib/libreadline/isearch.c#5 integrate .. //depot/projects/ia64/contrib/libreadline/misc.c#5 integrate .. //depot/projects/ia64/contrib/libreadline/readline.c#7 integrate .. //depot/projects/ia64/contrib/libreadline/text.c#5 integrate .. //depot/projects/ia64/contrib/libreadline/vi_mode.c#7 integrate .. //depot/projects/ia64/contrib/one-true-awk/FIXES#10 integrate .. //depot/projects/ia64/contrib/one-true-awk/FREEBSD-upgrade#10 integrate .. //depot/projects/ia64/contrib/one-true-awk/lib.c#6 integrate .. //depot/projects/ia64/contrib/one-true-awk/tran.c#5 integrate .. //depot/projects/ia64/contrib/openbsm/HISTORY#7 integrate .. //depot/projects/ia64/contrib/openbsm/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/openbsm/VERSION#7 integrate .. //depot/projects/ia64/contrib/openbsm/aclocal.m4#2 integrate .. //depot/projects/ia64/contrib/openbsm/bin/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/openbsm/bin/audit/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/openbsm/bin/auditd/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/openbsm/bin/auditreduce/auditreduce.c#5 integrate .. //depot/projects/ia64/contrib/openbsm/bin/praudit/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/openbsm/bin/praudit/praudit.c#3 integrate .. //depot/projects/ia64/contrib/openbsm/bsm/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/openbsm/config/config.h#6 integrate .. //depot/projects/ia64/contrib/openbsm/config/config.h.in#4 integrate .. //depot/projects/ia64/contrib/openbsm/config/ltmain.sh#3 integrate .. //depot/projects/ia64/contrib/openbsm/configure#7 integrate .. //depot/projects/ia64/contrib/openbsm/configure.ac#7 integrate .. //depot/projects/ia64/contrib/openbsm/etc/audit_class#2 integrate .. //depot/projects/ia64/contrib/openbsm/etc/audit_event#6 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/bsm_event.c#3 integrate .. //depot/projects/ia64/contrib/openbsm/libbsm/bsm_io.c#6 integrate .. //depot/projects/ia64/contrib/openbsm/man/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/openbsm/modules/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/openbsm/test/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/openbsm/test/bsm/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/openbsm/tools/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/ia64/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/ia64/contrib/pf/pflogd/pflogd.c#10 integrate .. //depot/projects/ia64/contrib/sendmail/CACerts#2 integrate .. //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#26 integrate .. //depot/projects/ia64/contrib/sendmail/INSTALL#5 integrate .. //depot/projects/ia64/contrib/sendmail/RELEASE_NOTES#20 integrate .. //depot/projects/ia64/contrib/sendmail/cf/cf/submit.cf#19 integrate .. //depot/projects/ia64/contrib/sendmail/cf/feature/ldap_routing.m4#7 integrate .. //depot/projects/ia64/contrib/sendmail/cf/m4/proto.m4#18 integrate .. //depot/projects/ia64/contrib/sendmail/cf/m4/version.m4#20 integrate .. //depot/projects/ia64/contrib/sendmail/contrib/buildvirtuser#8 integrate .. //depot/projects/ia64/contrib/sendmail/doc/op/op.me#17 integrate .. //depot/projects/ia64/contrib/sendmail/editmap/editmap.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/include/sm/conf.h#16 integrate .. //depot/projects/ia64/contrib/sendmail/include/sm/ldap.h#8 integrate .. //depot/projects/ia64/contrib/sendmail/include/sm/tailq.h#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_unknown.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/engine.c#15 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/listener.c#18 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/main.c#13 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/monitor.c#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/smfi.c#10 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/ldap.c#13 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/mpeix.c#4 integrate .. //depot/projects/ia64/contrib/sendmail/makemap/makemap.c#9 integrate .. //depot/projects/ia64/contrib/sendmail/praliases/praliases.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/Makefile.m4#9 integrate .. //depot/projects/ia64/contrib/sendmail/src/conf.c#21 integrate .. //depot/projects/ia64/contrib/sendmail/src/deliver.c#19 integrate .. //depot/projects/ia64/contrib/sendmail/src/envelope.c#12 integrate .. //depot/projects/ia64/contrib/sendmail/src/headers.c#16 integrate .. //depot/projects/ia64/contrib/sendmail/src/macro.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/main.c#18 integrate .. //depot/projects/ia64/contrib/sendmail/src/map.c#16 integrate .. //depot/projects/ia64/contrib/sendmail/src/milter.c#18 integrate .. //depot/projects/ia64/contrib/sendmail/src/mime.c#13 integrate .. //depot/projects/ia64/contrib/sendmail/src/parseaddr.c#19 integrate .. //depot/projects/ia64/contrib/sendmail/src/queue.c#20 integrate .. //depot/projects/ia64/contrib/sendmail/src/readcf.c#16 integrate .. //depot/projects/ia64/contrib/sendmail/src/recipient.c#11 integrate .. //depot/projects/ia64/contrib/sendmail/src/sendmail.8#9 integrate .. //depot/projects/ia64/contrib/sendmail/src/sendmail.h#19 integrate .. //depot/projects/ia64/contrib/sendmail/src/sm_resolve.c#9 integrate .. //depot/projects/ia64/contrib/sendmail/src/srvrsmtp.c#20 integrate .. //depot/projects/ia64/contrib/sendmail/src/usersmtp.c#15 integrate .. //depot/projects/ia64/contrib/sendmail/src/util.c#15 integrate .. //depot/projects/ia64/contrib/sendmail/src/version.c#20 integrate .. //depot/projects/ia64/contrib/sendmail/vacation/vacation.c#11 integrate .. //depot/projects/ia64/contrib/tcpdump/CHANGES#8 integrate .. //depot/projects/ia64/contrib/tcpdump/CREDITS#8 integrate .. //depot/projects/ia64/contrib/tcpdump/FILES#8 integrate .. //depot/projects/ia64/contrib/tcpdump/INSTALL#7 integrate .. //depot/projects/ia64/contrib/tcpdump/Makefile.in#7 integrate .. //depot/projects/ia64/contrib/tcpdump/README#6 integrate .. //depot/projects/ia64/contrib/tcpdump/VERSION#9 integrate .. //depot/projects/ia64/contrib/tcpdump/addrtoname.c#8 integrate .. //depot/projects/ia64/contrib/tcpdump/af.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/af.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/bootp.h#4 integrate .. //depot/projects/ia64/contrib/tcpdump/config.h.in#7 integrate .. //depot/projects/ia64/contrib/tcpdump/configure#8 integrate .. //depot/projects/ia64/contrib/tcpdump/configure.in#8 integrate .. //depot/projects/ia64/contrib/tcpdump/dccp.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/ieee802_11.h#4 integrate .. //depot/projects/ia64/contrib/tcpdump/ieee802_11_radio.h#3 integrate .. //depot/projects/ia64/contrib/tcpdump/interface.h#9 integrate .. //depot/projects/ia64/contrib/tcpdump/ip.h#4 integrate .. //depot/projects/ia64/contrib/tcpdump/llc.h#7 integrate .. //depot/projects/ia64/contrib/tcpdump/nameser.h#4 integrate .. //depot/projects/ia64/contrib/tcpdump/netdissect.h#3 integrate .. //depot/projects/ia64/contrib/tcpdump/ospf.h#5 integrate .. //depot/projects/ia64/contrib/tcpdump/parsenfsfh.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/pf.h#3 delete .. //depot/projects/ia64/contrib/tcpdump/print-802_11.c#8 integrate .. //depot/projects/ia64/contrib/tcpdump/print-atm.c#7 integrate .. //depot/projects/ia64/contrib/tcpdump/print-bfd.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-bgp.c#8 integrate .. //depot/projects/ia64/contrib/tcpdump/print-bootp.c#7 integrate .. //depot/projects/ia64/contrib/tcpdump/print-chdlc.c#7 integrate .. //depot/projects/ia64/contrib/tcpdump/print-dccp.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-dhcp6.c#6 integrate .. //depot/projects/ia64/contrib/tcpdump/print-domain.c#6 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ether.c#8 integrate .. //depot/projects/ia64/contrib/tcpdump/print-fddi.c#7 integrate .. //depot/projects/ia64/contrib/tcpdump/print-fr.c#6 integrate .. //depot/projects/ia64/contrib/tcpdump/print-icmp.c#7 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ip.c#8 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ip6.c#7 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ipfc.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-isoclns.c#8 integrate .. //depot/projects/ia64/contrib/tcpdump/print-juniper.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-l2tp.c#8 integrate .. //depot/projects/ia64/contrib/tcpdump/print-lane.c#6 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ldp.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-llc.c#7 integrate .. //depot/projects/ia64/contrib/tcpdump/print-lmp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-lspping.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-nfs.c#7 integrate .. //depot/projects/ia64/contrib/tcpdump/print-null.c#8 integrate .. //depot/projects/ia64/contrib/tcpdump/print-olsr.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/print-ospf.c#7 integrate .. //depot/projects/ia64/contrib/tcpdump/print-pflog.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-pim.c#8 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ppp.c#7 integrate .. //depot/projects/ia64/contrib/tcpdump/print-pptp.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-rsvp.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-rx.c#6 integrate .. //depot/projects/ia64/contrib/tcpdump/print-sctp.c#7 integrate .. //depot/projects/ia64/contrib/tcpdump/print-sll.c#8 integrate .. //depot/projects/ia64/contrib/tcpdump/print-smb.c#7 integrate .. //depot/projects/ia64/contrib/tcpdump/print-tcp.c#8 integrate .. //depot/projects/ia64/contrib/tcpdump/print-tftp.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-token.c#6 integrate .. //depot/projects/ia64/contrib/tcpdump/print-udp.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/smbutil.c#7 integrate .. //depot/projects/ia64/contrib/tcpdump/tcp.h#5 integrate .. //depot/projects/ia64/contrib/tcpdump/tcpdump-stdinc.h#5 integrate .. //depot/projects/ia64/contrib/tcpdump/tcpdump.1#9 integrate .. //depot/projects/ia64/contrib/tcpdump/tcpdump.c#8 integrate .. //depot/projects/ia64/contrib/tcpdump/tests/print-capX.out#2 integrate .. //depot/projects/ia64/contrib/tcpdump/tests/print-capXX.out#2 integrate .. //depot/projects/ia64/contrib/tcpdump/tftp.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/udp.h#4 integrate .. //depot/projects/ia64/contrib/tcpdump/util.c#7 integrate .. //depot/projects/ia64/contrib/tcsh/sh.c#6 integrate .. //depot/projects/ia64/contrib/tcsh/sh.lex.c#6 integrate .. //depot/projects/ia64/contrib/tcsh/sh.proc.c#6 integrate .. //depot/projects/ia64/contrib/tcsh/tc.const.c#7 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/main.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/su/Makefile.am#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/su/su.c#7 integrate .. //depot/projects/ia64/crypto/openssl/ssl/d1_both.c#2 integrate .. //depot/projects/ia64/crypto/openssl/ssl/dtls1.h#2 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssl.h#10 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssl_err.c#7 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssl_lib.c#11 integrate .. //depot/projects/ia64/etc/Makefile#58 integrate .. //depot/projects/ia64/etc/cached.conf#2 delete .. //depot/projects/ia64/etc/defaults/Makefile#8 integrate .. //depot/projects/ia64/etc/defaults/devfs.rules#5 integrate .. //depot/projects/ia64/etc/defaults/pccard.conf#32 delete .. //depot/projects/ia64/etc/defaults/periodic.conf#24 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#79 integrate .. //depot/projects/ia64/etc/etc.amd64/ttys#4 integrate .. //depot/projects/ia64/etc/etc.arm/ttys#5 integrate .. //depot/projects/ia64/etc/etc.i386/ttys#5 integrate .. //depot/projects/ia64/etc/etc.ia64/ttys#7 integrate .. //depot/projects/ia64/etc/etc.powerpc/ttys#6 integrate .. //depot/projects/ia64/etc/etc.sparc64/ttys#15 integrate .. //depot/projects/ia64/etc/freebsd-update.conf#2 integrate .. //depot/projects/ia64/etc/gss/mech#2 integrate .. //depot/projects/ia64/etc/mtree/BSD.include.dist#43 integrate .. //depot/projects/ia64/etc/mtree/BSD.local.dist#32 integrate .. //depot/projects/ia64/etc/mtree/BSD.usr.dist#46 integrate .. //depot/projects/ia64/etc/mtree/BSD.x11-4.dist#12 integrate .. //depot/projects/ia64/etc/mtree/README#3 integrate .. //depot/projects/ia64/etc/namedb/named.root#5 integrate .. //depot/projects/ia64/etc/network.subr#21 integrate .. //depot/projects/ia64/etc/nscd.conf#1 branch .. //depot/projects/ia64/etc/periodic/security/100.chksetuid#9 integrate .. //depot/projects/ia64/etc/pf.conf#4 delete .. //depot/projects/ia64/etc/rc.d/Makefile#45 integrate .. //depot/projects/ia64/etc/rc.d/amd#15 integrate .. //depot/projects/ia64/etc/rc.d/cached#3 delete .. //depot/projects/ia64/etc/rc.d/early.sh#3 integrate .. //depot/projects/ia64/etc/rc.d/ftp-proxy#1 branch .. //depot/projects/ia64/etc/rc.d/hostapd#2 integrate .. //depot/projects/ia64/etc/rc.d/kerberos#7 integrate .. //depot/projects/ia64/etc/rc.d/lockd#2 integrate .. //depot/projects/ia64/etc/rc.d/named#18 integrate .. //depot/projects/ia64/etc/rc.d/nfslocking#11 delete .. //depot/projects/ia64/etc/rc.d/nscd#2 integrate .. //depot/projects/ia64/etc/rc.d/ppp#7 integrate .. //depot/projects/ia64/etc/rc.subr#36 integrate .. //depot/projects/ia64/etc/sendmail/freebsd.mc#15 integrate .. //depot/projects/ia64/etc/sendmail/freebsd.submit.mc#6 integrate .. //depot/projects/ia64/etc/services#18 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#67 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes-o.real#9 integrate .. //depot/projects/ia64/games/fortune/datfiles/limerick#9 integrate .. //depot/projects/ia64/games/fortune/fortune/fortune.6#5 integrate .. //depot/projects/ia64/games/fortune/fortune/fortune.c#9 integrate .. //depot/projects/ia64/gnu/lib/csu/Makefile#21 integrate .. //depot/projects/ia64/gnu/lib/libobjc/Makefile#17 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/ld/Makefile#12 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/ld/genscripts.sh#6 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc_int/Makefile#18 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/Makefile#24 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/auto-host.h#18 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/freebsd-native.h#14 integrate .. //depot/projects/ia64/gnu/usr.bin/diff/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/arch/arm/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/arch/arm/init.c#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/kgdb.h#6 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/kthr.c#8 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/trgt_i386.c#5 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#34 integrate .. //depot/projects/ia64/gnu/usr.bin/man/man/man.c#12 integrate .. //depot/projects/ia64/gnu/usr.bin/sort/Makefile#8 integrate .. //depot/projects/ia64/gnu/usr.bin/texinfo/info/Makefile#3 integrate .. //depot/projects/ia64/include/Makefile#60 integrate .. //depot/projects/ia64/include/_ctype.h#3 integrate .. //depot/projects/ia64/include/assert.h#3 integrate .. //depot/projects/ia64/include/ctype.h#8 integrate .. //depot/projects/ia64/include/dirent.h#9 integrate .. //depot/projects/ia64/include/elf.h#4 integrate .. //depot/projects/ia64/include/pthread.h#15 integrate .. //depot/projects/ia64/include/pthread_np.h#7 integrate .. //depot/projects/ia64/include/wctype.h#7 integrate .. //depot/projects/ia64/kerberos5/lib/Makefile.inc#7 integrate .. //depot/projects/ia64/kerberos5/usr.bin/ksu/Makefile#9 integrate .. //depot/projects/ia64/lib/Makefile#63 integrate .. //depot/projects/ia64/lib/bind/bind/Makefile#6 integrate .. //depot/projects/ia64/lib/bind/bind/config.h#6 integrate .. //depot/projects/ia64/lib/bind/bind/port_before.h#5 integrate .. //depot/projects/ia64/lib/bind/config.h#8 integrate .. //depot/projects/ia64/lib/bind/config.mk#10 integrate .. //depot/projects/ia64/lib/bind/isc/isc/platform.h#5 integrate .. //depot/projects/ia64/lib/bind/lwres/Makefile#8 integrate .. //depot/projects/ia64/lib/csu/common/crtbrand.c#5 integrate .. //depot/projects/ia64/lib/libarchive/archive_read.3#17 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_none.c#10 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_tar.c#22 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_zip.c#10 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_disk.c#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_cpio.c#11 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate .. //depot/projects/ia64/lib/libarchive/test/test_write_disk.c#4 integrate .. //depot/projects/ia64/lib/libarchive/test/test_write_format_cpio.c#2 integrate .. //depot/projects/ia64/lib/libbsm/Makefile#6 integrate .. //depot/projects/ia64/lib/libc/Makefile#28 integrate .. //depot/projects/ia64/lib/libc/amd64/Makefile.inc#5 integrate .. //depot/projects/ia64/lib/libc/arm/Symbol.map#4 integrate .. //depot/projects/ia64/lib/libc/arm/string/ffs.S#3 integrate .. //depot/projects/ia64/lib/libc/arm/string/memcpy.S#2 integrate .. //depot/projects/ia64/lib/libc/arm/string/memset.S#3 integrate .. //depot/projects/ia64/lib/libc/gdtoa/Symbol.map#4 integrate .. //depot/projects/ia64/lib/libc/gdtoa/_ldtoa.c#3 integrate .. //depot/projects/ia64/lib/libc/gdtoa/machdep_ldisQ.c#3 integrate .. //depot/projects/ia64/lib/libc/gdtoa/machdep_ldisx.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/Makefile.inc#39 integrate .. //depot/projects/ia64/lib/libc/gen/Symbol.map#6 integrate .. //depot/projects/ia64/lib/libc/gen/closedir.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/readdir.c#5 integrate .. //depot/projects/ia64/lib/libc/gen/seekdir.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/sysctl.3#18 integrate .. //depot/projects/ia64/lib/libc/gen/telldir.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/valloc.3#6 integrate .. //depot/projects/ia64/lib/libc/i386/Makefile.inc#3 integrate .. //depot/projects/ia64/lib/libc/ia64/Makefile.inc#5 integrate .. //depot/projects/ia64/lib/libc/ia64/Symbol.map#4 integrate .. //depot/projects/ia64/lib/libc/locale/Symbol.map#3 integrate .. //depot/projects/ia64/lib/libc/locale/big5.c#7 integrate .. //depot/projects/ia64/lib/libc/locale/euc.c#11 integrate .. //depot/projects/ia64/lib/libc/locale/gb18030.c#5 integrate .. //depot/projects/ia64/lib/libc/locale/gb2312.c#5 integrate .. //depot/projects/ia64/lib/libc/locale/gbk.c#8 integrate .. //depot/projects/ia64/lib/libc/locale/isctype.c#5 integrate .. //depot/projects/ia64/lib/libc/locale/iswctype.c#4 integrate .. //depot/projects/ia64/lib/libc/locale/mblocal.h#5 integrate .. //depot/projects/ia64/lib/libc/locale/mskanji.c#8 integrate .. //depot/projects/ia64/lib/libc/locale/none.c#10 integrate .. //depot/projects/ia64/lib/libc/locale/setrunelocale.c#18 integrate .. //depot/projects/ia64/lib/libc/locale/utf8.c#9 integrate .. //depot/projects/ia64/lib/libc/nameser/ns_parse.c#3 integrate .. //depot/projects/ia64/lib/libc/net/Makefile.inc#21 integrate .. //depot/projects/ia64/lib/libc/net/ethers.3#7 integrate .. //depot/projects/ia64/lib/libc/net/getaddrinfo.c#28 integrate .. //depot/projects/ia64/lib/libc/net/nscache.c#2 integrate .. //depot/projects/ia64/lib/libc/net/sctp_connectx.3#4 integrate .. //depot/projects/ia64/lib/libc/net/sctp_opt_info.3#4 integrate .. //depot/projects/ia64/lib/libc/net/sctp_recvmsg.3#4 integrate .. //depot/projects/ia64/lib/libc/net/sctp_send.3#4 integrate .. //depot/projects/ia64/lib/libc/net/sctp_sendmsg.3#4 integrate .. //depot/projects/ia64/lib/libc/powerpc/Symbol.map#4 integrate .. //depot/projects/ia64/lib/libc/resolv/res_data.c#3 integrate .. //depot/projects/ia64/lib/libc/resolv/res_init.c#6 integrate .. //depot/projects/ia64/lib/libc/rpc/auth_time.c#7 integrate .. //depot/projects/ia64/lib/libc/rpc/authdes_prot.c#3 integrate .. //depot/projects/ia64/lib/libc/rpc/authunix_prot.c#4 integrate .. //depot/projects/ia64/lib/libc/rpc/getnetconfig.c#10 integrate .. //depot/projects/ia64/lib/libc/rpc/getnetpath.c#7 integrate .. //depot/projects/ia64/lib/libc/rpc/key_prot_xdr.c#5 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc_callmsg.c#4 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc_generic.c#9 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc_prot.c#4 integrate .. //depot/projects/ia64/lib/libc/rpc/rpcb_clnt.c#11 integrate .. //depot/projects/ia64/lib/libc/rpc/rpcb_prot.c#7 integrate .. //depot/projects/ia64/lib/libc/rpc/rpcb_st_xdr.c#4 integrate .. //depot/projects/ia64/lib/libc/sparc64/Makefile.inc#6 integrate .. //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_explode.c#7 integrate .. //depot/projects/ia64/lib/libc/stdlib/atoi.3#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/getenv.c#6 integrate .. //depot/projects/ia64/lib/libc/stdlib/malloc.3#22 integrate .. //depot/projects/ia64/lib/libc/stdlib/malloc.c#38 integrate .. //depot/projects/ia64/lib/libc/sys/Makefile.inc#32 integrate .. //depot/projects/ia64/lib/libc/sys/kldstat.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/kqueue.2#15 integrate .. //depot/projects/ia64/lib/libc/sys/minherit.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/ntp_adjtime.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/ntp_gettime.2#5 delete .. //depot/projects/ia64/lib/libc/sys/sctp_generic_recvmsg.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/sctp_generic_sendmsg.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/sctp_peeloff.2#3 integrate .. //depot/projects/ia64/lib/libdisk/libdisk.3#13 integrate .. //depot/projects/ia64/lib/libdisk/libdisk.h#20 integrate .. //depot/projects/ia64/lib/libdisk/open_disk.c#9 integrate .. //depot/projects/ia64/lib/libdisk/open_ia64_disk.c#3 integrate .. //depot/projects/ia64/lib/libelf/elf.3#3 integrate .. //depot/projects/ia64/lib/libelf/elf_flagdata.3#2 integrate .. //depot/projects/ia64/lib/libelf/elf_getscn.3#2 integrate .. //depot/projects/ia64/lib/libelf/elf_update.3#3 integrate .. //depot/projects/ia64/lib/libelf/elf_update.c#3 integrate .. //depot/projects/ia64/lib/libelf/gelf_getphdr.3#3 integrate .. //depot/projects/ia64/lib/libelf/gelf_newehdr.3#3 integrate .. //depot/projects/ia64/lib/libelf/gelf_newphdr.3#2 integrate .. //depot/projects/ia64/lib/libelf/gelf_xlatetof.3#2 integrate .. //depot/projects/ia64/lib/libelf/libelf_convert.m4#3 integrate .. //depot/projects/ia64/lib/libelf/libelf_data.c#3 integrate .. //depot/projects/ia64/lib/libelf/libelf_xlate.c#3 integrate .. //depot/projects/ia64/lib/libgssapi/Makefile#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_accept_sec_context.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_acquire_cred.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_acquire_cred.c#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_add_cred.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_add_oid_set_member.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_canonicalize_name.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_compare_name.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_context_time.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_create_empty_oid_set.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_delete_sec_context.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_display_name.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_display_status.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_duplicate_name.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_export_name.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_export_sec_context.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_get_mic.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_import_name.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_import_sec_context.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_indicate_mechs.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_init_sec_context.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_inquire_context.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_inquire_cred.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_inquire_cred_by_mech.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_inquire_mechs_for_name.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_inquire_names_for_mech.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_process_context_token.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_release_buffer.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_release_cred.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_release_name.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_release_oid_set.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_test_oid_set_member.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_unwrap.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_verify_mic.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_wrap.3#2 integrate .. //depot/projects/ia64/lib/libgssapi/gss_wrap_size_limit.3#2 integrate .. //depot/projects/ia64/lib/libkse/Makefile#1 branch .. //depot/projects/ia64/lib/libkse/arch/amd64/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libkse/arch/amd64/amd64/context.S#1 branch .. //depot/projects/ia64/lib/libkse/arch/amd64/amd64/enter_uts.S#1 branch .. //depot/projects/ia64/lib/libkse/arch/amd64/amd64/pthread_md.c#1 branch .. //depot/projects/ia64/lib/libkse/arch/amd64/include/atomic_ops.h#1 branch .. //depot/projects/ia64/lib/libkse/arch/amd64/include/pthread_md.h#1 branch .. //depot/projects/ia64/lib/libkse/arch/arm/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libkse/arch/arm/arm/context.S#1 branch .. //depot/projects/ia64/lib/libkse/arch/arm/arm/pthread_md.c#1 branch .. //depot/projects/ia64/lib/libkse/arch/arm/include/atomic_ops.h#1 branch .. //depot/projects/ia64/lib/libkse/arch/arm/include/pthread_md.h#1 branch .. //depot/projects/ia64/lib/libkse/arch/i386/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libkse/arch/i386/i386/pthread_md.c#1 branch .. //depot/projects/ia64/lib/libkse/arch/i386/i386/thr_enter_uts.S#1 branch .. //depot/projects/ia64/lib/libkse/arch/i386/i386/thr_getcontext.S#1 branch .. //depot/projects/ia64/lib/libkse/arch/i386/include/atomic_ops.h#1 branch .. //depot/projects/ia64/lib/libkse/arch/i386/include/pthread_md.h#1 branch .. //depot/projects/ia64/lib/libkse/arch/ia64/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libkse/arch/ia64/ia64/context.S#1 branch .. //depot/projects/ia64/lib/libkse/arch/ia64/ia64/enter_uts.S#1 branch .. //depot/projects/ia64/lib/libkse/arch/ia64/ia64/pthread_md.c#1 branch .. //depot/projects/ia64/lib/libkse/arch/ia64/include/atomic_ops.h#1 branch .. //depot/projects/ia64/lib/libkse/arch/ia64/include/pthread_md.h#1 branch .. //depot/projects/ia64/lib/libkse/arch/powerpc/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libkse/arch/powerpc/include/atomic_ops.h#1 branch .. //depot/projects/ia64/lib/libkse/arch/powerpc/include/pthread_md.h#1 branch .. //depot/projects/ia64/lib/libkse/arch/powerpc/powerpc/assym.c#1 branch .. //depot/projects/ia64/lib/libkse/arch/powerpc/powerpc/assym.s#1 branch .. //depot/projects/ia64/lib/libkse/arch/powerpc/powerpc/context.S#1 branch .. //depot/projects/ia64/lib/libkse/arch/powerpc/powerpc/enter_uts.S#1 branch .. //depot/projects/ia64/lib/libkse/arch/powerpc/powerpc/pthread_md.c#1 branch .. //depot/projects/ia64/lib/libkse/arch/sparc64/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libkse/arch/sparc64/include/atomic_ops.h#1 branch .. //depot/projects/ia64/lib/libkse/arch/sparc64/include/pthread_md.h#1 branch .. //depot/projects/ia64/lib/libkse/arch/sparc64/sparc64/assym.s#1 branch .. //depot/projects/ia64/lib/libkse/arch/sparc64/sparc64/pthread_md.c#1 branch .. //depot/projects/ia64/lib/libkse/arch/sparc64/sparc64/thr_getcontext.S#1 branch .. //depot/projects/ia64/lib/libkse/kse.map#1 branch .. //depot/projects/ia64/lib/libkse/support/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libkse/support/thr_support.c#1 branch .. //depot/projects/ia64/lib/libkse/sys/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libkse/sys/lock.c#1 branch .. //depot/projects/ia64/lib/libkse/sys/lock.h#1 branch .. //depot/projects/ia64/lib/libkse/sys/thr_error.c#1 branch .. //depot/projects/ia64/lib/libkse/test/Makefile#1 branch .. //depot/projects/ia64/lib/libkse/test/README#1 branch .. //depot/projects/ia64/lib/libkse/test/guard_b.c#1 branch .. //depot/projects/ia64/lib/libkse/test/guard_b.exp#1 branch .. //depot/projects/ia64/lib/libkse/test/guard_s.pl#1 branch .. //depot/projects/ia64/lib/libkse/test/hello_b.c#1 branch .. //depot/projects/ia64/lib/libkse/test/hello_d.c#1 branch .. //depot/projects/ia64/lib/libkse/test/hello_d.exp#1 branch .. //depot/projects/ia64/lib/libkse/test/hello_s.c#1 branch .. //depot/projects/ia64/lib/libkse/test/join_leak_d.c#1 branch .. //depot/projects/ia64/lib/libkse/test/join_leak_d.exp#1 branch .. //depot/projects/ia64/lib/libkse/test/mutex_d.c#1 branch .. //depot/projects/ia64/lib/libkse/test/mutex_d.exp#1 branch .. //depot/projects/ia64/lib/libkse/test/propagate_s.pl#1 branch .. //depot/projects/ia64/lib/libkse/test/sem_d.c#1 branch .. //depot/projects/ia64/lib/libkse/test/sem_d.exp#1 branch .. //depot/projects/ia64/lib/libkse/test/sigsuspend_d.c#1 branch .. //depot/projects/ia64/lib/libkse/test/sigsuspend_d.exp#1 branch .. //depot/projects/ia64/lib/libkse/test/sigwait_d.c#1 branch .. //depot/projects/ia64/lib/libkse/test/sigwait_d.exp#1 branch .. //depot/projects/ia64/lib/libkse/test/verify#1 branch .. //depot/projects/ia64/lib/libkse/thread/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_accept.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_aio_suspend.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_atfork.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_attr_destroy.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_attr_get_np.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_attr_getdetachstate.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_attr_getguardsize.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_attr_getinheritsched.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_attr_getschedparam.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_attr_getschedpolicy.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_attr_getscope.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_attr_getstack.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_attr_getstackaddr.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_attr_getstacksize.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_attr_init.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_attr_setdetachstate.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_attr_setguardsize.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_attr_setinheritsched.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_attr_setschedparam.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_attr_setschedpolicy.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_attr_setscope.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_attr_setstack.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_attr_setstackaddr.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_attr_setstacksize.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_autoinit.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_barrier.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_barrierattr.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_cancel.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_clean.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_close.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_concurrency.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_cond.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_condattr_destroy.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_condattr_init.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_condattr_pshared.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_connect.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_creat.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_create.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_detach.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_equal.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_execve.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_exit.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_fcntl.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_find_thread.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_fork.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_fsync.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_getprio.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_getschedparam.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_info.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_init.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_join.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_kern.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_kill.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_main_np.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_mattr_init.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_mattr_kind_np.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_mattr_pshared.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_msync.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_multi_np.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_mutex.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_mutex_prioceiling.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_mutex_protocol.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_mutexattr_destroy.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_nanosleep.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_once.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_open.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_pause.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_poll.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_printf.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_priority_queue.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_private.h#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_pselect.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_pspinlock.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_raise.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_read.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_readv.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_resume_np.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_rtld.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_rwlock.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_rwlockattr.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_select.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_self.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_sem.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_seterrno.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_setprio.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_setschedparam.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_sig.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_sigaction.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_sigaltstack.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_sigmask.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_sigpending.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_sigprocmask.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_sigsuspend.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_sigwait.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_single_np.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_sleep.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_spec.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_spinlock.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_stack.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_suspend_np.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_switch_np.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_symbols.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_system.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_tcdrain.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_vfork.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_wait.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_wait4.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_waitpid.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_write.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_writev.c#1 branch .. //depot/projects/ia64/lib/libkse/thread/thr_yield.c#1 branch .. //depot/projects/ia64/lib/libkvm/kvm_proc.c#34 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#8 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_unix/Makefile#10 integrate .. //depot/projects/ia64/lib/libpcap/Makefile#12 integrate .. //depot/projects/ia64/lib/libpcap/config.h#6 integrate .. //depot/projects/ia64/lib/libpmc/Makefile#4 integrate .. //depot/projects/ia64/lib/libpmc/pmc.3#7 integrate .. //depot/projects/ia64/lib/libpmc/pmc_allocate.3#1 branch .. //depot/projects/ia64/lib/libpmc/pmc_attach.3#1 branch .. //depot/projects/ia64/lib/libpmc/pmc_capabilities.3#1 branch .. //depot/projects/ia64/lib/libpmc/pmc_configure_logfile.3#1 branch .. //depot/projects/ia64/lib/libpmc/pmc_disable.3#1 branch .. //depot/projects/ia64/lib/libpmc/pmc_event_names_of_class.3#1 branch .. //depot/projects/ia64/lib/libpmc/pmc_get_driver_stats.3#1 branch .. //depot/projects/ia64/lib/libpmc/pmc_get_msr.3#1 branch .. //depot/projects/ia64/lib/libpmc/pmc_init.3#1 branch .. //depot/projects/ia64/lib/libpmc/pmc_name_of_capability.3#1 branch .. //depot/projects/ia64/lib/libpmc/pmc_read.3#1 branch .. //depot/projects/ia64/lib/libpmc/pmc_set.3#1 branch .. //depot/projects/ia64/lib/libpmc/pmc_start.3#1 branch .. //depot/projects/ia64/lib/libpmc/pmclog.c#3 integrate .. //depot/projects/ia64/lib/libpmc/pmclog.h#3 integrate .. //depot/projects/ia64/lib/libpthread/Makefile#23 delete .. //depot/projects/ia64/lib/libpthread/arch/amd64/Makefile.inc#3 delete .. //depot/projects/ia64/lib/libpthread/arch/amd64/amd64/context.S#7 delete .. //depot/projects/ia64/lib/libpthread/arch/amd64/amd64/enter_uts.S#6 delete .. //depot/projects/ia64/lib/libpthread/arch/amd64/amd64/pthread_md.c#5 delete .. //depot/projects/ia64/lib/libpthread/arch/amd64/include/atomic_ops.h#3 delete .. //depot/projects/ia64/lib/libpthread/arch/amd64/include/pthread_md.h#8 delete .. //depot/projects/ia64/lib/libpthread/arch/arm/Makefile.inc#3 delete .. //depot/projects/ia64/lib/libpthread/arch/arm/arm/context.S#4 delete .. //depot/projects/ia64/lib/libpthread/arch/arm/arm/pthread_md.c#5 delete .. //depot/projects/ia64/lib/libpthread/arch/arm/include/atomic_ops.h#4 delete .. //depot/projects/ia64/lib/libpthread/arch/arm/include/pthread_md.h#6 delete .. //depot/projects/ia64/lib/libpthread/arch/i386/Makefile.inc#4 delete .. //depot/projects/ia64/lib/libpthread/arch/i386/i386/pthread_md.c#7 delete .. //depot/projects/ia64/lib/libpthread/arch/i386/i386/thr_enter_uts.S#6 delete .. //depot/projects/ia64/lib/libpthread/arch/i386/i386/thr_getcontext.S#6 delete .. //depot/projects/ia64/lib/libpthread/arch/i386/include/atomic_ops.h#3 delete .. //depot/projects/ia64/lib/libpthread/arch/i386/include/pthread_md.h#13 delete .. //depot/projects/ia64/lib/libpthread/arch/ia64/Makefile.inc#5 delete .. //depot/projects/ia64/lib/libpthread/arch/ia64/ia64/context.S#5 delete .. //depot/projects/ia64/lib/libpthread/arch/ia64/ia64/enter_uts.S#2 delete .. //depot/projects/ia64/lib/libpthread/arch/ia64/ia64/pthread_md.c#5 delete .. //depot/projects/ia64/lib/libpthread/arch/powerpc/Makefile.inc#2 delete .. //depot/projects/ia64/lib/libpthread/arch/powerpc/include/atomic_ops.h#2 delete .. //depot/projects/ia64/lib/libpthread/arch/powerpc/include/pthread_md.h#3 delete .. //depot/projects/ia64/lib/libpthread/arch/powerpc/powerpc/assym.c#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 4 05:20:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FD8516A41B; Tue, 4 Dec 2007 05: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 CCF1D16A419 for ; Tue, 4 Dec 2007 05:20:22 +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 C8E0E13C448 for ; Tue, 4 Dec 2007 05:20:22 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB45KMLp057151 for ; Tue, 4 Dec 2007 05:20:22 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB45KMmI057143 for perforce@freebsd.org; Tue, 4 Dec 2007 05:20:22 GMT (envelope-from sam@freebsd.org) Date: Tue, 4 Dec 2007 05:20:22 GMT Message-Id: <200712040520.lB45KMmI057143@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 130140 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2007 05:20:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=130140 Change 130140 by sam@sam_ebb on 2007/12/04 05:20:01 sync w/ vap code Affected files ... .. //depot/projects/vap/tools/tools/net80211/wlanwatch/wlanwatch.c#3 edit Differences ... ==== //depot/projects/vap/tools/tools/net80211/wlanwatch/wlanwatch.c#3 (text+ko) ==== @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -74,6 +67,14 @@ #include #include +/* XXX */ +enum ieee80211_notify_cac_event { + IEEE80211_NOTIFY_CAC_START = 0, /* CAC timer started */ + IEEE80211_NOTIFY_CAC_STOP = 1, /* CAC intentionally stopped */ + IEEE80211_NOTIFY_CAC_RADAR = 2, /* CAC stopped due to radar detectio */ + IEEE80211_NOTIFY_CAC_EXPIRE = 3, /* CAC expired w/o radar */ +}; + static void print_rtmsg(struct rt_msghdr *rtm, int msglen); int nflag = 0; @@ -95,10 +96,7 @@ } static void -bprintf(fp, b, s) - FILE *fp; - int b; - u_char *s; +bprintf(FILE *fp, int b, char *s) { int i; int gotsome = 0; @@ -138,9 +136,8 @@ char addrnames[] = "\1DST\2GATEWAY\3NETMASK\4GENMASK\5IFP\6IFA\7AUTHOR\010BRD"; -const char * -routename(sa) - struct sockaddr *sa; +static const char * +routename(struct sockaddr *sa) { char *cp; static char line[MAXHOSTNAMELEN + 1]; @@ -293,7 +290,6 @@ { struct if_msghdr *ifm; struct if_announcemsghdr *ifan; - char *state; time_t now = time(NULL); char *cnow = ctime(&now); @@ -309,16 +305,16 @@ cnow, ifm->ifm_index); switch (ifm->ifm_data.ifi_link_state) { case LINK_STATE_DOWN: - state = "down"; + printf("link: down, flags:"); break; case LINK_STATE_UP: - state = "up"; + printf("link: up, flags:"); break; default: - state = "unknown"; + printf("link: unknown<%d>, flags:", + ifm->ifm_data.ifi_link_state); break; } - printf("link: %s, flags:", state); bprintf(stdout, ifm->ifm_flags, ifnetflags); pmsg_addrs((char *)(ifm + 1), ifm->ifm_addrs); break; @@ -391,6 +387,53 @@ , V(ieee80211_michael_event)->iev_keyix ); break; + case RTM_IEEE80211_WDS: + printf("%s wds discovery", + ether_sprintf(V(ieee80211_wds_event)->iev_addr)); + break; + case RTM_IEEE80211_CSA: + printf("channel switch announcement: channel %u (%u MHz flags 0x%x) mode %d count %d" + , V(ieee80211_csa_event)->iev_ieee + , V(ieee80211_csa_event)->iev_freq + , V(ieee80211_csa_event)->iev_flags + , V(ieee80211_csa_event)->iev_mode + , V(ieee80211_csa_event)->iev_count + ); + break; + case RTM_IEEE80211_CAC: + printf("channel availability check " + "(channel %u, %u MHz flags 0x%x) " + , V(ieee80211_cac_event)->iev_ieee + , V(ieee80211_cac_event)->iev_freq + , V(ieee80211_cac_event)->iev_flags + ); + switch (V(ieee80211_cac_event)->iev_type) { + case IEEE80211_NOTIFY_CAC_START: + printf("start timer"); + break; + case IEEE80211_NOTIFY_CAC_STOP: + printf("stop timer"); + break; + case IEEE80211_NOTIFY_CAC_EXPIRE: + printf("timer expired"); + break; + case IEEE80211_NOTIFY_CAC_RADAR: + printf("radar detected"); + break; + default: + printf("unknown type %d", + V(ieee80211_cac_event)->iev_type); + break; + } + break; + case RTM_IEEE80211_DEAUTH: + printf("%s wds deauth", + ether_sprintf(V(ieee80211_deauth_event)->iev_addr)); + break; + case RTM_IEEE80211_AUTH: + printf("%s node authenticate", + ether_sprintf(V(ieee80211_auth_event)->iev_addr)); + break; default: printf("if# %d, what: #%d", ifan->ifan_index, ifan->ifan_what); From owner-p4-projects@FreeBSD.ORG Tue Dec 4 05:29:33 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B27716A420; Tue, 4 Dec 2007 05:29:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 249D016A419 for ; Tue, 4 Dec 2007 05:29:33 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 08C3213C478 for ; Tue, 4 Dec 2007 05:29:33 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB45TWC8058472 for ; Tue, 4 Dec 2007 05:29:32 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB45TWTm058469 for perforce@freebsd.org; Tue, 4 Dec 2007 05:29:32 GMT (envelope-from thompsa@freebsd.org) Date: Tue, 4 Dec 2007 05:29:32 GMT Message-Id: <200712040529.lB45TWTm058469@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 130141 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2007 05:29:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=130141 Change 130141 by thompsa@thompsa_heff on 2007/12/04 05:28:50 Spelling :) Affected files ... .. //depot/projects/vap/sbin/ifconfig/ifconfig.8#6 edit Differences ... ==== //depot/projects/vap/sbin/ifconfig/ifconfig.8#6 (text+ko) ==== @@ -28,7 +28,7 @@ .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 .\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.144 2007/11/04 08:32:26 thompsa Exp $ .\" -.Dd Deceober 3, 2007 +.Dd December 3, 2007 .Dt IFCONFIG 8 .Os .Sh NAME From owner-p4-projects@FreeBSD.ORG Tue Dec 4 05:32:37 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3BC316A420; Tue, 4 Dec 2007 05:32: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 7D1B316A417 for ; Tue, 4 Dec 2007 05:32:36 +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 79B7813C45A for ; Tue, 4 Dec 2007 05:32:36 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB45WaRe059505 for ; Tue, 4 Dec 2007 05:32:36 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB45Wa8w059500 for perforce@freebsd.org; Tue, 4 Dec 2007 05:32:36 GMT (envelope-from sam@freebsd.org) Date: Tue, 4 Dec 2007 05:32:36 GMT Message-Id: <200712040532.lB45Wa8w059500@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 130142 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2007 05:32:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=130142 Change 130142 by sam@sam_ebb on 2007/12/04 05:32:26 sync w/ vap code Affected files ... .. //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#3 edit Differences ... ==== //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#3 (text+ko) ==== @@ -32,8 +32,6 @@ #include #include -#include -#include #include struct wpa_driver_bsd_data { @@ -192,7 +190,21 @@ wpa_driver_bsd_set_wpa_ie(struct wpa_driver_bsd_data *drv, const char *wpa_ie, size_t wpa_ie_len) { - return set80211var(drv, IEEE80211_IOC_OPTIE, wpa_ie, wpa_ie_len); + struct ieee80211req ireq; + + memset(&ireq, 0, sizeof(ireq)); + strncpy(ireq.i_name, drv->ifname, IFNAMSIZ); + ireq.i_type = IEEE80211_IOC_APPIE; + ireq.i_val = IEEE80211_APPIE_WPA; + ireq.i_len = wpa_ie_len; + ireq.i_data = (void *) wpa_ie; + if (ioctl(drv->sock, SIOCS80211, &ireq) < 0) { + fprintf(stderr, + "ioctl[IEEE80211_IOC_APPIE:IEEE80211_APPIE_WPA]: %s\n", + strerror(errno)); + return -1; + } + return 0; } static int @@ -441,18 +453,27 @@ wpa_driver_bsd_scan(void *priv, const u8 *ssid, size_t ssid_len) { struct wpa_driver_bsd_data *drv = priv; + struct ieee80211_scan_req sr; int flags; + /* XXX not true but easiest to perpetuate the myth */ /* NB: interface must be marked UP to do a scan */ if (getifflags(drv, &flags) != 0 || setifflags(drv, flags | IFF_UP) != 0) return -1; - /* set desired ssid before scan */ - if (wpa_driver_bsd_set_ssid(drv, ssid, ssid_len) < 0) - return -1; + memset(&sr, 0, sizeof(sr)); + sr.sr_flags = IEEE80211_IOC_SCAN_ACTIVE + | IEEE80211_IOC_SCAN_ONCE + | IEEE80211_IOC_SCAN_NOPICK + ; + sr.sr_duration = IEEE80211_IOC_SCAN_FOREVER; + sr.sr_nssid = 1; + /* XXX ssid_len must be <= IEEE80211_NWID_LEN */ + memcpy(sr.sr_ssid[0].ssid, ssid, ssid_len); + sr.sr_ssid[0].len = ssid_len; /* NB: net80211 delivers a scan complete event so no need to poll */ - return set80211param(drv, IEEE80211_IOC_SCAN_REQ, 0); + return set80211var(drv, IEEE80211_IOC_SCAN_REQ, &sr, sizeof(sr)); } #include From owner-p4-projects@FreeBSD.ORG Tue Dec 4 05:38:44 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF45216A421; Tue, 4 Dec 2007 05:38:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7C84116A418 for ; Tue, 4 Dec 2007 05:38:43 +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 792D213C447 for ; Tue, 4 Dec 2007 05:38:43 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB45chLk060157 for ; Tue, 4 Dec 2007 05:38:43 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB45chPO060154 for perforce@freebsd.org; Tue, 4 Dec 2007 05:38:43 GMT (envelope-from sam@freebsd.org) Date: Tue, 4 Dec 2007 05:38:43 GMT Message-Id: <200712040538.lB45chPO060154@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 130143 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2007 05:38:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=130143 Change 130143 by sam@sam_ebb on 2007/12/04 05:37:46 sync w/ vap code Affected files ... .. //depot/projects/vap/usr.sbin/wpa/hostapd/driver_freebsd.c#3 edit Differences ... ==== //depot/projects/vap/usr.sbin/wpa/hostapd/driver_freebsd.c#3 (text+ko) ==== @@ -25,8 +25,6 @@ #include #include -#include -#include #include #include "hostapd.h" @@ -48,6 +46,7 @@ struct hostapd_data *hapd; /* back pointer */ char iface[IFNAMSIZ + 1]; + unsigned int ifindex; /* interface index */ struct l2_packet_data *sock_xmit; /* raw packet xmit socket */ int ioctl_sock; /* socket for ioctl() use */ int wext_sock; /* socket for wireless events */ @@ -122,98 +121,6 @@ return buf; } -/* - * Configure WPA parameters. - */ -static int -bsd_configure_wpa(struct bsd_driver_data *drv) -{ - static const char *ciphernames[] = - { "WEP", "TKIP", "AES-OCB", "AES-CCM", "*BAD*", "CKIP", "NONE" }; - struct hostapd_data *hapd = drv->hapd; - struct hostapd_bss_config *conf = hapd->conf; - int v; - - switch (conf->wpa_group) { - case WPA_CIPHER_CCMP: - v = IEEE80211_CIPHER_AES_CCM; - break; - case WPA_CIPHER_TKIP: - v = IEEE80211_CIPHER_TKIP; - break; - case WPA_CIPHER_WEP104: - v = IEEE80211_CIPHER_WEP; - break; - case WPA_CIPHER_WEP40: - v = IEEE80211_CIPHER_WEP; - break; - case WPA_CIPHER_NONE: - v = IEEE80211_CIPHER_NONE; - break; - default: - printf("Unknown group key cipher %u\n", - conf->wpa_group); - return -1; - } - HOSTAPD_DEBUG(HOSTAPD_DEBUG_MINIMAL, - "%s: group key cipher=%s (%u)\n", __func__, ciphernames[v], v); - if (set80211param(drv, IEEE80211_IOC_MCASTCIPHER, v)) { - printf("Unable to set group key cipher to %u (%s)\n", - v, ciphernames[v]); - return -1; - } - if (v == IEEE80211_CIPHER_WEP) { - /* key length is done only for specific ciphers */ - v = (conf->wpa_group == WPA_CIPHER_WEP104 ? 13 : 5); - if (set80211param(drv, IEEE80211_IOC_MCASTKEYLEN, v)) { - printf("Unable to set group key length to %u\n", v); - return -1; - } - } - - v = 0; - if (conf->wpa_pairwise & WPA_CIPHER_CCMP) - v |= 1<wpa_pairwise & WPA_CIPHER_TKIP) - v |= 1<wpa_pairwise & WPA_CIPHER_NONE) - v |= 1<wpa_key_mgmt); - if (set80211param(drv, IEEE80211_IOC_KEYMGTALGS, conf->wpa_key_mgmt)) { - printf("Unable to set key management algorithms to 0x%x\n", - conf->wpa_key_mgmt); - return -1; - } - - v = 0; - if (conf->rsn_preauth) - v |= BIT(0); - HOSTAPD_DEBUG(HOSTAPD_DEBUG_MINIMAL, - "%s: rsn capabilities=0x%x\n", __func__, conf->rsn_preauth); - if (set80211param(drv, IEEE80211_IOC_RSNCAPS, v)) { - printf("Unable to set RSN capabilities to 0x%x\n", v); - return -1; - } - - HOSTAPD_DEBUG(HOSTAPD_DEBUG_MINIMAL, - "%s: enable WPA= 0x%x\n", __func__, conf->wpa); - if (set80211param(drv, IEEE80211_IOC_WPA, conf->wpa)) { - printf("Unable to set WPA to %u\n", conf->wpa); - return -1; - } - return 0; -} - - static int bsd_set_iface_flags(void *priv, int dev_up) { @@ -279,7 +186,7 @@ HOSTAPD_LEVEL_WARNING, "No 802.1X or WPA enabled!"); return -1; } - if (conf->wpa && bsd_configure_wpa(drv) != 0) { + if (conf->wpa && set80211param(drv, IEEE80211_IOC_WPA, conf->wpa)) { hostapd_logger(hapd, NULL, HOSTAPD_MODULE_DRIVER, HOSTAPD_LEVEL_WARNING, "Error configuring WPA state!"); return -1; @@ -394,14 +301,16 @@ memset(&wk, 0, sizeof(wk)); wk.ik_type = cipher; - wk.ik_flags = IEEE80211_KEY_RECV | IEEE80211_KEY_XMIT; if (addr == NULL) { memset(wk.ik_macaddr, 0xff, IEEE80211_ADDR_LEN); wk.ik_keyix = key_idx; - wk.ik_flags |= IEEE80211_KEY_DEFAULT | IEEE80211_KEY_GROUP; + wk.ik_flags = IEEE80211_KEY_XMIT + | IEEE80211_KEY_GROUP + | IEEE80211_KEY_DEFAULT; } else { memcpy(wk.ik_macaddr, addr, IEEE80211_ADDR_LEN); wk.ik_keyix = IEEE80211_KEYIX_NONE; + wk.ik_flags = IEEE80211_KEY_RECV | IEEE80211_KEY_XMIT; } wk.ik_keylen = key_len; memcpy(wk.ik_keydata, key, key_len); @@ -487,10 +396,23 @@ static int bsd_set_opt_ie(const char *ifname, void *priv, const u8 *ie, size_t ie_len) { - /* - * Do nothing; we setup parameters at startup that define the - * contents of the beacon information element. - */ + struct bsd_driver_data *drv = priv; + struct hostapd_data *hapd = drv->hapd; + struct ieee80211req ireq; + + memset(&ireq, 0, sizeof(ireq)); + strncpy(ireq.i_name, drv->iface, IFNAMSIZ); + ireq.i_type = IEEE80211_IOC_APPIE; + ireq.i_val = IEEE80211_APPIE_WPA; + ireq.i_data = (void *) ie; + ireq.i_len = ie_len; + + HOSTAPD_DEBUG(HOSTAPD_DEBUG_MINIMAL, "%s: set WPA+RSN ie (len %d)\n", + __func__, ie_len); + if (ioctl(drv->ioctl_sock, SIOCS80211, &ireq) < 0) { + printf("Unable to set WPA+RSN ie\n"); + return -1; + } return 0; } @@ -638,6 +560,12 @@ return; } ifan = (struct if_announcemsghdr *) rtm; + if (ifan->ifan_index != drv->ifindex) { + wpa_printf(MSG_DEBUG, "Discard routing message to if#%d " + "(not for us %d)\n", + ifan->ifan_index, drv->ifindex); + return; + } switch (rtm->rtm_type) { case RTM_IEEE80211: switch (ifan->ifan_what) { @@ -820,6 +748,18 @@ goto bad; } memcpy(drv->iface, hapd->conf->iface, sizeof(drv->iface)); + /* + * NB: We require the interface name be mappable to an index. + * This implies we do not support having wpa_supplicant + * wait for an interface to appear. This seems ok; that + * doesn't belong here; it's really the job of devd. + * XXXSCW: devd is FreeBSD-specific. + */ + drv->ifindex = if_nametoindex(drv->iface); + if (drv->ifindex == 0) { + printf("%s: interface %s does not exist", __func__, drv->iface); + goto bad; + } drv->sock_xmit = l2_packet_init(drv->iface, NULL, ETH_P_EAPOL, handle_read, drv, 1); From owner-p4-projects@FreeBSD.ORG Tue Dec 4 06:19:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E388D16A41A; Tue, 4 Dec 2007 06:19: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 7008716A419 for ; Tue, 4 Dec 2007 06:19:29 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6D24B13C461 for ; Tue, 4 Dec 2007 06:19:29 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB46JRGg067473 for ; Tue, 4 Dec 2007 06:19:27 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB46JRpG067470 for perforce@freebsd.org; Tue, 4 Dec 2007 06:19:27 GMT (envelope-from marcel@freebsd.org) Date: Tue, 4 Dec 2007 06:19:27 GMT Message-Id: <200712040619.lB46JRpG067470@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130147 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2007 06:19:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=130147 Change 130147 by marcel@marcel_xcllnt on 2007/12/04 06:18:41 The PART::offset attribute returns LBAs. We need to use gpe_start and not gpe_offset as the latter is a byte offset. Affected files ... .. //depot/projects/ia64/sys/geom/part/g_part.c#6 edit Differences ... ==== //depot/projects/ia64/sys/geom/part/g_part.c#6 (text+ko) ==== @@ -1524,7 +1524,7 @@ if (g_handleattr_int(bp, "PART::depth", table->gpt_depth)) return; if (g_handleattr_int(bp, "PART::offset", - table->gpt_offset + entry->gpe_offset)) + table->gpt_offset + entry->gpe_start)) return; if (!strcmp("GEOM::kerneldump", bp->bio_attribute)) { /* From owner-p4-projects@FreeBSD.ORG Tue Dec 4 20:35:53 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3EE2416A41B; Tue, 4 Dec 2007 20:35: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 9253416A419 for ; Tue, 4 Dec 2007 20:35: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 8032813C461 for ; Tue, 4 Dec 2007 20:35:52 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB4KZqhD000508 for ; Tue, 4 Dec 2007 20:35:52 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB4KZqBA000505 for perforce@freebsd.org; Tue, 4 Dec 2007 20:35:52 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 4 Dec 2007 20:35:52 GMT Message-Id: <200712042035.lB4KZqBA000505@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 130185 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2007 20:35:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=130185 Change 130185 by hselasky@hselasky_laptop001 on 2007/12/04 20:35:00 Compile fixes for Sparc64. The change to "usb_transfer.c" is actually a bug fix. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ums.c#31 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#61 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ums.c#31 (text+ko) ==== @@ -186,7 +186,7 @@ if (len > sizeof(sc->sc_temp)) { DPRINTF(5, "truncating large packet to %d bytes\n", - sizeof(sc->sc_temp)); + (int)sizeof(sc->sc_temp)); len = sizeof(sc->sc_temp); } if (len == 0) { ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#61 (text+ko) ==== @@ -1468,10 +1468,10 @@ { struct usbd_memory_info *info; + info = xfer->usb_root; + mtx_assert(info->priv_mtx, MA_OWNED); - info = xfer->usb_root; - if (info->dma_curr_xfer == xfer) { /* prepare next USB transfer to load, if any */ info->dma_curr_xfer = From owner-p4-projects@FreeBSD.ORG Tue Dec 4 20:39:56 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D48816A41A; Tue, 4 Dec 2007 20:39:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BAEF016A417; Tue, 4 Dec 2007 20:39:55 +0000 (UTC) (envelope-from brooks@lor.one-eyed-alien.net) Received: from lor.one-eyed-alien.net (cl-162.ewr-01.us.sixxs.net [IPv6:2001:4830:1200:a1::2]) by mx1.freebsd.org (Postfix) with ESMTP id 559CE13C467; Tue, 4 Dec 2007 20:39:55 +0000 (UTC) (envelope-from brooks@lor.one-eyed-alien.net) Received: from lor.one-eyed-alien.net (localhost [127.0.0.1]) by lor.one-eyed-alien.net (8.14.1/8.13.8) with ESMTP id lB4Kds8D043521; Tue, 4 Dec 2007 14:39:54 -0600 (CST) (envelope-from brooks@lor.one-eyed-alien.net) Received: (from brooks@localhost) by lor.one-eyed-alien.net (8.14.1/8.13.8/Submit) id lB4KdsD5043520; Tue, 4 Dec 2007 14:39:54 -0600 (CST) (envelope-from brooks) Date: Tue, 4 Dec 2007 14:39:54 -0600 From: Brooks Davis To: Hans Petter Selasky Message-ID: <20071204203954.GA43394@lor.one-eyed-alien.net> References: <200712042035.lB4KZqBA000505@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="azLHFNyN32YCQGCU" Content-Disposition: inline In-Reply-To: <200712042035.lB4KZqBA000505@repoman.freebsd.org> User-Agent: Mutt/1.5.16 (2007-06-09) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (lor.one-eyed-alien.net [127.0.0.1]); Tue, 04 Dec 2007 14:39:54 -0600 (CST) Cc: Perforce Change Reviews Subject: Re: PERFORCE change 130185 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2007 20:39:56 -0000 --azLHFNyN32YCQGCU Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Dec 04, 2007 at 08:35:52PM +0000, Hans Petter Selasky wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D130185 >=20 > Change 130185 by hselasky@hselasky_laptop001 on 2007/12/04 20:35:00 >=20 > =09 > Compile fixes for Sparc64. > =09 > The change to "usb_transfer.c" is actually > a bug fix. > =3D=3D=3D=3D //depot/projects/usb/src/sys/dev/usb/ums.c#31 (text+ko) =3D= =3D=3D=3D >=20 > @@ -186,7 +186,7 @@ > =20 > if (len > sizeof(sc->sc_temp)) { > DPRINTF(5, "truncating large packet to %d bytes\n", > - sizeof(sc->sc_temp)); > + (int)sizeof(sc->sc_temp)); You should use %zu to print size_t's, not cast them to ints. -- Brooks --azLHFNyN32YCQGCU Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (FreeBSD) iD8DBQFHVbsZXY6L6fI4GtQRAvGZAKCqQ215Ex9w0cScUTetnH5qZ9/KGQCePZYw 2TCtKVPgi5/JKEMzwYPI/uo= =q87/ -----END PGP SIGNATURE----- --azLHFNyN32YCQGCU-- From owner-p4-projects@FreeBSD.ORG Tue Dec 4 20:50:08 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78CBD16A421; Tue, 4 Dec 2007 20:50: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 3425216A419 for ; Tue, 4 Dec 2007 20:50:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0A8E913C447 for ; Tue, 4 Dec 2007 20:50:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB4Ko7SH011141 for ; Tue, 4 Dec 2007 20:50:07 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB4Ko78c011138 for perforce@freebsd.org; Tue, 4 Dec 2007 20:50:07 GMT (envelope-from jb@freebsd.org) Date: Tue, 4 Dec 2007 20:50:07 GMT Message-Id: <200712042050.lB4Ko78c011138@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130188 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2007 20:50:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=130188 Change 130188 by jb@jb_freebsd1 on 2007/12/04 20:49:46 Use the new emulation type. Affected files ... .. //depot/projects/binutils/src/sys/conf/ldscript.amd64#2 edit Differences ... ==== //depot/projects/binutils/src/sys/conf/ldscript.amd64#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/conf/ldscript.amd64,v 1.9 2004/05/29 01:09:00 tjr Exp $ */ -OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") +OUTPUT_FORMAT("elf64-x86-64-freebsd", "elf64-x86-64-freebsd", "elf64-x86-64-freebsd") OUTPUT_ARCH(i386:x86-64) ENTRY(btext) SEARCH_DIR("/usr/lib"); From owner-p4-projects@FreeBSD.ORG Tue Dec 4 20:53:13 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8944316A47C; Tue, 4 Dec 2007 20:53: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 A639B16A46B for ; Tue, 4 Dec 2007 20:53:12 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 938E813C45B for ; Tue, 4 Dec 2007 20:53:12 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB4KrCSc012180 for ; Tue, 4 Dec 2007 20:53:12 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB4KrCYr012177 for perforce@freebsd.org; Tue, 4 Dec 2007 20:53:12 GMT (envelope-from jb@freebsd.org) Date: Tue, 4 Dec 2007 20:53:12 GMT Message-Id: <200712042053.lB4KrCYr012177@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130190 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2007 20:53:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=130190 Change 130190 by jb@jb_freebsd1 on 2007/12/04 20:52:53 Remove the intl library. We haven't used that in the past. Affected files ... .. //depot/projects/binutils/src/gnu/usr.bin/binutils/addr2line/Makefile#4 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/ar/Makefile#4 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/as/Makefile#4 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/gasp/Makefile#3 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/gdb/Makefile#3 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/libbinutils/Makefile#5 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/libopcodes/Makefile#3 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/nm/Makefile#4 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/objcopy/Makefile#4 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/objdump/Makefile#4 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/ranlib/Makefile#4 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/readelf/Makefile#4 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/size/Makefile#4 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/strings/Makefile#4 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/strip/Makefile#4 edit Differences ... ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/addr2line/Makefile#4 (text+ko) ==== @@ -10,11 +10,9 @@ CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils -CFLAGS+= -I${.CURDIR}/../libintl DPADD= ${RELTOP}/libbinutils/libbinutils.a DPADD+= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libiberty/libiberty.a -DPADD+= ${RELTOP}/libintl/libintl.a LDADD= ${DPADD} .include ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/ar/Makefile#4 (text+ko) ==== @@ -10,12 +10,10 @@ CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/bfd -CFLAGS+= -I${.CURDIR}/../libintl NO_SHARED?= yes DPADD= ${RELTOP}/libbinutils/libbinutils.a DPADD+= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libiberty/libiberty.a -DPADD+= ${RELTOP}/libintl/libintl.a LDADD= ${DPADD} .include ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/as/Makefile#4 (text+ko) ==== @@ -72,14 +72,12 @@ CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${SRCDIR}/gas -I${SRCDIR}/gas/config -I${SRCDIR} CFLAGS+= -I${.CURDIR} -I${.CURDIR}/${TARGET_ARCH}-freebsd -CFLAGS+= -I${.CURDIR}/../libintl NO_SHARED?= yes DPADD= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libiberty/libiberty.a DPADD+= ${RELTOP}/libopcodes/libopcodes.a -DPADD+= ${RELTOP}/libintl/libintl.a LDADD= ${DPADD} .include ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/gasp/Makefile#3 (text+ko) ==== @@ -12,7 +12,6 @@ CFLAGS+= -I${.CURDIR} CFLAGS+= -I${SRCDIR} -I${SRCDIR}/gas -I${SRCDIR}/gas/config DPADD= ${RELTOP}/libiberty/libiberty.a -DPADD+= ${RELTOP}/libintl/libintl.a LDADD= ${DPADD} CLEANFILES= xregex.h ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/gdb/Makefile#3 (text+ko) ==== @@ -71,7 +71,6 @@ LDADD+= ${RELTOP}/libbfd/libbfd.a ${RELTOP}/libopcodes/libopcodes.a LDADD+= -lgnuregex LDADD+= ${RELTOP}/libiberty/libiberty.a -DPADD+= ${RELTOP}/libintl/libintl.a LDADD+= -lreadline -ltermcap CLEANFILES= init.c init.c-tmp nm.h tm.h xm.h gdbversion.c xregex.h kvm-fbsd-machine.h ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/libbinutils/Makefile#5 (text+ko) ==== @@ -31,7 +31,6 @@ CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/bfd -CFLAGS+= -I${.CURDIR}/../libintl INTERNALLIB= .include ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/libopcodes/Makefile#3 (text+ko) ==== @@ -8,7 +8,6 @@ SRCS+= dis-buf.c dis-init.c disassemble.c CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${SRCDIR}/opcodes -I${SRCDIR}/bfd -CFLAGS+= -I${.CURDIR}/../libintl INTERNALLIB= # If set, BINUTILSDISTDIR is the path to a directory containing the full GNU ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/nm/Makefile#4 (text+ko) ==== @@ -11,11 +11,9 @@ CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/bfd CFLAGS+= -I${SRCDIR}/binutils -CFLAGS+= -I${.CURDIR}/../libintl DPADD= ${RELTOP}/libbinutils/libbinutils.a DPADD+= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libiberty/libiberty.a -DPADD+= ${RELTOP}/libintl/libintl.a LDADD= ${DPADD} .include ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/objcopy/Makefile#4 (text+ko) ==== @@ -10,11 +10,9 @@ CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils -I${SRCDIR}/bfd -CFLAGS+= -I${.CURDIR}/../libintl DPADD= ${RELTOP}/libbinutils/libbinutils.a DPADD+= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libiberty/libiberty.a -DPADD+= ${RELTOP}/libintl/libintl.a LDADD= ${DPADD} .include ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/objdump/Makefile#4 (text+ko) ==== @@ -8,15 +8,13 @@ SRCS= objdump.c prdbg.c WARNS?= 2 CFLAGS+= -D_GNU_SOURCE +CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\" CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils -CFLAGS+= -I${.CURDIR}/../libintl -CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\" DPADD= ${RELTOP}/libbinutils/libbinutils.a DPADD+= ${RELTOP}/libopcodes/libopcodes.a DPADD+= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libiberty/libiberty.a -DPADD+= ${RELTOP}/libintl/libintl.a LDADD= ${DPADD} .include ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/ranlib/Makefile#4 (text+ko) ==== @@ -10,12 +10,10 @@ CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/bfd -CFLAGS+= -I${.CURDIR}/../libintl NO_SHARED?= yes DPADD= ${RELTOP}/libbinutils/libbinutils.a DPADD+= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libiberty/libiberty.a -DPADD+= ${RELTOP}/libintl/libintl.a LDADD= ${DPADD} .include ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/readelf/Makefile#4 (text+ko) ==== @@ -12,12 +12,10 @@ WARNS?= 0 CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils -I${SRCDIR}/binutils -CFLAGS+= -I${.CURDIR}/../libintl DPADD= ${RELTOP}/libbinutils/libbinutils.a DPADD+= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libiberty/libiberty.a -DPADD+= ${RELTOP}/libintl/libintl.a LDADD= ${DPADD} .include ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/size/Makefile#4 (text+ko) ==== @@ -10,11 +10,9 @@ CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils -CFLAGS+= -I${.CURDIR}/../libintl DPADD= ${RELTOP}/libbinutils/libbinutils.a DPADD+= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libiberty/libiberty.a -DPADD+= ${RELTOP}/libintl/libintl.a LDADD= ${DPADD} .include ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/strings/Makefile#4 (text+ko) ==== @@ -10,11 +10,9 @@ CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils -CFLAGS+= -I${.CURDIR}/../libintl DPADD= ${RELTOP}/libbinutils/libbinutils.a DPADD+= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libiberty/libiberty.a -DPADD+= ${RELTOP}/libintl/libintl.a LDADD= ${DPADD} .include ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/strip/Makefile#4 (text+ko) ==== @@ -10,11 +10,9 @@ CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils -I${SRCDIR}/bfd -CFLAGS+= -I${.CURDIR}/../libintl DPADD= ${RELTOP}/libbinutils/libbinutils.a DPADD+= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libiberty/libiberty.a -DPADD+= ${RELTOP}/libintl/libintl.a LDADD= ${DPADD} INSTALLFLAGS= -S From owner-p4-projects@FreeBSD.ORG Tue Dec 4 20:53:14 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E4A116A534; Tue, 4 Dec 2007 20:53: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 D561216A46E for ; Tue, 4 Dec 2007 20:53:12 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C006D13C45D for ; Tue, 4 Dec 2007 20:53:12 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB4KrC20012187 for ; Tue, 4 Dec 2007 20:53:12 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB4KrC1p012183 for perforce@freebsd.org; Tue, 4 Dec 2007 20:53:12 GMT (envelope-from swise@FreeBSD.org) Date: Tue, 4 Dec 2007 20:53:12 GMT Message-Id: <200712042053.lB4KrC1p012183@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 130191 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2007 20:53:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=130191 Change 130191 by swise@swise:vic10:iwarp on 2007/12/04 20:53:00 fixed spin lock usage bugs in rdma core. Affected files ... .. //depot/projects/iwarp/sys/contrib/rdma/rdma_addr.c#4 edit .. //depot/projects/iwarp/sys/contrib/rdma/rdma_cma.c#8 edit .. //depot/projects/iwarp/sys/contrib/rdma/rdma_device.c#5 edit .. //depot/projects/iwarp/sys/contrib/rdma/rdma_iwcm.c#5 edit Differences ... ==== //depot/projects/iwarp/sys/contrib/rdma/rdma_addr.c#4 (text+ko) ==== @@ -94,7 +94,7 @@ void rdma_addr_register_client(struct rdma_addr_client *client) { - mtx_init(&client->lock, "rdma_addr client lock", NULL, MTX_DEF); + mtx_init(&client->lock, "rdma_addr client lock", NULL, MTX_DUPOK|MTX_DEF); cv_init(&client->comp, "rdma_addr cv"); client->refcount = 1; } ==== //depot/projects/iwarp/sys/contrib/rdma/rdma_cma.c#8 (text+ko) ==== @@ -216,9 +216,9 @@ { int ret; - mtx_lock(&id_priv->lock); + mtx_lock_spin(&id_priv->lock); ret = (id_priv->state == comp); - mtx_unlock(&id_priv->lock); + mtx_unlock_spin(&id_priv->lock); return ret; } @@ -227,10 +227,10 @@ { int ret; - mtx_lock(&id_priv->lock); + mtx_lock_spin(&id_priv->lock); if ((ret = (id_priv->state == comp))) id_priv->state = exch; - mtx_unlock(&id_priv->lock); + mtx_unlock_spin(&id_priv->lock); return ret; } @@ -239,10 +239,10 @@ { enum cma_state old; - mtx_lock(&id_priv->lock); + mtx_lock_spin(&id_priv->lock); old = id_priv->state; id_priv->state = exch; - mtx_unlock(&id_priv->lock); + mtx_unlock_spin(&id_priv->lock); return old; } @@ -279,9 +279,9 @@ static void cma_attach_to_dev(struct rdma_id_private *id_priv, struct cma_device *cma_dev) { - mtx_lock(&cma_dev->lock); + mtx_lock_spin(&cma_dev->lock); cma_dev->refcount++; - mtx_unlock(&cma_dev->lock); + mtx_unlock_spin(&cma_dev->lock); id_priv->cma_dev = cma_dev; id_priv->id.device = cma_dev->device; LIST_INSERT_HEAD(&cma_dev->id_list, id_priv, list); @@ -289,10 +289,10 @@ static inline void cma_deref_dev(struct cma_device *cma_dev) { - mtx_lock(&cma_dev->lock); + mtx_lock_spin(&cma_dev->lock); if (--cma_dev->refcount == 0) cv_broadcast(&cma_dev->comp); - mtx_unlock(&cma_dev->lock); + mtx_unlock_spin(&cma_dev->lock); } static void cma_detach_from_dev(struct rdma_id_private *id_priv) @@ -366,11 +366,11 @@ static void cma_deref_id(struct rdma_id_private *id_priv) { - mtx_lock(&id_priv->lock); + mtx_lock_spin(&id_priv->lock); if (--id_priv->refcount == 0) { cv_broadcast(&id_priv->comp); } - mtx_unlock(&id_priv->lock); + mtx_unlock_spin(&id_priv->lock); } static int cma_disable_remove(struct rdma_id_private *id_priv, @@ -378,22 +378,22 @@ { int ret; - mtx_lock(&id_priv->lock); + mtx_lock_spin(&id_priv->lock); if (id_priv->state == state) { id_priv->dev_remove++; ret = 0; } else ret = EINVAL; - mtx_unlock(&id_priv->lock); + mtx_unlock_spin(&id_priv->lock); return ret; } static void cma_enable_remove(struct rdma_id_private *id_priv) { - mtx_lock(&id_priv->lock); + mtx_lock_spin(&id_priv->lock); if (--id_priv->dev_remove == 0) cv_broadcast(&id_priv->wait_remove); - mtx_unlock(&id_priv->lock); + mtx_unlock_spin(&id_priv->lock); } static int cma_has_cm_dev(struct rdma_id_private *id_priv) @@ -415,7 +415,7 @@ id_priv->id.context = context; id_priv->id.event_handler = event_handler; id_priv->id.ps = ps; - mtx_init(&id_priv->lock, "rdma_cm_id_priv", NULL, MTX_DUPOK|MTX_DEF); + mtx_init(&id_priv->lock, "rdma_cm_id_priv", NULL, MTX_DUPOK|MTX_SPIN); cv_init(&id_priv->comp, "rdma_cm_id_priv"); id_priv->refcount = 1; cv_init(&id_priv->wait_remove, "id priv wait remove"); @@ -785,10 +785,10 @@ LIST_REMOVE(id_priv, listen_entry); cma_deref_id(id_priv); - mtx_lock(&id_priv->lock); + mtx_lock_spin(&id_priv->lock); if (id_priv->refcount) cv_wait(&id_priv->comp, &id_priv->lock); - mtx_unlock(&id_priv->lock); + mtx_unlock_spin(&id_priv->lock); free(id_priv, M_DEVBUF); } @@ -892,11 +892,11 @@ mtx_unlock(&lock); cma_release_port(id_priv); cma_deref_id(id_priv); - mtx_lock(&id_priv->lock); + mtx_lock_spin(&id_priv->lock); BUG_ON(id_priv->refcount < 0); if (id_priv->refcount) cv_wait(&id_priv->comp, &id_priv->lock); - mtx_unlock(&id_priv->lock); + mtx_unlock_spin(&id_priv->lock); free(id_priv->id.route.path_rec, M_DEVBUF); free(id_priv, M_DEVBUF); } @@ -1150,9 +1150,9 @@ goto out; } - mtx_lock(&conn_id->lock); + mtx_lock_spin(&conn_id->lock); conn_id->dev_remove++; - mtx_unlock(&conn_id->lock); + mtx_unlock_spin(&conn_id->lock); mtx_lock(&lock); ret = cma_acquire_dev(conn_id); mtx_unlock(&lock); @@ -1321,9 +1321,9 @@ goto out; } conn_id = container_of(new_cm_id, struct rdma_id_private, id); - mtx_lock(&conn_id->lock); + mtx_lock_spin(&conn_id->lock); ++conn_id->dev_remove; - mtx_unlock(&conn_id->lock); + mtx_unlock_spin(&conn_id->lock); conn_id->state = CMA_CONNECT; ifa = ifa_ifwithaddr((struct sockaddr *)&iw_event->local_addr); @@ -1591,9 +1591,9 @@ struct rdma_id_private *id_priv = work->id; int destroy = 0; - mtx_lock(&id_priv->lock); + mtx_lock_spin(&id_priv->lock); ++id_priv->dev_remove; - mtx_unlock(&id_priv->lock); + mtx_unlock_spin(&id_priv->lock); if (!cma_comp_exch(id_priv, work->old_state, work->new_state)) goto out; @@ -1698,9 +1698,9 @@ if (!cma_comp_exch(id_priv, CMA_ADDR_RESOLVED, CMA_ROUTE_QUERY)) return (EINVAL); - mtx_lock(&id_priv->lock); + mtx_lock_spin(&id_priv->lock); id_priv->refcount++; - mtx_unlock(&id_priv->lock); + mtx_unlock_spin(&id_priv->lock); #ifdef IB_SUPPORTED switch (rdma_node_get_transport(id->device->node_type)) { case RDMA_TRANSPORT_IB: @@ -1775,9 +1775,9 @@ struct rdma_cm_event event; memset(&event, 0, sizeof event); - mtx_lock(&id_priv->lock); + mtx_lock_spin(&id_priv->lock); ++id_priv->dev_remove; - mtx_unlock(&id_priv->lock); + mtx_unlock_spin(&id_priv->lock); /* * Grab mutex to block rdma_destroy_id() from removing the device while @@ -1881,9 +1881,9 @@ if (!cma_comp_exch(id_priv, CMA_ADDR_BOUND, CMA_ADDR_QUERY)) return (EINVAL); - mtx_lock(&id_priv->lock); + mtx_lock_spin(&id_priv->lock); id_priv->refcount++; - mtx_unlock(&id_priv->lock); + mtx_unlock_spin(&id_priv->lock); memcpy(&id->route.addr.dst_addr, dst_addr, ip_addr_size(dst_addr)); if (cma_any_addr(dst_addr)) ret = cma_resolve_loopback(id_priv); @@ -2740,9 +2740,9 @@ mc->context = context; mc->id_priv = id_priv; - mtx_lock(&id_priv->lock); + mtx_lock_spin(&id_priv->lock); LIST_INSERT_HEAD(&id_priv->mc_list, mc, list); - mtx_unlock(&id_priv->lock); + mtx_unlock_spin(&id_priv->lock); switch (rdma_node_get_transport(id->device->node_type)) { case RDMA_TRANSPORT_IB: @@ -2754,9 +2754,9 @@ } if (ret) { - mtx_lock(&id_priv->lock); + mtx_lock_spin(&id_priv->lock); list_del(&mc->list); - mtx_unlock(&id_priv->lock); + mtx_unlock_spin(&id_priv->lock); free(mc, M_DEVBUF); } return ret; @@ -2769,11 +2769,11 @@ struct cma_multicast *mc; id_priv = container_of(id, struct rdma_id_private, id); - mtx_lock(&id_priv->lock); + mtx_lock_spin(&id_priv->lock); LIST_FOREACH(mc, &id_priv->mc_list, list) { if (!memcmp(&mc->addr, addr, ip_addr_size(addr))) { list_del(&mc->list); - mtx_unlock(&id_priv->lock); + mtx_unlock_spin(&id_priv->lock); if (id->qp) ib_detach_mcast(id->qp, @@ -2784,7 +2784,7 @@ return; } } - mtx_unlock(&id_priv->lock); + mtx_unlock_spin(&id_priv->lock); } EXPORT_SYMBOL(rdma_leave_multicast); #endif @@ -2794,13 +2794,14 @@ struct cma_device *cma_dev; struct rdma_id_private *id_priv; - cma_dev = malloc(sizeof *cma_dev, M_DEVBUF, M_WAITOK); + cma_dev = malloc(sizeof *cma_dev, M_DEVBUF, M_WAITOK|M_ZERO); if (!cma_dev) return; cma_dev->device = device; cv_init(&cma_dev->comp, "cma_device"); + mtx_init(&cma_dev->lock, "cma_device", NULL, MTX_DUPOK|MTX_SPIN); cma_dev->refcount = 1; LIST_INIT(&cma_dev->id_list); ib_set_client_data(device, &cma_client, cma_dev); @@ -2823,11 +2824,11 @@ return 0; cma_cancel_operation(id_priv, state); - mtx_lock(&id_priv->lock); + mtx_lock_spin(&id_priv->lock); BUG_ON(id_priv->dev_remove < 0); if (id_priv->dev_remove) cv_wait(&id_priv->wait_remove, &id_priv->lock); - mtx_unlock(&id_priv->lock); + mtx_unlock_spin(&id_priv->lock); /* Check for destruction from another callback. */ if (!cma_comp(id_priv, CMA_DEVICE_REMOVAL)) @@ -2853,9 +2854,9 @@ } LIST_REMOVE(id_priv, list); - mtx_lock(&id_priv->lock); + mtx_lock_spin(&id_priv->lock); id_priv->refcount++; - mtx_unlock(&id_priv->lock); + mtx_unlock_spin(&id_priv->lock); mtx_unlock(&lock); ret = cma_remove_id_dev(id_priv); @@ -2868,11 +2869,11 @@ mtx_unlock(&lock); cma_deref_dev(cma_dev); - mtx_lock(&cma_dev->lock); + mtx_lock_spin(&cma_dev->lock); BUG_ON(cma_dev->refcount < 0); if (cma_dev->refcount) cv_wait(&cma_dev->comp, &cma_dev->lock); - mtx_unlock(&cma_dev->lock); + mtx_unlock_spin(&cma_dev->lock); } static void cma_remove_one(struct ib_device *device) @@ -2897,7 +2898,7 @@ LIST_INIT(&listen_any_list); TAILQ_INIT(&dev_list); - mtx_init(&lock, "cma_device", NULL, MTX_DEF); + mtx_init(&lock, "cma_device list", NULL, MTX_DEF); arc4rand(&next_port, sizeof next_port, 0); next_port = ((unsigned int) next_port % ==== //depot/projects/iwarp/sys/contrib/rdma/rdma_device.c#5 (text+ko) ==== @@ -731,7 +731,7 @@ log(LOG_WARNING, "Couldn't create InfiniBand device class\n"); #endif - mtx_init(&device_mutex, "rdma_device mutex", NULL, MTX_DUPOK|MTX_DEF); + mtx_init(&device_mutex, "rdma_device mutex", NULL, MTX_DEF); TAILQ_INIT(&client_list); TAILQ_INIT(&device_list); ret = ib_cache_setup(); ==== //depot/projects/iwarp/sys/contrib/rdma/rdma_iwcm.c#5 (text+ko) ==== @@ -194,15 +194,15 @@ */ static int iwcm_deref_id(struct iwcm_id_private *cm_id_priv) { - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); BUG_ON(atomic_read(&cm_id_priv->refcount)==0); if (atomic_dec_and_test(&cm_id_priv->refcount)) { BUG_ON(!TAILQ_EMPTY(&cm_id_priv->work_list)); cv_broadcast(&cm_id_priv->destroy_comp); - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); return 1; } - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); return 0; } @@ -211,9 +211,9 @@ { struct iwcm_id_private *cm_id_priv; cm_id_priv = container_of(cm_id, struct iwcm_id_private, id); - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); atomic_inc(&cm_id_priv->refcount); - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); } static void rem_ref(struct iw_cm_id *cm_id) @@ -303,7 +303,7 @@ cm_id_priv = container_of(cm_id, struct iwcm_id_private, id); /* Wait if we're currently in a connect or accept downcall */ - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); if (test_bit(IWCM_F_CONNECT_WAIT, &cm_id_priv->flags)) cv_wait(&cm_id_priv->connect_wait, &cm_id_priv->lock); @@ -336,7 +336,7 @@ default: BUG(); } - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); if (qp) { if (abrupt) @@ -371,24 +371,24 @@ * Wait if we're currently in a connect or accept downcall. A * listening endpoint should never block here. */ - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); if (test_bit(IWCM_F_CONNECT_WAIT, &cm_id_priv->flags)) cv_wait(&cm_id_priv->connect_wait, &cm_id_priv->lock); switch (cm_id_priv->state) { case IW_CM_STATE_LISTEN: cm_id_priv->state = IW_CM_STATE_DESTROYING; - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); /* destroy the listening endpoint */ ret = cm_id->device->iwcm->destroy_listen(cm_id); - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); break; case IW_CM_STATE_ESTABLISHED: cm_id_priv->state = IW_CM_STATE_DESTROYING; - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); /* Abrupt close of the connection */ (void)iwcm_modify_qp_err(cm_id_priv->qp); - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); break; case IW_CM_STATE_IDLE: case IW_CM_STATE_CLOSING: @@ -413,7 +413,7 @@ cm_id_priv->id.device->iwcm->rem_ref(cm_id_priv->qp); cm_id_priv->qp = NULL; } - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); (void)iwcm_deref_id(cm_id_priv); } @@ -433,10 +433,10 @@ destroy_cm_id(cm_id); - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); if (atomic_read(&cm_id_priv->refcount)) cv_wait(&cm_id_priv->destroy_comp, &cm_id_priv->lock); - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); free_cm_id(cm_id_priv); } @@ -459,20 +459,20 @@ if (ret) return ret; - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); switch (cm_id_priv->state) { case IW_CM_STATE_IDLE: cm_id_priv->state = IW_CM_STATE_LISTEN; - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); ret = cm_id->device->iwcm->create_listen(cm_id, backlog); if (ret) cm_id_priv->state = IW_CM_STATE_IDLE; - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); break; default: ret = EINVAL; } - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); return ret; } @@ -493,23 +493,23 @@ cm_id_priv = container_of(cm_id, struct iwcm_id_private, id); set_bit(IWCM_F_CONNECT_WAIT, &cm_id_priv->flags); - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); if (cm_id_priv->state != IW_CM_STATE_CONN_RECV) { clear_bit(IWCM_F_CONNECT_WAIT, &cm_id_priv->flags); cv_broadcast(&cm_id_priv->connect_wait); - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); return (EINVAL); } cm_id_priv->state = IW_CM_STATE_IDLE; - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); ret = cm_id->device->iwcm->reject(cm_id, private_data, private_data_len); - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); clear_bit(IWCM_F_CONNECT_WAIT, &cm_id_priv->flags); cv_broadcast(&cm_id_priv->connect_wait); - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); return ret; } @@ -532,37 +532,37 @@ cm_id_priv = container_of(cm_id, struct iwcm_id_private, id); set_bit(IWCM_F_CONNECT_WAIT, &cm_id_priv->flags); - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); if (cm_id_priv->state != IW_CM_STATE_CONN_RECV) { clear_bit(IWCM_F_CONNECT_WAIT, &cm_id_priv->flags); cv_broadcast(&cm_id_priv->connect_wait); - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); return (EINVAL); } /* Get the ib_qp given the QPN */ qp = cm_id->device->iwcm->get_qp(cm_id->device, iw_param->qpn); if (!qp) { - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); return (EINVAL); } cm_id->device->iwcm->add_ref(qp); cm_id_priv->qp = qp; - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); ret = cm_id->device->iwcm->accept(cm_id, iw_param); if (ret) { /* An error on accept precludes provider events */ BUG_ON(cm_id_priv->state != IW_CM_STATE_CONN_RECV); cm_id_priv->state = IW_CM_STATE_IDLE; - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); if (cm_id_priv->qp) { cm_id->device->iwcm->rem_ref(qp); cm_id_priv->qp = NULL; } clear_bit(IWCM_F_CONNECT_WAIT, &cm_id_priv->flags); cv_broadcast(&cm_id_priv->connect_wait); - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); } return ret; @@ -589,12 +589,12 @@ return ret; set_bit(IWCM_F_CONNECT_WAIT, &cm_id_priv->flags); - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); if (cm_id_priv->state != IW_CM_STATE_IDLE) { clear_bit(IWCM_F_CONNECT_WAIT, &cm_id_priv->flags); cv_broadcast(&cm_id_priv->connect_wait); - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); return (EINVAL); } @@ -602,17 +602,17 @@ /* Get the ib_qp given the QPN */ qp = cm_id->device->iwcm->get_qp(cm_id->device, iw_param->qpn); if (!qp) { - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); return (EINVAL); } cm_id->device->iwcm->add_ref(qp); cm_id_priv->qp = qp; cm_id_priv->state = IW_CM_STATE_CONN_SENT; - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); ret = cm_id->device->iwcm->connect(cm_id, iw_param); if (ret) { - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); if (cm_id_priv->qp) { cm_id->device->iwcm->rem_ref(qp); cm_id_priv->qp = NULL; @@ -621,7 +621,7 @@ cm_id_priv->state = IW_CM_STATE_IDLE; clear_bit(IWCM_F_CONNECT_WAIT, &cm_id_priv->flags); cv_broadcast(&cm_id_priv->connect_wait); - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); } @@ -661,12 +661,12 @@ * We could be destroying the listening id. If so, ignore this * upcall. */ - mtx_lock(&listen_id_priv->lock); + mtx_lock_spin(&listen_id_priv->lock); if (listen_id_priv->state != IW_CM_STATE_LISTEN) { - mtx_unlock(&listen_id_priv->lock); + mtx_unlock_spin(&listen_id_priv->lock); goto out; } - mtx_unlock(&listen_id_priv->lock); + mtx_unlock_spin(&listen_id_priv->lock); cm_id = iw_create_cm_id(listen_id_priv->id.device, listen_id_priv->id.cm_handler, @@ -721,7 +721,7 @@ { int ret; - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); /* * We clear the CONNECT_WAIT bit here to allow the callback @@ -733,7 +733,7 @@ cm_id_priv->state = IW_CM_STATE_ESTABLISHED; ret = cm_id_priv->id.cm_handler(&cm_id_priv->id, iw_event); cv_broadcast(&cm_id_priv->connect_wait); - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); return ret; } @@ -750,7 +750,7 @@ { int ret; - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); /* * Clear the connect wait bit so a callback function calling * iw_cm_disconnect will not wait and deadlock this thread @@ -767,16 +767,16 @@ cm_id_priv->qp = NULL; cm_id_priv->state = IW_CM_STATE_IDLE; } - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); ret = cm_id_priv->id.cm_handler(&cm_id_priv->id, iw_event); - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); if (iw_event->private_data_len) free(iw_event->private_data, M_DEVBUF); /* Wake up waiters on connect complete */ cv_broadcast(&cm_id_priv->connect_wait); - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); return ret; } @@ -790,10 +790,10 @@ struct iw_cm_event *iw_event) { - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); if (cm_id_priv->state == IW_CM_STATE_ESTABLISHED) cm_id_priv->state = IW_CM_STATE_CLOSING; - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); } /* @@ -811,7 +811,7 @@ struct iw_cm_event *iw_event) { int ret = 0; - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); if (cm_id_priv->qp) { cm_id_priv->id.device->iwcm->rem_ref(cm_id_priv->qp); @@ -821,16 +821,16 @@ case IW_CM_STATE_ESTABLISHED: case IW_CM_STATE_CLOSING: cm_id_priv->state = IW_CM_STATE_IDLE; - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); ret = cm_id_priv->id.cm_handler(&cm_id_priv->id, iw_event); - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); break; case IW_CM_STATE_DESTROYING: break; default: BUG(); } - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); return ret; } @@ -880,7 +880,7 @@ int empty; int ret = 0; - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); empty = TAILQ_EMPTY(&cm_id_priv->work_list); while (!empty) { work = TAILQ_FIRST(&cm_id_priv->work_list); @@ -888,7 +888,7 @@ empty = TAILQ_EMPTY(&cm_id_priv->work_list); levent = work->event; put_work(work); - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); ret = process_event(cm_id_priv, &levent); if (ret) { @@ -904,9 +904,9 @@ } return; } - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); } - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); } /* @@ -933,7 +933,7 @@ cm_id_priv = container_of(cm_id, struct iwcm_id_private, id); - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); work = get_work(cm_id_priv); if (!work) { ret = ENOMEM; @@ -954,16 +954,16 @@ } } - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); atomic_inc(&cm_id_priv->refcount); - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); if (TAILQ_EMPTY(&cm_id_priv->work_list)) { TAILQ_INSERT_TAIL(&cm_id_priv->work_list, work, list); taskqueue_enqueue(iwcm_wq, &work->task); } else TAILQ_INSERT_TAIL(&cm_id_priv->work_list, work, list); out: - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); return ret; } @@ -973,7 +973,7 @@ { int ret; - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); switch (cm_id_priv->state) { case IW_CM_STATE_IDLE: case IW_CM_STATE_CONN_SENT: @@ -989,7 +989,7 @@ ret = EINVAL; break; } - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); return ret; } @@ -999,7 +999,7 @@ { int ret; - mtx_lock(&cm_id_priv->lock); + mtx_lock_spin(&cm_id_priv->lock); switch (cm_id_priv->state) { case IW_CM_STATE_IDLE: case IW_CM_STATE_CONN_SENT: @@ -1012,7 +1012,7 @@ ret = EINVAL; break; } - mtx_unlock(&cm_id_priv->lock); + mtx_unlock_spin(&cm_id_priv->lock); return ret; } From owner-p4-projects@FreeBSD.ORG Tue Dec 4 20:56:17 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F363616A421; Tue, 4 Dec 2007 20:56:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7AF0516A41A for ; Tue, 4 Dec 2007 20:56:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6874C13C474 for ; Tue, 4 Dec 2007 20:56:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB4KuGFu012593 for ; Tue, 4 Dec 2007 20:56:16 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB4KuGvl012590 for perforce@freebsd.org; Tue, 4 Dec 2007 20:56:16 GMT (envelope-from jb@freebsd.org) Date: Tue, 4 Dec 2007 20:56:16 GMT Message-Id: <200712042056.lB4KuGvl012590@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130192 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2007 20:56:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=130192 Change 130192 by jb@jb_freebsd1 on 2007/12/04 20:55:22 Disable NLS to suit building without the intl library. Affected files ... .. //depot/projects/binutils/src/gnu/usr.bin/binutils/as/config.h#3 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/gdb/config.h#2 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/ld/config.h#4 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/libbfd/config.h.fbsd#4 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/libbinutils/config.h#4 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/libopcodes/config.h#4 edit Differences ... ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/as/config.h#3 (text+ko) ==== @@ -19,17 +19,24 @@ /* Define to 1 if using `alloca.c'. */ /* #undef C_ALLOCA */ +/* Default architecture. */ +/* #define DEFAULT_ARCH "x86_64" */ + /* Default CRIS architecture. */ /* #undef DEFAULT_CRIS_ARCH */ /* Default emulation. */ -#define DEFAULT_EMULATION "i386elf" +/* #define DEFAULT_EMULATION "i386elf" */ /* Supported emulations. */ -#define EMULATIONS &i386elf, +/* #define EMULATIONS &i386elf, */ + +/* Define if you want run-time sanity checks. */ +/* #undef ENABLE_CHECKING */ -/* Define to 1 if NLS is requested */ -#define ENABLE_NLS 1 +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ /* Define to 1 if you have `alloca', as a function or macro. */ #define HAVE_ALLOCA 1 @@ -38,12 +45,6 @@ */ /* #undef HAVE_ALLOCA_H */ -/* Define to 1 if you have the header file. */ -/* #undef HAVE_ARGZ_H */ - -/* Define to 1 if you have the `dcgettext' function. */ -/* #undef HAVE_DCGETTEXT */ - /* Is the prototype for getopt in in the expected format? */ #define HAVE_DECL_GETOPT 1 @@ -51,60 +52,24 @@ don't. */ #define HAVE_DECL_VSNPRINTF 1 +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_ERRNO_H 1 -/* Define to 1 if you have the `getcwd' function. */ -#define HAVE_GETCWD 1 - -/* Define to 1 if you have the `getpagesize' function. */ -#define HAVE_GETPAGESIZE 1 - -/* Define as 1 if you have gettext and don't want to use GNU gettext. */ -/* #undef HAVE_GETTEXT */ - /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 -/* Define if your locale.h file contains LC_MESSAGES. */ -#define HAVE_LC_MESSAGES 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_LIMITS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_LOCALE_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_MALLOC_H */ - /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 -/* Define to 1 if you have a working `mmap' system call. */ -#define HAVE_MMAP 1 - -/* Define to 1 if you have the `munmap' function. */ -#define HAVE_MUNMAP 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_NL_TYPES_H 1 - -/* Define to 1 if you have the `putenv' function. */ -#define HAVE_PUTENV 1 - /* Define to 1 if you have the `remove' function. */ /* #undef HAVE_REMOVE */ /* Define to 1 if you have the `sbrk' function. */ #define HAVE_SBRK 1 -/* Define to 1 if you have the `setenv' function. */ -#define HAVE_SETENV 1 - -/* Define to 1 if you have the `setlocale' function. */ -#define HAVE_SETLOCALE 1 - /* Define to 1 if you have the header file. */ #define HAVE_STDARG_H 1 @@ -114,24 +79,12 @@ /* Define to 1 if you have the header file. */ #define HAVE_STDLIB_H 1 -/* Define if you have the stpcpy function */ -#define HAVE_STPCPY 1 - -/* Define to 1 if you have the `strcasecmp' function. */ -#define HAVE_STRCASECMP 1 - -/* Define to 1 if you have the `strchr' function. */ -#define HAVE_STRCHR 1 - /* Define to 1 if you have the header file. */ #define HAVE_STRINGS_H 1 /* Define to 1 if you have the header file. */ #define HAVE_STRING_H 1 -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_PARAM_H 1 - /* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1 @@ -144,24 +97,16 @@ /* Define to 1 if you have the `unlink' function. */ #define HAVE_UNLINK 1 -/* Define to 1 if you have the header file. */ -/* #undef HAVE_VALUES_H */ - /* Define to 1 if you have the header file. */ /* #undef HAVE_VARARGS_H */ -/* Define to 1 if you have the `__argz_count' function. */ -/* #undef HAVE___ARGZ_COUNT */ - -/* Define to 1 if you have the `__argz_next' function. */ -/* #undef HAVE___ARGZ_NEXT */ - -/* Define to 1 if you have the `__argz_stringify' function. */ -/* #undef HAVE___ARGZ_STRINGIFY */ - /* Using i386 COFF? */ /* #undef I386COFF */ +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR ".libs/" + /* Using m68k COFF? */ /* #undef M68KCOFF */ @@ -216,9 +161,6 @@ /* generic support? */ /* #undef OBJ_MAYBE_GENERIC */ -/* IEEE support? */ -/* #undef OBJ_MAYBE_IEEE */ - /* SOM support? */ /* #undef OBJ_MAYBE_SOM */ @@ -260,8 +202,11 @@ /* Define as 1 if big endian. */ /* #undef TARGET_BYTES_BIG_ENDIAN */ +/* Target CPU. */ +/* #define TARGET_CPU "x86_64" */ + /* Target OS. */ -#define TARGET_OS "freebsd7.0" +/* #define TARGET_OS "freebsd8.0" */ /* Define if default target is PowerPC Solaris. */ /* #undef TARGET_SOLARIS_COMMENT */ @@ -272,6 +217,9 @@ /* Target vendor. */ #define TARGET_VENDOR "unknown" +/* Use b modifier when opening binary files? */ +/* #undef USE_BINARY_FOPEN */ + /* Use emulation support? */ /* #undef USE_EMULATIONS */ @@ -289,17 +237,8 @@ `char[]'. */ #define YYTEXT_POINTER 1 -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ #ifndef __cplusplus /* #undef inline */ #endif - -/* Define to `long' if does not define. */ -/* #undef off_t */ - -/* Define to `unsigned' if does not define. */ -/* #undef size_t */ ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/gdb/config.h#2 (text+ko) ==== @@ -434,7 +434,7 @@ #define HAVE_LC_MESSAGES 1 /* Define to 1 if NLS is requested */ -/* #define ENABLE_NLS 1 */ +/* #undef ENABLE_NLS */ /* Define as 1 if you have gettext and don't want to use GNU gettext. */ /* #undef HAVE_GETTEXT */ ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/ld/config.h#4 (text+ko) ==== @@ -4,7 +4,7 @@ /* Define to 1 if translation of program messages to the user's native language is requested. */ -#define ENABLE_NLS 1 +/* #undef ENABLE_NLS */ /* Additional extension a shared object might have. */ /* #undef EXTRA_SHLIB_EXTENSION */ ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/libbfd/config.h.fbsd#4 (text+ko) ==== @@ -4,7 +4,7 @@ /* Define to 1 if translation of program messages to the user's native language is requested. */ -#define ENABLE_NLS 1 +/* #undef ENABLE_NLS */ /* Define to 1 if you have the declaration of `basename', and to 0 if you don't. */ @@ -279,7 +279,7 @@ #define TIME_WITH_SYS_TIME 1 /* Name of host specific header file to include in trad-core.c. */ -/* #undef TRAD_HEADER */ +#define TRAD_HEADER !!TRAD_HEADER!! /* Use b modifier when opening binary files? */ /* #undef USE_BINARY_FOPEN */ ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/libbinutils/config.h#4 (text+ko) ==== @@ -11,7 +11,7 @@ /* #undef C_ALLOCA */ /* Define to 1 if NLS is requested */ -#define ENABLE_NLS 1 +/* #undef ENABLE_NLS */ /* Suffix used for executables, if any. */ #define EXECUTABLE_SUFFIX "" ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/libopcodes/config.h#4 (text+ko) ==== @@ -4,7 +4,7 @@ /* Define to 1 if translation of program messages to the user's native language is requested. */ -#define ENABLE_NLS 1 +/* #undef ENABLE_NLS */ /* Define to 1 if you have the declaration of `basename', and to 0 if you don't. */ From owner-p4-projects@FreeBSD.ORG Tue Dec 4 20:57:18 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0382D16A419; Tue, 4 Dec 2007 20: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 BDB0E16A418 for ; Tue, 4 Dec 2007 20:57:17 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AC87213C455 for ; Tue, 4 Dec 2007 20:57:17 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB4KvHhD012649 for ; Tue, 4 Dec 2007 20:57:17 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB4KvHJ1012646 for perforce@freebsd.org; Tue, 4 Dec 2007 20:57:17 GMT (envelope-from jb@freebsd.org) Date: Tue, 4 Dec 2007 20:57:17 GMT Message-Id: <200712042057.lB4KvHJ1012646@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130193 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2007 20:57:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=130193 Change 130193 by jb@jb_freebsd1 on 2007/12/04 20:56:54 Let's not build a developer's name into the target tuple. Affected files ... .. //depot/projects/binutils/src/gnu/usr.bin/binutils/Makefile.inc0#7 edit Differences ... ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/Makefile.inc0#7 (text+ko) ==== @@ -12,7 +12,7 @@ .else BINUTILS_ARCH=${TARGET_ARCH} .endif -TARGET_TUPLE?= ${BINUTILS_ARCH}-obrien-freebsd +TARGET_TUPLE?= ${BINUTILS_ARCH}-org-freebsd # RELTOP is the relative path to this point in the source or object # tree, from any subdirectory of same. It gets extra "../" prefixes @@ -27,7 +27,6 @@ .else CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=64 .endif -CFLAGS+= -DREPORT_BUGS_TO=\"\" CFLAGS+= -DLOCALEDIR=\"/usr/share/locale\" CFLAGS+= -I. From owner-p4-projects@FreeBSD.ORG Tue Dec 4 20:58:20 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C81316A41B; Tue, 4 Dec 2007 20: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 84A8F16A419 for ; Tue, 4 Dec 2007 20:58:19 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5AFF913C447 for ; Tue, 4 Dec 2007 20:58:19 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB4KwJNd012676 for ; Tue, 4 Dec 2007 20:58:19 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB4KwJ3o012673 for perforce@freebsd.org; Tue, 4 Dec 2007 20:58:19 GMT (envelope-from jb@freebsd.org) Date: Tue, 4 Dec 2007 20:58:19 GMT Message-Id: <200712042058.lB4KwJ3o012673@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130194 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2007 20:58:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=130194 Change 130194 by jb@jb_freebsd1 on 2007/12/04 20:57:32 Disconnect the intl library from the build. Affected files ... .. //depot/projects/binutils/src/gnu/usr.bin/binutils/Makefile#3 edit Differences ... ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/Makefile#3 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD: src/gnu/usr.bin/binutils/Makefile,v 1.29 2004/06/25 07:34:56 obrien Exp $ -SUBDIR= libiberty libbfd libopcodes libbinutils libintl \ +SUBDIR= libiberty libbfd libopcodes libbinutils \ addr2line ar as ld nm objcopy objdump ranlib readelf \ size strings strip doc From owner-p4-projects@FreeBSD.ORG Tue Dec 4 21:00:22 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B53C16A473; Tue, 4 Dec 2007 21:00:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BFAFF16A46C for ; Tue, 4 Dec 2007 21:00:21 +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 ADCEF13C459 for ; Tue, 4 Dec 2007 21:00:21 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB4L0LJ9012956 for ; Tue, 4 Dec 2007 21:00:21 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB4L0L1v012953 for perforce@freebsd.org; Tue, 4 Dec 2007 21:00:21 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 4 Dec 2007 21:00:21 GMT Message-Id: <200712042100.lB4L0L1v012953@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 130195 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2007 21:00:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=130195 Change 130195 by hselasky@hselasky_laptop001 on 2007/12/04 21:00:08 Use "%zu" instead of casting "sizeof()" to "int". Suggested by Brooks Davis. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ums.c#32 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ums.c#32 (text+ko) ==== @@ -185,8 +185,8 @@ DPRINTF(5, "sc=%p actlen=%d\n", sc, len); if (len > sizeof(sc->sc_temp)) { - DPRINTF(5, "truncating large packet to %d bytes\n", - (int)sizeof(sc->sc_temp)); + DPRINTF(5, "truncating large packet to %zu bytes\n", + sizeof(sc->sc_temp)); len = sizeof(sc->sc_temp); } if (len == 0) { From owner-p4-projects@FreeBSD.ORG Tue Dec 4 21:02:24 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5727C16A41A; Tue, 4 Dec 2007 21:02:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C1B816A417 for ; Tue, 4 Dec 2007 21:02:24 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 097BE13C4F6 for ; Tue, 4 Dec 2007 21:02:24 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB4L2Njs013676 for ; Tue, 4 Dec 2007 21:02:23 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB4L2NE4013673 for perforce@freebsd.org; Tue, 4 Dec 2007 21:02:23 GMT (envelope-from jb@freebsd.org) Date: Tue, 4 Dec 2007 21:02:23 GMT Message-Id: <200712042102.lB4L2NE4013673@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130196 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2007 21:02:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=130196 Change 130196 by jb@jb_freebsd1 on 2007/12/04 21:01:34 Rehash the linker build. - Build in the emulations that the GNU release builds in. - Where they distribute the .c file generated by bison, just use that rather than generating a new one. Affected files ... .. //depot/projects/binutils/src/gnu/usr.bin/binutils/ld/Makefile#5 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/ld/Makefile.alpha#3 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/ld/Makefile.amd64#3 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/ld/Makefile.arm#3 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/ld/Makefile.i386#3 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/ld/Makefile.ia64#3 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/ld/Makefile.powerpc#3 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/ld/Makefile.sparc64#3 edit Differences ... ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/ld/Makefile#5 (text+ko) ==== @@ -11,7 +11,7 @@ PROG= ld SCRIPTDIR= /usr/libdata/ldscripts SRCS+= ldcref.c ldctor.c ldemul.c ldemul-list.h ldexp.c ldfile.c \ - ldgram.y ldlang.c ldlex.l ldmain.c ldmisc.c \ + xldgram.c ldlang.c xldlex.c ldmain.c ldmisc.c \ ldver.c ldwrite.c lexsup.c mri.c sha1.c WARNS?= 0 # ldemul.h problem (`struct option' declared inside parameter list) @@ -22,29 +22,29 @@ CFLAGS+= -DBINDIR=\"${BINDIR}\" -DTARGET_SYSTEM_ROOT=\"${TOOLS_PREFIX}\" CFLAGS+= -DTOOLBINDIR=\"${TOOLS_PREFIX}/${BINDIR}/libexec\" CFLAGS+= -D_GNU_SOURCE +CFLAGS+= -DYYERROR_VERBOSE CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd -CFLAGS+= -I${.CURDIR}/../libintl NO_SHARED?= yes DPADD= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libiberty/libiberty.a -DPADD+= ${RELTOP}/libintl/libintl.a LDADD= ${DPADD} CLEANDIRS+= ldscripts -CLEANFILES+= ldemul-list.h stringify.sed +CLEANFILES+= ldemul-list.h stringify.sed xldgram.c xldlex.c HOST= ${TARGET_TUPLE} LIBSERACHPATH= \"${TOOLS_PREFIX}/lib\":\"${TOOLS_PREFIX}/usr/lib\" -ELF_SCR_EXT= x xbn xn xr xs xu xc xsc xd xdc -.for ext in ${ELF_SCR_EXT} -LDSCRIPTS+= ${NATIVE_EMULATION}.${ext} -.endfor +LIB_PATH= ${TOOLS_PREFIX}/lib ${TOOLS_PREFIX}/usr/lib +ELF_SCR_EXT= x xbn xn xr xs xu xc xsc xd xdc xdw xsw xw -EMS+= ${NATIVE_EMULATION} EMXFR= EMLST= +LDSCRIPTS= .for _e in ${EMS} EMXFR+= extern ld_emulation_xfer_type ld_${_e}_emulation; EMLST+= &ld_${_e}_emulation, +.for ext in ${ELF_SCR_EXT} +LDSCRIPTS+= ${_e}.${ext} +.endfor .endfor ldemul-list.h: @@ -54,6 +54,12 @@ stringify.sed: ln -sf ${SRCDIR}/ld/emultempl/astring.sed ${.TARGET} +xldgram.c : ${SRCDIR}/ld/ldgram.c + cp ${.ALLSRC} ${.TARGET} + +xldlex.c : ${SRCDIR}/ld/ldlex.c + cp ${.ALLSRC} ${.TARGET} + afterinstall: ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${LDSCRIPTS:S|^|ldscripts/|} ${DESTDIR}${SCRIPTDIR} ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/ld/Makefile.alpha#3 (text+ko) ==== @@ -1,6 +1,7 @@ # $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.alpha,v 1.23 2006/07/22 14:37:17 obrien Exp $ NATIVE_EMULATION= elf64alpha_fbsd +EMS= ${NATIVE_EMULATION} EMS+= elf64alpha alpha .for ext in ${ELF_SCR_EXT} ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/ld/Makefile.amd64#3 (text+ko) ==== @@ -2,29 +2,32 @@ NATIVE_EMULATION= elf_x86_64_fbsd -SRCS+= e${NATIVE_EMULATION}.c -CLEANFILES+= e${NATIVE_EMULATION}.c -e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em \ - scripttempl/elf.sc stringify.sed - sh ${SRCDIR}/ld/genscripts.sh ${SRCDIR}/ld ${LIBSERACHPATH} \ +.for _E in ${NATIVE_EMULATION} elf_x86_64 + +SRCS+= e${_E}.c +CLEANFILES+= e${_E}.c +EMS+= ${_E} +e${_E}.c: emulparams/${_E}.sh emultempl/elf32.em scripttempl/elf.sc stringify.sed + LIB_PATH="${LIB_PATH}" sh ${SRCDIR}/ld/genscripts.sh ${SRCDIR}/ld ${LIBSERACHPATH} \ ${TOOLS_PREFIX}/usr \ ${TOOLS_PREFIX}/usr \ ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ - ${NATIVE_EMULATION} "" no ${NATIVE_EMULATION} ${TARGET_TUPLE} + ${_E} "" yes ${_E} ${TARGET_TUPLE} + +.endfor -X86_EMULATION= elf_i386_fbsd _i386_path= \"${TOOLS_PREFIX}/usr/lib/i386\" -EMS+= ${X86_EMULATION} -.for ext in ${ELF_SCR_EXT} -LDSCRIPTS+= ${X86_EMULATION}.${ext} -.endfor + +.for _E in elf_i386_fbsd elf_i386 -SRCS+= e${X86_EMULATION}.c -CLEANFILES+= e${X86_EMULATION}.c -e${X86_EMULATION}.c: emulparams/${X86_EMULATION}.sh emultempl/elf32.em \ - scripttempl/elf.sc stringify.sed - sh ${SRCDIR}/ld/genscripts.sh ${SRCDIR}/ld ${_i386_path} \ +SRCS+= e${_E}.c +CLEANFILES+= e${_E}.c +EMS+= ${_E} +e${_E}.c: emulparams/${_E}.sh emultempl/elf32.em scripttempl/elf.sc stringify.sed + LIB_PATH="${LIB_PATH}" sh ${SRCDIR}/ld/genscripts.sh ${SRCDIR}/ld ${_i386_path} \ ${TOOLS_PREFIX}/usr \ ${TOOLS_PREFIX}/usr \ ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ - ${X86_EMULATION} "" no ${X86_EMULATION} ${TARGET_TUPLE} + ${_E} "" yes ${_E} ${TARGET_TUPLE} + +.endfor ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/ld/Makefile.arm#3 (text+ko) ==== @@ -5,6 +5,7 @@ .else NATIVE_EMULATION= armelf_fbsd .endif +EMS= ${NATIVE_EMULATION} SRCS+= e${NATIVE_EMULATION}.c CLEANFILES+= e${NATIVE_EMULATION}.c ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/ld/Makefile.i386#3 (text+ko) ==== @@ -2,12 +2,16 @@ NATIVE_EMULATION= elf_i386_fbsd -SRCS+= e${NATIVE_EMULATION}.c -CLEANFILES+= e${NATIVE_EMULATION}.c -e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em \ - scripttempl/elf.sc stringify.sed +.for _E in ${NATIVE_EMULATION} elf_i386 + +SRCS+= e${_E}.c +CLEANFILES+= e${_E}.c +EMS+= ${_E} +e${_E}.c: emulparams/${_E}.sh emultempl/elf32.em scripttempl/elf.sc stringify.sed sh ${SRCDIR}/ld/genscripts.sh ${SRCDIR}/ld ${LIBSERACHPATH} \ ${TOOLS_PREFIX}/usr \ ${TOOLS_PREFIX}/usr \ ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ - ${NATIVE_EMULATION} "" no ${NATIVE_EMULATION} ${TARGET_TUPLE} + ${_E} "" no ${_E} ${TARGET_TUPLE} + +.endfor ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/ld/Makefile.ia64#3 (text+ko) ==== @@ -1,6 +1,7 @@ # $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.ia64,v 1.10 2006/07/22 14:37:17 obrien Exp $ NATIVE_EMULATION= elf64_ia64_fbsd +EMS= ${NATIVE_EMULATION} SRCS+= e${NATIVE_EMULATION}.c CLEANFILES+= e${NATIVE_EMULATION}.c ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/ld/Makefile.powerpc#3 (text+ko) ==== @@ -1,6 +1,7 @@ # $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.powerpc,v 1.16 2004/07/08 17:05:32 obrien Exp $ NATIVE_EMULATION= elf32ppc +EMS= ${NATIVE_EMULATION} SRCS+= e${NATIVE_EMULATION}.c CLEANFILES+= e${NATIVE_EMULATION}.c ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/ld/Makefile.sparc64#3 (text+ko) ==== @@ -1,6 +1,7 @@ # $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.sparc64,v 1.16 2004/07/08 17:05:32 obrien Exp $ NATIVE_EMULATION= elf64_sparc_fbsd +EMS= ${NATIVE_EMULATION} SRCS+= e${NATIVE_EMULATION}.c CLEANFILES+= e${NATIVE_EMULATION}.c From owner-p4-projects@FreeBSD.ORG Tue Dec 4 21:12:41 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63DB616A469; Tue, 4 Dec 2007 21:12: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 082C316A417 for ; Tue, 4 Dec 2007 21:12:41 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EA25613C465 for ; Tue, 4 Dec 2007 21:12:40 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB4LCZtl016350 for ; Tue, 4 Dec 2007 21:12:35 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB4LCZVF016347 for perforce@freebsd.org; Tue, 4 Dec 2007 21:12:35 GMT (envelope-from jb@freebsd.org) Date: Tue, 4 Dec 2007 21:12:35 GMT Message-Id: <200712042112.lB4LCZVF016347@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130198 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2007 21:12:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=130198 Change 130198 by jb@jb_freebsd1 on 2007/12/04 21:12:10 Rehash build. Affected files ... .. //depot/projects/binutils/src/gnu/usr.bin/binutils/libbfd/Makefile#4 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/libbfd/Makefile.amd64#2 edit .. //depot/projects/binutils/src/gnu/usr.bin/binutils/libbfd/Makefile.i386#2 edit Differences ... ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/libbfd/Makefile#4 (text+ko) ==== @@ -5,12 +5,46 @@ .PATH: ${SRCDIR}/bfd ${SRCDIR}/opcodes LIB= bfd -SRCS+= archive.c archive64.c archures.c bfd.c bfdwin.c binary.c cache.c \ - coffgen.c corefile.c elf.c elf-attrs.c elf-eh-frame.c elf-strtab.c \ - elf-vxworks.c format.c \ - hash.c ihex.c init.c libbfd.c linker.c merge.c opncls.c reloc.c \ - section.c srec.c stab-syms.c stabs.c syms.c targets.c tekhex.c \ - targmatch.h dwarf1.c dwarf2.c config.h bfdver.h bfdio.c simple.c +SRCS+= archive.c \ + archive64.c \ + archures.c \ + bfd.c \ + bfdio.c \ + bfdver.h \ + bfdwin.c \ + binary.c \ + cache.c \ + coffgen.c \ + config.h \ + corefile.c \ + dwarf1.c \ + dwarf2.c \ + elf-attrs.c \ + elf-eh-frame.c \ + elf-strtab.c \ + elf-vxworks.c \ + elf.c \ + format.c \ + hash.c \ + ihex.c \ + init.c \ + libbfd.c \ + linker.c \ + merge.c \ + opncls.c \ + peigen.c \ + pepigen.c \ + pex64igen.c \ + reloc.c \ + section.c \ + simple.c \ + srec.c \ + stab-syms.c \ + stabs.c \ + syms.c \ + targets.c \ + targmatch.h \ + tekhex.c WARNS?= 0 .if (${TARGET_ARCH} == "alpha" || ${TARGET_ARCH} == "ia64" || \ ${TARGET_ARCH} == "sparc64") @@ -18,7 +52,6 @@ .endif CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${SRCDIR}/bfd -CFLAGS+= -I${.CURDIR}/../libintl INTERNALLIB= CLEANFILES+= bfdver.h config.h targmatch.h @@ -56,6 +89,7 @@ echo '#define BFD_VERSION 218000000' > ${.TARGET} echo '#define BFD_VERSION_DATE 20070828' >> ${.TARGET} echo '#define BFD_VERSION_STRING ${VERSION}' >> ${.TARGET} + echo '#define REPORT_BUGS_TO ""' >> ${.TARGET} targmatch.h: targmatch.sed config.bfd sed -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} > ${.TARGET} @@ -67,11 +101,20 @@ sed -e 's,!!TRAD_HEADER!!,,g' ${.ALLSRC} > ${.TARGET} .endif -CLEANFILES+= elf32-target.h elf64-target.h +CLEANFILES+= elf32-target.h elf64-target.h peigen.c pepigen.c pex64igen.c elf32-target.h: elfxx-target.h sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET} elf64-target.h: elfxx-target.h sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET} +peigen.c: peXXigen.c + sed -e s/XX/pe/g < ${.ALLSRC} > ${.TARGET} + +pepigen.c: peXXigen.c + sed -e s/XX/pep/g < ${.ALLSRC} > ${.TARGET} + +pex64igen.c: peXXigen.c + sed -e s/XX/pex64/g < ${.ALLSRC} > ${.TARGET} + .include ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/libbfd/Makefile.amd64#2 (text+ko) ==== @@ -2,23 +2,17 @@ .include "${.CURDIR}/Makefile.i386" -# Get the i386 DEFAULT_VECTOR and VECS. -I386_VECS:= ${DEFAULT_VECTOR} # ${VECS} +DEFAULT_VECTOR= bfd_elf64_x86_64_freebsd_vec -DEFAULT_VECTOR= bfd_elf64_x86_64_vec - -SRCS+= elf64-amd64-fbsd.c \ - elf64.c \ - elf64-gen.c \ +SRCS+= efi-app-x86_64.c \ + elf64-x86-64.c \ + elf64.c \ + elf64-gen.c \ elf64-target.h -VECS= bfd_elf64_x86_64_vec \ - ${I386_VECS} - -CLEANFILES+= elf64-amd64-fbsd.c - -elf64-amd64-fbsd.c: ${.CURDIR}/elf-fbsd-brand.c ${SRCDIR}/bfd/elf64-x86-64.c - cat ${.ALLSRC:M*elf-fbsd-brand.c} > ${.TARGET} - echo "#define elf_backend_post_process_headers elf_fbsd_post_process_headers" \ - >> ${.TARGET} - cat ${.ALLSRC:M*elf64-x86-64.c} >> ${.TARGET} +VECS= ${I386_VECS} \ + bfd_elf64_x86_64_freebsd_vec \ + bfd_elf64_x86_64_vec \ + bfd_efi_app_x86_64_vec \ + bfd_elf64_little_generic_vec \ + bfd_elf64_big_generic_vec ==== //depot/projects/binutils/src/gnu/usr.bin/binutils/libbfd/Makefile.i386#2 (text+ko) ==== @@ -2,11 +2,22 @@ DEFAULT_VECTOR= bfd_elf32_i386_freebsd_vec -SRCS+= cpu-i386.c \ - elf32-i386.c \ - elf32-target.h \ - elf32.c \ +SRCS+= coff-i386.c \ + cofflink.c \ + cpu-i386.c \ + efi-app-ia32.c \ + elf32-i386.c \ + elf32-gen.c \ + elf32-target.h \ + elf32.c \ elflink.c -VECS= ${DEFAULT_VECTOR} \ - bfd_elf32_i386_vec +I386_VECS= \ + bfd_elf32_i386_freebsd_vec \ + bfd_elf32_i386_vec \ + bfd_efi_app_ia32_vec \ + bfd_elf32_i386_vec \ + bfd_elf32_little_generic_vec \ + bfd_elf32_big_generic_vec + +VECS= ${I386_VECS} From owner-p4-projects@FreeBSD.ORG Tue Dec 4 21:17:42 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96E6716A473; Tue, 4 Dec 2007 21:17:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2E9E416A417 for ; Tue, 4 Dec 2007 21:17:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1C56A13C468 for ; Tue, 4 Dec 2007 21:17:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB4LHf82016914 for ; Tue, 4 Dec 2007 21:17:42 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB4LHf51016911 for perforce@freebsd.org; Tue, 4 Dec 2007 21:17:41 GMT (envelope-from jb@freebsd.org) Date: Tue, 4 Dec 2007 21:17:41 GMT Message-Id: <200712042117.lB4LHf51016911@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130199 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2007 21:17:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=130199 Change 130199 by jb@jb_freebsd1 on 2007/12/04 21:17:12 gas 2.18 is a bit fussy about operand sizes. This change might not be correct given what bde@ said in: http://lists.freebsd.org/pipermail/freebsd-emulation/2007-January/003050.html For now I just want to be able to build and test on amd64 with the latest binutils. Affected files ... .. //depot/projects/binutils/src/sys/amd64/amd64/cpu_switch.S#3 edit .. //depot/projects/binutils/src/sys/amd64/ia32/ia32_signal.c#2 edit .. //depot/projects/binutils/src/sys/amd64/ia32/ia32_sigtramp.S#2 edit .. //depot/projects/binutils/src/sys/amd64/include/cpufunc.h#2 edit .. //depot/projects/binutils/src/sys/amd64/linux32/linux32_locore.s#3 edit .. //depot/projects/binutils/src/sys/amd64/linux32/linux32_sysvec.c#3 edit Differences ... ==== //depot/projects/binutils/src/sys/amd64/amd64/cpu_switch.S#3 (text+ko) ==== @@ -110,7 +110,7 @@ jz 1f /* no, skip over */ /* Save userland %gs */ - movl %gs,PCB_GS(%r8) + mov %gs,PCB_GS(%r8) movq PCB_GS32P(%r8),%rax movq (%rax),%rax movq %rax,PCB_GS32SD(%r8) @@ -220,7 +220,7 @@ movq %rbx,(%rax) movl $MSR_GSBASE,%ecx rdmsr - movl PCB_GS(%r8),%gs + mov PCB_GS(%r8),%gs wrmsr 1: ==== //depot/projects/binutils/src/sys/amd64/ia32/ia32_signal.c#2 (text+ko) ==== @@ -328,8 +328,8 @@ sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; sf.sf_uc.uc_mcontext.mc_gs = rgs(); sf.sf_uc.uc_mcontext.mc_fs = rfs(); - __asm __volatile("movl %%es,%0" : "=rm" (sf.sf_uc.uc_mcontext.mc_es)); - __asm __volatile("movl %%ds,%0" : "=rm" (sf.sf_uc.uc_mcontext.mc_ds)); + __asm __volatile("mov %%es,%0" : "=rm" (sf.sf_uc.uc_mcontext.mc_es)); + __asm __volatile("mov %%ds,%0" : "=rm" (sf.sf_uc.uc_mcontext.mc_ds)); sf.sf_uc.uc_mcontext.mc_edi = regs->tf_rdi; sf.sf_uc.uc_mcontext.mc_esi = regs->tf_rsi; sf.sf_uc.uc_mcontext.mc_ebp = regs->tf_rbp; @@ -443,8 +443,8 @@ sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; sf.sf_uc.uc_mcontext.mc_gs = rgs(); sf.sf_uc.uc_mcontext.mc_fs = rfs(); - __asm __volatile("movl %%es,%0" : "=rm" (sf.sf_uc.uc_mcontext.mc_es)); - __asm __volatile("movl %%ds,%0" : "=rm" (sf.sf_uc.uc_mcontext.mc_ds)); + __asm __volatile("mov %%es,%0" : "=rm" (sf.sf_uc.uc_mcontext.mc_es)); + __asm __volatile("mov %%ds,%0" : "=rm" (sf.sf_uc.uc_mcontext.mc_ds)); sf.sf_uc.uc_mcontext.mc_edi = regs->tf_rdi; sf.sf_uc.uc_mcontext.mc_esi = regs->tf_rsi; sf.sf_uc.uc_mcontext.mc_ebp = regs->tf_rbp; ==== //depot/projects/binutils/src/sys/amd64/ia32/ia32_sigtramp.S#2 (text+ko) ==== @@ -45,8 +45,8 @@ calll *IA32_SIGF_HANDLER(%esp) leal IA32_SIGF_UC(%esp),%eax /* get ucontext */ pushl %eax - movl IA32_UC_ES(%eax),%es /* restore %es */ - movl IA32_UC_DS(%eax),%ds /* restore %ds */ + mov IA32_UC_ES(%eax),%es /* restore %es */ + mov IA32_UC_DS(%eax),%ds /* restore %ds */ movl $SYS_sigreturn,%eax pushl %eax /* junk to fake return addr. */ int $0x80 /* enter kernel with args */ @@ -60,8 +60,8 @@ calll *IA32_SIGF_HANDLER(%esp) leal IA32_SIGF_UC4(%esp),%eax/* get ucontext */ pushl %eax - movl IA32_UC4_ES(%eax),%es /* restore %es */ - movl IA32_UC4_DS(%eax),%ds /* restore %ds */ + mov IA32_UC4_ES(%eax),%es /* restore %es */ + mov IA32_UC4_DS(%eax),%ds /* restore %ds */ movl $344,%eax /* 4.x SYS_sigreturn */ pushl %eax /* junk to fake return addr. */ int $0x80 /* enter kernel with args */ ==== //depot/projects/binutils/src/sys/amd64/include/cpufunc.h#2 (text+ko) ==== @@ -482,7 +482,7 @@ rfs(void) { u_int sel; - __asm __volatile("movl %%fs,%0" : "=rm" (sel)); + __asm __volatile("mov %%fs,%0" : "=rm" (sel)); return (sel); } @@ -490,7 +490,7 @@ rgs(void) { u_int sel; - __asm __volatile("movl %%gs,%0" : "=rm" (sel)); + __asm __volatile("mov %%gs,%0" : "=rm" (sel)); return (sel); } @@ -544,7 +544,7 @@ * being trashed happens to be the kernel gsbase at the time. */ gsbase = MSR_GSBASE; - __asm __volatile("pushfq; cli; rdmsr; movl %0,%%gs; wrmsr; popfq" + __asm __volatile("pushfq; cli; rdmsr; mov %0,%%gs; wrmsr; popfq" : : "rm" (sel), "c" (gsbase) : "eax", "edx"); } #else @@ -552,13 +552,13 @@ static __inline void load_fs(u_int sel) { - __asm __volatile("movl %0,%%fs" : : "rm" (sel)); + __asm __volatile("mov %0,%%fs" : : "rm" (sel)); } static __inline void load_gs(u_int sel) { - __asm __volatile("movl %0,%%gs" : : "rm" (sel)); + __asm __volatile("mov %0,%%gs" : : "rm" (sel)); } #endif ==== //depot/projects/binutils/src/sys/amd64/linux32/linux32_locore.s#3 (text+ko) ==== @@ -11,8 +11,8 @@ NON_GPROF_ENTRY(linux_sigcode) call *LINUX_SIGF_HANDLER(%esp) leal LINUX_SIGF_SC(%esp),%ebx /* linux scp */ - movl LINUX_SC_ES(%ebx),%es - movl LINUX_SC_DS(%ebx),%ds + mov LINUX_SC_ES(%ebx),%es + mov LINUX_SC_DS(%ebx),%ds movl %esp, %ebx /* pass sigframe */ push %eax /* fake ret addr */ movl $LINUX_SYS_linux_sigreturn,%eax /* linux_sigreturn() */ @@ -23,8 +23,8 @@ linux_rt_sigcode: call *LINUX_RT_SIGF_HANDLER(%esp) leal LINUX_RT_SIGF_UC(%esp),%ebx /* linux ucp */ - movl LINUX_SC_ES(%ebx),%es - movl LINUX_SC_DS(%ebx),%ds + mov LINUX_SC_ES(%ebx),%es + mov LINUX_SC_DS(%ebx),%ds push %eax /* fake ret addr */ movl $LINUX_SYS_linux_rt_sigreturn,%eax /* linux_rt_sigreturn() */ int $0x80 /* enter kernel with args */ ==== //depot/projects/binutils/src/sys/amd64/linux32/linux32_sysvec.c#3 (text+ko) ==== @@ -355,9 +355,9 @@ frame.sf_sc.uc_mcontext.sc_mask = frame.sf_sc.uc_sigmask.__bits[0]; frame.sf_sc.uc_mcontext.sc_gs = rgs(); frame.sf_sc.uc_mcontext.sc_fs = rfs(); - __asm __volatile("movl %%es,%0" : + __asm __volatile("mov %%es,%0" : "=rm" (frame.sf_sc.uc_mcontext.sc_es)); - __asm __volatile("movl %%ds,%0" : + __asm __volatile("mov %%ds,%0" : "=rm" (frame.sf_sc.uc_mcontext.sc_ds)); frame.sf_sc.uc_mcontext.sc_edi = regs->tf_rdi; frame.sf_sc.uc_mcontext.sc_esi = regs->tf_rsi; @@ -489,8 +489,8 @@ frame.sf_sc.sc_mask = lmask.__bits[0]; frame.sf_sc.sc_gs = rgs(); frame.sf_sc.sc_fs = rfs(); - __asm __volatile("movl %%es,%0" : "=rm" (frame.sf_sc.sc_es)); - __asm __volatile("movl %%ds,%0" : "=rm" (frame.sf_sc.sc_ds)); + __asm __volatile("mov %%es,%0" : "=rm" (frame.sf_sc.sc_es)); + __asm __volatile("mov %%ds,%0" : "=rm" (frame.sf_sc.sc_ds)); frame.sf_sc.sc_edi = regs->tf_rdi; frame.sf_sc.sc_esi = regs->tf_rsi; frame.sf_sc.sc_ebp = regs->tf_rbp; From owner-p4-projects@FreeBSD.ORG Tue Dec 4 21:23:50 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CAD116A469; Tue, 4 Dec 2007 21:23:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3958C16A417 for ; Tue, 4 Dec 2007 21:23:50 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2576513C45B for ; Tue, 4 Dec 2007 21:23:50 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB4LNooC018290 for ; Tue, 4 Dec 2007 21:23:50 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB4LNmPq018285 for perforce@freebsd.org; Tue, 4 Dec 2007 21:23:48 GMT (envelope-from jb@freebsd.org) Date: Tue, 4 Dec 2007 21:23:48 GMT Message-Id: <200712042123.lB4LNmPq018285@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130200 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2007 21:23:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=130200 Change 130200 by jb@jb_freebsd1 on 2007/12/04 21:22:54 IFC Affected files ... .. //depot/projects/binutils/src/Makefile.inc1#3 integrate .. //depot/projects/binutils/src/contrib/bind9/lib/isc/arm/include/isc/atomic.h#2 integrate .. //depot/projects/binutils/src/contrib/pf/pflogd/pidfile.c#2 integrate .. //depot/projects/binutils/src/contrib/pf/pflogd/pidfile.h#2 integrate .. //depot/projects/binutils/src/lib/csu/common/crtbrand.c#2 integrate .. //depot/projects/binutils/src/lib/libarchive/archive_read_support_format_zip.c#3 integrate .. //depot/projects/binutils/src/lib/libc/amd64/Makefile.inc#2 integrate .. //depot/projects/binutils/src/lib/libc/gdtoa/_ldtoa.c#3 integrate .. //depot/projects/binutils/src/lib/libc/gdtoa/machdep_ldisQ.c#2 integrate .. //depot/projects/binutils/src/lib/libc/gdtoa/machdep_ldisx.c#2 integrate .. //depot/projects/binutils/src/lib/libc/gen/closedir.c#3 integrate .. //depot/projects/binutils/src/lib/libc/gen/readdir.c#3 integrate .. //depot/projects/binutils/src/lib/libc/gen/seekdir.c#3 integrate .. //depot/projects/binutils/src/lib/libc/gen/telldir.c#3 integrate .. //depot/projects/binutils/src/lib/libc/i386/Makefile.inc#2 integrate .. //depot/projects/binutils/src/lib/libc/ia64/Makefile.inc#2 integrate .. //depot/projects/binutils/src/lib/libc/nameser/ns_parse.c#3 integrate .. //depot/projects/binutils/src/lib/libc/resolv/res_data.c#3 integrate .. //depot/projects/binutils/src/lib/libc/resolv/res_init.c#3 integrate .. //depot/projects/binutils/src/lib/libc/sparc64/Makefile.inc#2 integrate .. //depot/projects/binutils/src/lib/libpmc/pmc.3#3 integrate .. //depot/projects/binutils/src/lib/libpmc/pmclog.c#2 integrate .. //depot/projects/binutils/src/lib/libpmc/pmclog.h#2 integrate .. //depot/projects/binutils/src/release/Makefile#3 integrate .. //depot/projects/binutils/src/share/misc/iso3166#3 integrate .. //depot/projects/binutils/src/share/zoneinfo/asia#3 integrate .. //depot/projects/binutils/src/share/zoneinfo/northamerica#3 integrate .. //depot/projects/binutils/src/share/zoneinfo/southamerica#3 integrate .. //depot/projects/binutils/src/share/zoneinfo/zone.tab#3 integrate .. //depot/projects/binutils/src/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/binutils/src/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/binutils/src/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/binutils/src/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/binutils/src/sys/compat/ndis/subr_ntoskrnl.c#4 integrate .. //depot/projects/binutils/src/sys/conf/NOTES#4 integrate .. //depot/projects/binutils/src/sys/conf/files.pc98#3 integrate .. //depot/projects/binutils/src/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/binutils/src/sys/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/binutils/src/sys/dev/if_ndis/if_ndisvar.h#3 integrate .. //depot/projects/binutils/src/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/binutils/src/sys/dev/re/if_re.c#3 integrate .. //depot/projects/binutils/src/sys/dev/snp/snp.c#3 integrate .. //depot/projects/binutils/src/sys/dev/sound/pcm/channel.c#3 integrate .. //depot/projects/binutils/src/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/binutils/src/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/binutils/src/sys/i386/i386/trap.c#3 integrate .. //depot/projects/binutils/src/sys/kern/imgact_elf.c#3 integrate .. //depot/projects/binutils/src/sys/kern/init_main.c#3 integrate .. //depot/projects/binutils/src/sys/kern/kern_exec.c#4 integrate .. //depot/projects/binutils/src/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/binutils/src/sys/kern/kern_mib.c#3 integrate .. //depot/projects/binutils/src/sys/kern/subr_stack.c#4 integrate .. //depot/projects/binutils/src/sys/netinet/if_ether.c#3 integrate .. //depot/projects/binutils/src/sys/netinet/sctp.h#3 integrate .. //depot/projects/binutils/src/sys/netinet/sctp_output.c#5 integrate .. //depot/projects/binutils/src/sys/netinet/sctp_structs.h#5 integrate .. //depot/projects/binutils/src/sys/netinet/sctp_usrreq.c#5 integrate .. //depot/projects/binutils/src/sys/netinet/sctputil.c#5 integrate .. //depot/projects/binutils/src/sys/netinet/tcp_syncache.c#4 integrate .. //depot/projects/binutils/src/sys/pc98/include/stack.h#1 branch .. //depot/projects/binutils/src/sys/security/audit/audit.c#4 integrate .. //depot/projects/binutils/src/sys/sun4v/sun4v/hcall.S#3 integrate .. //depot/projects/binutils/src/sys/sys/param.h#3 integrate .. //depot/projects/binutils/src/sys/sys/pmc.h#2 integrate .. //depot/projects/binutils/src/sys/sys/pmclog.h#2 integrate .. //depot/projects/binutils/src/sys/sys/proc.h#3 integrate .. //depot/projects/binutils/src/sys/sys/systm.h#4 integrate .. //depot/projects/binutils/src/tools/regression/lib/libc/stdio/test-printfloat.c#2 integrate .. //depot/projects/binutils/src/tools/regression/lib/libc/stdio/test-scanfloat.c#3 integrate .. //depot/projects/binutils/src/tools/tools/ath/athdebug/athdebug.c#2 integrate .. //depot/projects/binutils/src/tools/tools/ath/athstats/athstats.c#2 integrate .. //depot/projects/binutils/src/tools/tools/ath/athstats/athstats.h#2 integrate .. //depot/projects/binutils/src/tools/tools/ath/athstats/main.c#2 integrate .. //depot/projects/binutils/src/tools/tools/ath/athstats/statfoo.c#2 integrate .. //depot/projects/binutils/src/tools/tools/ath/athstats/statfoo.h#2 integrate .. //depot/projects/binutils/src/tools/tools/net80211/wlanstats/main.c#3 integrate .. //depot/projects/binutils/src/tools/tools/net80211/wlanstats/statfoo.c#3 integrate .. //depot/projects/binutils/src/tools/tools/net80211/wlanstats/statfoo.h#2 integrate .. //depot/projects/binutils/src/tools/tools/net80211/wlanstats/wlanstats.c#3 integrate .. //depot/projects/binutils/src/tools/tools/net80211/wlanstats/wlanstats.h#2 integrate .. //depot/projects/binutils/src/tools/tools/net80211/wlanwatch/wlanwatch.c#2 integrate .. //depot/projects/binutils/src/usr.bin/Makefile#3 integrate .. //depot/projects/binutils/src/usr.bin/procstat/Makefile#1 branch .. //depot/projects/binutils/src/usr.bin/procstat/procstat.1#1 branch .. //depot/projects/binutils/src/usr.bin/procstat/procstat.c#1 branch .. //depot/projects/binutils/src/usr.bin/procstat/procstat.h#1 branch .. //depot/projects/binutils/src/usr.bin/procstat/procstat_args.c#1 branch .. //depot/projects/binutils/src/usr.bin/procstat/procstat_basic.c#1 branch .. //depot/projects/binutils/src/usr.bin/procstat/procstat_bin.c#1 branch .. //depot/projects/binutils/src/usr.bin/procstat/procstat_cred.c#1 branch .. //depot/projects/binutils/src/usr.bin/procstat/procstat_files.c#1 branch .. //depot/projects/binutils/src/usr.bin/procstat/procstat_kstack.c#1 branch .. //depot/projects/binutils/src/usr.bin/procstat/procstat_threads.c#1 branch .. //depot/projects/binutils/src/usr.bin/procstat/procstat_vm.c#1 branch .. //depot/projects/binutils/src/usr.sbin/pmcstat/pmcstat_log.c#2 integrate .. //depot/projects/binutils/src/usr.sbin/zic/zic.c#2 integrate Differences ... ==== //depot/projects/binutils/src/Makefile.inc1#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.590 2007/10/31 09:26:42 yar Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.591 2007/12/04 12:55:27 yar Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -591,17 +591,25 @@ # distributeworld installworld: installcheck mkdir -p ${INSTALLTMP} - for prog in ${ITOOLS}; do \ + progs=$$(for prog in ${ITOOLS}; do \ if progpath=`which $$prog`; then \ - progs="$$progs $$progpath"; \ + echo $$progpath; \ else \ echo "Required tool $$prog not found in PATH." >&2; \ exit 1; \ fi; \ - done; \ - cp $$progs ${INSTALLTMP}; \ - cp `ldd -f "%p\n" -f "%p\n" $$progs 2>/dev/null | \ - sort -u` ${INSTALLTMP} + done); \ + libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | \ + while read line; do \ + set -- $$line; \ + if [ "$$2 $$3" != "not found" ]; then \ + echo $$2; \ + else \ + echo "Required library $$1 not found." >&2; \ + exit 1; \ + fi; \ + done); \ + cp $$libs $$progs ${INSTALLTMP} cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ ${IMAKEENV} rm -rf ${INSTALLTMP} ==== //depot/projects/binutils/src/contrib/bind9/lib/isc/arm/include/isc/atomic.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/bind9/lib/isc/arm/include/isc/atomic.h,v 1.1.1.1 2007/06/05 22:15:38 dougb Exp $ + * $FreeBSD: src/contrib/bind9/lib/isc/arm/include/isc/atomic.h,v 1.1.1.2 2007/12/03 08:26:34 dougb Exp $ */ #ifndef ISC_ATOMIC_H @@ -49,7 +49,29 @@ static inline isc_int32_t isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val) { - return atomic_cmpset_int(p, cmpval, val); + register int done, ras_start; + + __asm __volatile("1:\n" + "adr %1, 1b\n" + "mov %0, #0xe0000004\n" + "str %1, [%0]\n" + "mov %0, #0xe0000008\n" + "adr %1, 2f\n" + "str %1, [%0]\n" + "ldr %1, [%2]\n" + "cmp %1, %3\n" + "streq %4, [%2]\n" + "2:\n" + "mov %3, #0\n" + "mov %0, #0xe0000004\n" + "str %3, [%0]\n" + "mov %3, #0xffffffff\n" + "mov %0, #0xe0000008\n" + "str %3, [%0]\n" + : "=r" (ras_start), "=r" (done) + ,"+r" (p), "+r" (cmpval), "+r" (val) : : "memory"); + return (done); + } #else /* !FreeBSD */ ==== //depot/projects/binutils/src/contrib/pf/pflogd/pidfile.c#2 (text+ko) ==== ==== //depot/projects/binutils/src/contrib/pf/pflogd/pidfile.h#2 (text+ko) ==== ==== //depot/projects/binutils/src/lib/csu/common/crtbrand.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/csu/common/crtbrand.c,v 1.4 2003/10/17 15:43:13 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/csu/common/crtbrand.c,v 1.6 2007/12/04 12:18:43 kib Exp $"); #include @@ -43,7 +43,7 @@ int32_t type; char name[sizeof ABI_VENDOR]; int32_t desc; -} abitag __attribute__ ((section (ABI_SECTION), aligned(4))) __unused = { +} abitag __attribute__ ((section (ABI_SECTION), aligned(4))) __used = { sizeof ABI_VENDOR, sizeof(int32_t), ABI_NOTETYPE, ==== //depot/projects/binutils/src/lib/libarchive/archive_read_support_format_zip.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.15 2007/10/12 04:08:28 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.16 2007/12/04 06:32:12 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -336,7 +336,8 @@ zip->entry_offset = 0; /* If there's no body, force read_data() to return EOF immediately. */ - if (zip->entry_bytes_remaining < 1) + if (0 == (zip->flags & ZIP_LENGTH_AT_END) + && zip->entry_bytes_remaining < 1) zip->end_of_entry = 1; /* Set up a more descriptive format name. */ ==== //depot/projects/binutils/src/lib/libc/amd64/Makefile.inc#2 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/lib/libc/amd64/Makefile.inc,v 1.5 2006/03/16 14:22:19 ru Exp $ +# $FreeBSD: src/lib/libc/amd64/Makefile.inc,v 1.6 2007/12/03 07:17:32 das Exp $ # # Machine dependent definitions for the amd64 architecture. # # Long double is 80 bits -GDTOASRCS+=strtopx.c +GDTOASRCS+=strtorx.c MDSRCS+=machdep_ldisx.c SYM_MAPS+=${.CURDIR}/amd64/Symbol.map ==== //depot/projects/binutils/src/lib/libc/gdtoa/_ldtoa.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_ldtoa.c,v 1.3 2007/11/21 01:10:42 jb Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_ldtoa.c,v 1.4 2007/12/03 07:17:32 das Exp $"); #include #include @@ -46,11 +46,11 @@ __ldtoa(long double *ld, int mode, int ndigits, int *decpt, int *sign, char **rve) { - static FPI fpi = { + FPI fpi = { LDBL_MANT_DIG, /* nbits */ LDBL_MIN_EXP - LDBL_MANT_DIG, /* emin */ LDBL_MAX_EXP - LDBL_MANT_DIG, /* emax */ - FPI_Round_near, /* rounding */ + FLT_ROUNDS, /* rounding */ #ifdef Sudden_Underflow /* unused, but correct anyway */ 1 #else @@ -64,7 +64,15 @@ void *vbits = bits; u.e = *ld; + + /* + * gdtoa doesn't know anything about the sign of the number, so + * if the number is negative, we need to swap rounding modes of + * 2 (upwards) and 3 (downwards). + */ *sign = u.bits.sign; + fpi.rounding ^= (fpi.rounding >> 1) & u.bits.sign; + be = u.bits.exp - (LDBL_MAX_EXP - 1) - (LDBL_MANT_DIG - 1); LDBL_TO_ARRAY32(u, bits); ==== //depot/projects/binutils/src/lib/libc/gdtoa/machdep_ldisQ.c#2 (text+ko) ==== @@ -31,7 +31,9 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisQ.c,v 1.2 2003/04/09 05:58:43 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisQ.c,v 1.3 2007/12/03 07:17:32 das Exp $"); + +#include #include "gdtoaimp.h" @@ -40,6 +42,6 @@ { long double result; - strtopQ(s, sp, &result); + strtorQ(s, sp, FLT_ROUNDS, &result); return result; } ==== //depot/projects/binutils/src/lib/libc/gdtoa/machdep_ldisx.c#2 (text+ko) ==== @@ -31,7 +31,9 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisx.c,v 1.2 2003/04/09 05:58:43 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisx.c,v 1.3 2007/12/03 07:17:32 das Exp $"); + +#include #include "gdtoaimp.h" @@ -40,6 +42,6 @@ { long double result; - strtopx(s, sp, &result); + strtorx(s, sp, FLT_ROUNDS, &result); return result; } ==== //depot/projects/binutils/src/lib/libc/gen/closedir.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ static char sccsid[] = "@(#)closedir.c 8.1 (Berkeley) 6/10/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/closedir.c,v 1.12 2007/11/19 21:57:28 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/closedir.c,v 1.13 2007/12/03 14:33:50 des Exp $"); #include "namespace.h" #include @@ -54,7 +54,7 @@ int fd; if (__isthreaded) - _pthread_mutex_lock((void *)&dirp->dd_lock); + _pthread_mutex_lock(&dirp->dd_lock); _seekdir(dirp, dirp->dd_rewind); /* free seekdir storage */ fd = dirp->dd_fd; dirp->dd_fd = -1; @@ -62,8 +62,8 @@ free((void *)dirp->dd_buf); _reclaim_telldir(dirp); if (__isthreaded) { - _pthread_mutex_unlock((void *)&dirp->dd_lock); - _pthread_mutex_destroy((void *)&dirp->dd_lock); + _pthread_mutex_unlock(&dirp->dd_lock); + _pthread_mutex_destroy(&dirp->dd_lock); } free((void *)dirp); return(_close(fd)); ==== //depot/projects/binutils/src/lib/libc/gen/readdir.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ static char sccsid[] = "@(#)readdir.c 8.3 (Berkeley) 9/29/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/readdir.c,v 1.13 2007/01/09 00:27:55 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/readdir.c,v 1.14 2007/12/03 14:33:50 des Exp $"); #include "namespace.h" #include @@ -87,9 +87,9 @@ struct dirent *dp; if (__isthreaded) { - _pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock); + _pthread_mutex_lock(&dirp->dd_lock); dp = _readdir_unlocked(dirp); - _pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock); + _pthread_mutex_unlock(&dirp->dd_lock); } else dp = _readdir_unlocked(dirp); @@ -108,10 +108,10 @@ saved_errno = errno; errno = 0; if (__isthreaded) { - _pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock); + _pthread_mutex_lock(&dirp->dd_lock); if ((dp = _readdir_unlocked(dirp)) != NULL) memcpy(entry, dp, _GENERIC_DIRSIZ(dp)); - _pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock); + _pthread_mutex_unlock(&dirp->dd_lock); } else if ((dp = _readdir_unlocked(dirp)) != NULL) memcpy(entry, dp, _GENERIC_DIRSIZ(dp)); ==== //depot/projects/binutils/src/lib/libc/gen/seekdir.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ static char sccsid[] = "@(#)seekdir.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/seekdir.c,v 1.6 2007/01/09 00:27:55 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/seekdir.c,v 1.7 2007/12/03 14:33:51 des Exp $"); #include "namespace.h" #include @@ -52,8 +52,8 @@ long loc; { if (__isthreaded) - _pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock); + _pthread_mutex_lock(&dirp->dd_lock); _seekdir(dirp, loc); if (__isthreaded) - _pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock); + _pthread_mutex_unlock(&dirp->dd_lock); } ==== //depot/projects/binutils/src/lib/libc/gen/telldir.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ static char sccsid[] = "@(#)telldir.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/telldir.c,v 1.9 2007/01/09 00:27:55 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/telldir.c,v 1.10 2007/12/03 14:33:51 des Exp $"); #include "namespace.h" #include @@ -64,13 +64,13 @@ if ((lp = (struct ddloc *)malloc(sizeof(struct ddloc))) == NULL) return (-1); if (__isthreaded) - _pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock); + _pthread_mutex_lock(&dirp->dd_lock); lp->loc_index = dirp->dd_td->td_loccnt++; lp->loc_seek = dirp->dd_seek; lp->loc_loc = dirp->dd_loc; LIST_INSERT_HEAD(&dirp->dd_td->td_locq, lp, loc_lqe); if (__isthreaded) - _pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock); + _pthread_mutex_unlock(&dirp->dd_lock); return (lp->loc_index); } ==== //depot/projects/binutils/src/lib/libc/i386/Makefile.inc#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/lib/libc/i386/Makefile.inc,v 1.2 2006/03/13 01:14:57 deischen Exp $ +# $FreeBSD: src/lib/libc/i386/Makefile.inc,v 1.3 2007/12/03 07:17:32 das Exp $ # Long double is 80 bits -GDTOASRCS+=strtopx.c +GDTOASRCS+=strtorx.c MDSRCS+=machdep_ldisx.c SYM_MAPS+=${.CURDIR}/i386/Symbol.map ==== //depot/projects/binutils/src/lib/libc/ia64/Makefile.inc#2 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/lib/libc/ia64/Makefile.inc,v 1.7 2006/03/16 14:27:17 ru Exp $ +# $FreeBSD: src/lib/libc/ia64/Makefile.inc,v 1.8 2007/12/03 07:17:32 das Exp $ # # Machine dependent definitions for the ia64 architecture. # # Long double is 80 bits -GDTOASRCS+=strtopx.c +GDTOASRCS+=strtorx.c MDSRCS+=machdep_ldisx.c SYM_MAPS+=${.CURDIR}/ia64/Symbol.map ==== //depot/projects/binutils/src/lib/libc/nameser/ns_parse.c#3 (text) ==== @@ -16,7 +16,7 @@ */ #ifndef lint -static const char rcsid[] = "$Id: ns_parse.c,v 1.5.18.3 2005/10/11 00:25:10 marka Exp $"; +static const char rcsid[] = "$Id: ns_parse.c,v 1.5.18.4 2007/08/27 03:34:24 marka Exp $"; #endif /* Import. */ @@ -40,7 +40,7 @@ /* Macros. */ -#ifndef SOLARIS2 +#if !defined(SOLARIS2) || defined(__COVERITY__) #define RETERR(err) do { errno = (err); return (-1); } while (0) #else #define RETERR(err) \ ==== //depot/projects/binutils/src/lib/libc/resolv/res_data.c#3 (text) ==== @@ -16,10 +16,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: res_data.c,v 1.3.18.1 2005/04/27 05:01:10 sra Exp $"; +static const char rcsid[] = "$Id: res_data.c,v 1.3.18.2 2007/09/14 05:35:47 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/resolv/res_data.c,v 1.4 2007/06/03 17:20:27 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/resolv/res_data.c,v 1.5 2007/12/03 15:13:44 ume Exp $"); #include "port_before.h" ==== //depot/projects/binutils/src/lib/libc/resolv/res_init.c#3 (text) ==== @@ -66,10 +66,10 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93"; -static const char rcsid[] = "$Id: res_init.c,v 1.16.18.5 2006/08/30 23:23:13 marka Exp $"; +static const char rcsid[] = "$Id: res_init.c,v 1.16.18.7 2007/07/09 01:52:58 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/resolv/res_init.c,v 1.6 2007/06/03 17:20:27 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/resolv/res_init.c,v 1.7 2007/12/03 15:13:44 ume Exp $"); #include "port_before.h" @@ -168,7 +168,9 @@ #endif int dots; union res_sockaddr_union u[2]; + int maxns = MAXNS; + RES_SET_H_ERRNO(statp, 0); if (statp->_u._ext.ext != NULL) res_ndestroy(statp); @@ -218,8 +220,22 @@ statp->_u._ext.ext->nsaddrs[0].sin = statp->nsaddr; strcpy(statp->_u._ext.ext->nsuffix, "ip6.arpa"); strcpy(statp->_u._ext.ext->nsuffix2, "ip6.int"); - } else - return (-1); + } else { + /* + * Historically res_init() rarely, if at all, failed. + * Examples and applications exist which do not check + * our return code. Furthermore several applications + * simply call us to get the systems domainname. So + * rather then immediately fail here we store the + * failure, which is returned later, in h_errno. And + * prevent the collection of 'nameserver' information + * by setting maxns to 0. Thus applications that fail + * to check our return code wont be able to make + * queries anyhow. + */ + RES_SET_H_ERRNO(statp, NETDB_INTERNAL); + maxns = 0; + } #ifdef RESOLVSORT statp->nsort = 0; #endif @@ -240,9 +256,9 @@ buf[0] = '.'; cp = strchr(buf, '.'); cp = (cp == NULL) ? buf : (cp + 1); - if (strlen(cp) >= sizeof(statp->defdname)) - goto freedata; - strcpy(statp->defdname, cp); + strncpy(statp->defdname, cp, + sizeof(statp->defdname) - 1); + statp->defdname[sizeof(statp->defdname) - 1] = '\0'; } } #endif /* SOLARIS2 */ @@ -348,7 +364,7 @@ continue; } /* read nameservers to query */ - if (MATCH(buf, "nameserver") && nserv < MAXNS) { + if (MATCH(buf, "nameserver") && nserv < maxns) { struct addrinfo hints, *ai; char sbuf[NI_MAXSERV]; const size_t minsiz = @@ -541,16 +557,7 @@ else if ((cp = getenv("RES_OPTIONS")) != NULL) res_setoptions(statp, cp, "env"); statp->options |= RES_INIT; - return (0); - -#ifdef SOLARIS2 - freedata: - if (statp->_u._ext.ext != NULL) { - free(statp->_u._ext.ext); - statp->_u._ext.ext = NULL; - } - return (-1); -#endif + return (statp->res_h_errno); } static void ==== //depot/projects/binutils/src/lib/libc/sparc64/Makefile.inc#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/sparc64/Makefile.inc,v 1.6 2006/03/16 14:22:19 ru Exp $ +# $FreeBSD: src/lib/libc/sparc64/Makefile.inc,v 1.7 2007/12/03 07:17:33 das Exp $ # # Machine dependent definitions for the ultra sparc architecture. # @@ -6,6 +6,6 @@ .include "fpu/Makefile.inc" # Long double is quad precision -GDTOASRCS+=strtopQ.c +GDTOASRCS+=strtorQ.c MDSRCS+=machdep_ldisQ.c SYM_MAPS+=${.CURDIR}/sparc64/Symbol.map ==== //depot/projects/binutils/src/lib/libpmc/pmc.3#3 (text+ko) ==== @@ -21,7 +21,7 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.14 2007/11/25 06:50:31 jkoshy Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.15 2007/12/03 10:59:23 jkoshy Exp $ .\" .Dd November 25, 2007 .Os @@ -393,10 +393,8 @@ Event specifiers are strings comprising of an event name, followed by optional parameters modifying the semantics of the hardware event being probed. -Event names are PMC architecture dependent, but the -.Xr hwpmc 4 -library defines machine independent aliases for commonly used -events. +Event names are PMC architecture dependent, but the PMC library defines +machine independent aliases for commonly used events. .Ss Event Name Aliases Event name aliases are CPU architecture independent names for commonly used events. ==== //depot/projects/binutils/src/lib/libpmc/pmclog.c#2 (text+ko) ==== @@ -1,7 +1,11 @@ /*- - * Copyright (c) 2005-2006 Joseph Koshy + * Copyright (c) 2005-2007 Joseph Koshy + * Copyright (c) 2007 The FreeBSD Foundation * All rights reserved. * + * Portions of this software were developed by A. Joseph Koshy under + * sponsorship from the FreeBSD Foundation and Google, Inc. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -25,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpmc/pmclog.c,v 1.4 2006/03/26 12:20:53 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/lib/libpmc/pmclog.c,v 1.5 2007/12/03 11:15:46 jkoshy Exp $"); #include #include @@ -270,7 +274,7 @@ struct pmclog_ev *ev) { int evlen, pathlen; - uint32_t h, *le; + uint32_t h, *le, npc; enum pmclog_parser_state e; struct pmclog_parse_state *ps; @@ -310,7 +314,22 @@ goto error; \ } while (0) +#define PMCLOG_GET_CALLCHAIN_SIZE(SZ,E) do { \ + (SZ) = ((E) - offsetof(struct pmclog_callchain, pl_pc)) \ + / sizeof(uintfptr_t); \ + } while (0); + switch (ev->pl_type = PMCLOG_HEADER_TO_TYPE(h)) { + case PMCLOG_TYPE_CALLCHAIN: + PMCLOG_READ32(le,ev->pl_u.pl_cc.pl_pid); + PMCLOG_READ32(le,ev->pl_u.pl_cc.pl_pmcid); + PMCLOG_READ32(le,ev->pl_u.pl_cc.pl_cpuflags); + PMCLOG_GET_CALLCHAIN_SIZE(ev->pl_u.pl_cc.pl_npc,evlen); + for (npc = 0; npc < ev->pl_u.pl_cc.pl_npc; npc++) + PMCLOG_READADDR(le,ev->pl_u.pl_cc.pl_pc[npc]); + for (;npc < PMC_CALLCHAIN_DEPTH_MAX; npc++) + ev->pl_u.pl_cc.pl_pc[npc] = (uintfptr_t) 0; + break; case PMCLOG_TYPE_CLOSELOG: case PMCLOG_TYPE_DROPNOTIFY: /* nothing to do */ @@ -387,7 +406,7 @@ default: /* unknown record type */ ps->ps_state = PL_STATE_ERROR; ev->pl_state = PMCLOG_ERROR; - return -1; + return (-1); } ev->pl_offset = (ps->ps_offset += evlen); ==== //depot/projects/binutils/src/lib/libpmc/pmclog.h#2 (text+ko) ==== @@ -1,7 +1,11 @@ /*- - * Copyright (c) 2005-2006 Joseph Koshy + * Copyright (c) 2005-2007 Joseph Koshy + * Copyright (c) 2007 The FreeBSD Foundation * All rights reserved. * + * Portions of this software were developed by A. Joseph Koshy under + * sponsorship from the FreeBSD Foundation and Google, Inc. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -23,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpmc/pmclog.h,v 1.3 2006/03/26 12:20:53 jkoshy Exp $ + * $FreeBSD: src/lib/libpmc/pmclog.h,v 1.4 2007/12/03 11:15:46 jkoshy Exp $ */ #ifndef _PMCLOG_H_ @@ -38,6 +42,14 @@ PMCLOG_ERROR }; +struct pmclog_ev_callchain { + uint32_t pl_pid; + uint32_t pl_pmcid; + uint32_t pl_cpuflags; + uint32_t pl_npc; + uintfptr_t pl_pc[PMC_CALLCHAIN_DEPTH_MAX]; +}; + struct pmclog_ev_dropnotify { }; @@ -125,6 +137,7 @@ struct timespec pl_ts; /* log entry timestamp */ enum pmclog_type pl_type; /* type of log entry */ union { /* log entry data */ + struct pmclog_ev_callchain pl_cc; struct pmclog_ev_closelog pl_cl; struct pmclog_ev_dropnotify pl_dn; struct pmclog_ev_initialize pl_i; ==== //depot/projects/binutils/src/release/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.928 2007/11/22 20:06:50 simon Exp $ +# $FreeBSD: src/release/Makefile,v 1.929 2007/12/04 02:22:35 kensmith Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -618,7 +618,7 @@ rm -rf ${j}_crunch mkdir ${j}_crunch cd ${j}_crunch; ${WMAKEENV} MAKEFLAGS="-m ${.CURDIR}/../share/mk" \ - crunchgen -o \ + NO_WERROR= crunchgen -o \ ${.CURDIR}/${TARGET}/${j}_crunch.conf cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk subclean cd ${.CURDIR}/..; ${BINMAKE} -f Makefile.inc1 _build-tools ==== //depot/projects/binutils/src/share/misc/iso3166#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/misc/iso3166,v 1.16 2007/11/28 11:03:06 keramida Exp $ +# $FreeBSD: src/share/misc/iso3166,v 1.17 2007/12/04 00:20:57 edwin Exp $ # # ISO 3166 country codes # This includes many places that are not legally independent countries, @@ -199,8 +199,10 @@ RO ROU 642 Romania RU RUS 643 Russian Federation RW RWA 646 Rwanda +BL BLM 652 Saint Barthelemy KN KNA 659 Saint Kitts and Nevis LC LCA 662 Saint Lucia +MF MAF 663 Saint Martin (French part) VC VCT 670 Saint Vincent and the Grenadines WS WSM 882 Samoa SM SMR 674 San Marino @@ -513,3 +515,6 @@ # # Newsletter V-12 2006-09-26 # Removed SERBIA AND MONTENEGRO (CS). Added SERBIA (RS) and MONTENEGRO (ME). +# +# Newsletter VI-1 2007-09-21 +# Added SAINT BARTHELEMY (BL) and SAINT MARTIN (MF). ==== //depot/projects/binutils/src/share/zoneinfo/asia#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# @(#)asia 8.13 +# @(#)asia 8.14 # 
 
 # This data is by no means authoritative; if you think you know better,
@@ -577,6 +577,15 @@
 # daylight saving time ...
 # http://uk.reuters.com/article/oilRpt/idUKBLA65048420070916
 #
+# From Roozbeh Pournader (2007-11-05):
+# This is quoted from Official Gazette of the Islamic Republic of
+# Iran, Volume 63, Number 18242, dated Tuesday 1386/6/24
+# [2007-10-16]. I am doing the best translation I can:...
+# The official time of the country will be moved forward for one hour
+# on the 24 hours of the first day of the month of Farvardin and will
+# be changed back to its previous state on the 24 hours of the
+# thirtieth day of Shahrivar.
+#
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Iran	1978	1980	-	Mar	21	0:00	1:00	D
 Rule	Iran	1978	only	-	Oct	21	0:00	0	S

==== //depot/projects/binutils/src/share/zoneinfo/northamerica#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)northamerica	8.19
+# @(#)northamerica	8.20
 # 
 
 # also includes Central America and the Caribbean
@@ -2303,6 +2303,10 @@
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Guadeloupe	-4:06:08 -	LMT	1911 Jun 8	# Pointe a Pitre
 			-4:00	-	AST
+# St Barthelemy
+Link America/Guadeloupe	America/St_Barthelemy
+# St Martin (French part)
+Link America/Guadeloupe	America/Marigot
 
 # Guatemala
 #

==== //depot/projects/binutils/src/share/zoneinfo/southamerica#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)southamerica	8.12
+# @(#)southamerica	8.13
 # 
 
 # This data is by no means authoritative; if you think you know better,
@@ -1107,19 +1107,17 @@
 
 # Venezuela
 #
-# From Kiraz Janicke (2007-09-25), in
-# http://www.venezuelanalysis.com/analysis/2645:
-# The proposal ... involves turning the clock back half an hour from
-# +4.00 Greenwich Mean Time (GMT), to +4.30GMT, the time zone
-# Venezuela had until December 31, 1964, when the current time zone
-# was adopted. The change was due to take place on September 17 and
-# then on September 24, but has since been postponed until December
-# 31, to allow for compliance with international organizations, such
-# as the International Office of Weights and Measures.
+# From John Stainforth (2007-11-28):
+# ... the change for Venezuela originally expected for 2007-12-31 has
+# been brought forward to 2007-12-09.  The official announcement was
+# published today in the "Gaceta Oficial de la Republica Bolivariana
+# de Venezuela, numero 38.819" (official document for all laws or
+# resolution publication)
+# http://www.globovision.com/news.php?nid=72208
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Caracas	-4:27:44 -	LMT	1890
 			-4:27:40 -	CMT	1912 Feb 12 # Caracas Mean Time?
 			-4:30	-	VET	1965	     # Venezuela Time
-			-4:00	-	VET	2008
+			-4:00	-	VET	2007 Dec  9 03:00
 			-4:30	-	VET

==== //depot/projects/binutils/src/share/zoneinfo/zone.tab#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)zone.tab	8.11
+# @(#)zone.tab	8.12
 #
 # TZ zone descriptions
 #
@@ -77,6 +77,7 @@
 BH	+2623+05035	Asia/Bahrain
 BI	-0323+02922	Africa/Bujumbura
 BJ	+0629+00237	Africa/Porto-Novo
+BL	+1753-06251	America/St_Barthelemy
 BM	+3217-06446	Atlantic/Bermuda
 BN	+0456+11455	Asia/Brunei
 BO	-1630-06809	America/La_Paz
@@ -250,6 +251,7 @@
 MC	+4342+00723	Europe/Monaco
 MD	+4700+02850	Europe/Chisinau
 ME	+4226+01916	Europe/Podgorica
+MF	+1804-06305	America/Marigot
 MG	-1855+04731	Indian/Antananarivo
 MH	+0709+17112	Pacific/Majuro	most locations
 MH	+0905+16720	Pacific/Kwajalein	Kwajalein

==== //depot/projects/binutils/src/sys/amd64/amd64/pmap.c#4 (text+ko) ====

@@ -77,7 +77,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.596 2007/11/30 07:14:42 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.597 2007/12/04 08:17:04 alc Exp $");
 
 /*
  *	Manages physical address maps.
@@ -1430,9 +1430,9 @@
 	 * This supports switching from a 2MB page to a
 	 * normal 4K page.
 	 */
-	if (pd != 0 && (*pd & (PG_PS | PG_V)) == (PG_PS | PG_V)) {
+	if (pd != NULL && (*pd & (PG_PS | PG_V)) == (PG_PS | PG_V)) {
 		*pd = 0;
-		pd = 0;
+		pd = NULL;
 		pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE;
 		free = NULL;
 		pmap_unuse_pt(pmap, va, *pmap_pdpe(pmap, va), &free);
@@ -1444,7 +1444,7 @@
 	 * If the page table page is mapped, we just increment the
 	 * hold count, and activate it.
 	 */
-	if (pd != 0 && (*pd & PG_V) != 0) {
+	if (pd != NULL && (*pd & PG_V) != 0) {
 		m = PHYS_TO_VM_PAGE(*pd & PG_FRAME);
 		m->wire_count++;
 	} else {

==== //depot/projects/binutils/src/sys/amd64/amd64/trap.c#3 (text+ko) ====

@@ -38,7 +38,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.322 2007/11/15 22:00:57 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.323 2007/12/04 12:33:03 kib Exp $");
 
 /*
  * AMD64 Trap and System call handling
@@ -144,6 +144,9 @@
 static int panic_on_nmi = 1;
 SYSCTL_INT(_machdep, OID_AUTO, panic_on_nmi, CTLFLAG_RW,
 	&panic_on_nmi, 0, "Panic on NMI");
+static int prot_fault_translation = 0;
+SYSCTL_INT(_machdep, OID_AUTO, prot_fault_translation, CTLFLAG_RW,
+	&prot_fault_translation, 0, "Select signal to deliver on protection fault");
 
 extern char *syscallnames[];
 
@@ -312,8 +315,32 @@
 			if (i == SIGSEGV)
 				ucode = SEGV_MAPERR;
 			else {
-				i = SIGSEGV; /* XXX hack */
-				ucode = SEGV_ACCERR;
+				if (prot_fault_translation == 0) {
+					/*
+					 * Autodetect.
+					 * This check also covers the images
+					 * without the ABI-tag ELF note.
+					 */
+					if (p->p_osrel >= 700004) {
+						i = SIGSEGV;
+						ucode = SEGV_ACCERR;
+					} else {
+						i = SIGBUS;
+						ucode = BUS_PAGE_FAULT;
+					}
+				} else if (prot_fault_translation == 1) {
+					/*
+					 * Always compat mode.
+					 */

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Tue Dec  4 21:41:08 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BCCCE16A468; Tue,  4 Dec 2007 21:41: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 6059C16A417
	for ; Tue,  4 Dec 2007 21:41:08 +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 4E3D513C4E8
	for ; Tue,  4 Dec 2007 21:41:08 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB4Lf8Oc020426
	for ; Tue, 4 Dec 2007 21:41:08 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB4Lf8j6020422
	for perforce@freebsd.org; Tue, 4 Dec 2007 21:41:08 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Tue, 4 Dec 2007 21:41:08 GMT
Message-Id: <200712042141.lB4Lf8j6020422@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 130202 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 04 Dec 2007 21:41:09 -0000

http://perforce.freebsd.org/chv.cgi?CH=130202

Change 130202 by gonzo@gonzo_jeeves on 2007/12/04 21:41:03

	o Make if_vr compileable again.

Affected files ...

.. //depot/projects/mips2/src/sys/pci/if_vr.c#9 edit

Differences ...

==== //depot/projects/mips2/src/sys/pci/if_vr.c#9 (text+ko) ====

@@ -157,7 +157,6 @@
 static int vr_probe(device_t);
 static int vr_attach(device_t);
 static int vr_detach(device_t);
-static void vr_shutdown(device_t);
 static int vr_suspend(device_t);
 static int vr_resume(device_t);
 
@@ -189,7 +188,7 @@
 static int vr_tx_stop(struct vr_softc *);
 static int vr_rx_stop(struct vr_softc *);
 static void vr_stop(struct vr_softc *);
-static void vr_watchdog(struct ifnet *);
+static void vr_watchdog(struct vr_softc *);
 static int vr_shutdown(device_t);
 static int vr_ifmedia_upd(struct ifnet *);
 static void vr_ifmedia_sts(struct ifnet *, struct ifmediareq *);

From owner-p4-projects@FreeBSD.ORG  Tue Dec  4 23:08:14 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1EDDB16A41A; Tue,  4 Dec 2007 23:08:14 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A495A16A418
	for ; Tue,  4 Dec 2007 23:08:13 +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 79EFC13C44B
	for ; Tue,  4 Dec 2007 23:08:13 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB4N8DR3038371
	for ; Tue, 4 Dec 2007 23:08:13 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB4N8DHM038368
	for perforce@freebsd.org; Tue, 4 Dec 2007 23:08:13 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Tue, 4 Dec 2007 23:08:13 GMT
Message-Id: <200712042308.lB4N8DHM038368@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 130208 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 04 Dec 2007 23:08:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=130208

Change 130208 by gonzo@gonzo_jeeves on 2007/12/04 23:08:10

	o Add *very* barebone driver for RC32434 Ethernet interface.

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips32/idt/if_kr.c#1 add
.. //depot/projects/mips2/src/sys/mips/mips32/idt/if_krreg.h#1 add

Differences ...

From owner-p4-projects@FreeBSD.ORG  Tue Dec  4 23:10:16 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2CDA616A468; Tue,  4 Dec 2007 23:10:16 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D825716A421
	for ; Tue,  4 Dec 2007 23:10:15 +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 C5CF913C447
	for ; Tue,  4 Dec 2007 23:10:15 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB4NAFdD038594
	for ; Tue, 4 Dec 2007 23:10:15 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB4NAFZ7038588
	for perforce@freebsd.org; Tue, 4 Dec 2007 23:10:15 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Tue, 4 Dec 2007 23:10:15 GMT
Message-Id: <200712042310.lB4NAFZ7038588@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 130209 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 04 Dec 2007 23:10:16 -0000

http://perforce.freebsd.org/chv.cgi?CH=130209

Change 130209 by gonzo@gonzo_jeeves on 2007/12/04 23:09:20

	o Add kr to IDT kernel build

Affected files ...

.. //depot/projects/mips2/src/sys/mips/conf/IDT#4 edit
.. //depot/projects/mips2/src/sys/mips/conf/IDT.hints#5 edit
.. //depot/projects/mips2/src/sys/mips/mips32/idt/files.idt#5 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/conf/IDT#4 (text+ko) ====

@@ -26,7 +26,7 @@
 options		BOOTP
 options		BOOTP_NFSROOT
 options		BOOTP_NFSV3
-options		BOOTP_WIRED_TO=vr0
+options		BOOTP_WIRED_TO=kr0
 options		BOOTP_COMPAT
 
 options		ROOTDEVNAME=\"nfs:192.168.0.52:/mnt/bsd\"
@@ -42,8 +42,10 @@
 device		ether
 device		miibus
 device		vr
+device		kr
 device		uart
 device		uart_ns8250
+device		md
 
 # Wireless NIC cards
 #device          wlan            # 802.11 support

==== //depot/projects/mips2/src/sys/mips/conf/IDT.hints#5 (text+ko) ====

@@ -15,3 +15,7 @@
 hint.uart.0.maddr=0x18058000
 hint.uart.0.msize=0x1C
 hint.uart.0.irq=104
+
+hint.kr.0.at="obio0"
+hint.kr.0.maddr=0x18060000
+hint.kr.0.msize=0x10000

==== //depot/projects/mips2/src/sys/mips/mips32/idt/files.idt#5 (text+ko) ====

@@ -6,3 +6,4 @@
 mips/mips32/idt/idtpci.c		optional pci
 mips/mips32/idt/uart_cpu_rc32434.c	optional uart
 mips/mips32/idt/uart_bus_rc32434.c	optional uart
+mips/mips32/idt/if_kr.c			optional kr

From owner-p4-projects@FreeBSD.ORG  Wed Dec  5 04:23:56 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8E24216A41B; Wed,  5 Dec 2007 04:23:56 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 43F8A16A419
	for ; Wed,  5 Dec 2007 04:23:56 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2DC9113C46A
	for ; Wed,  5 Dec 2007 04:23:56 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB54NtnX008469
	for ; Wed, 5 Dec 2007 04:23:55 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB54MtiH008203
	for perforce@freebsd.org; Wed, 5 Dec 2007 04:22:55 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 5 Dec 2007 04:22:55 GMT
Message-Id: <200712050422.lB54MtiH008203@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130233 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 05 Dec 2007 04:23:57 -0000

http://perforce.freebsd.org/chv.cgi?CH=130233

Change 130233 by jb@jb_freebsd1 on 2007/12/05 04:22:12

	Import GDB 6.4 for reference.

Affected files ...

.. //depot/projects/binutils/src/contrib/gdb/include/ansidecl.h#2 edit
.. //depot/projects/binutils/src/gnu/usr.bin/binutils/Makefile#4 edit
.. //depot/vendor/gnu/gdb/COPYING#2 edit
.. //depot/vendor/gnu/gdb/COPYING.LIB#2 edit
.. //depot/vendor/gnu/gdb/Makefile.def#5 edit
.. //depot/vendor/gnu/gdb/Makefile.in#6 edit
.. //depot/vendor/gnu/gdb/Makefile.tpl#5 edit
.. //depot/vendor/gnu/gdb/bfd/COPYING#2 edit
.. //depot/vendor/gnu/gdb/bfd/ChangeLog#6 edit
.. //depot/vendor/gnu/gdb/bfd/Makefile.am#6 edit
.. //depot/vendor/gnu/gdb/bfd/Makefile.in#6 edit
.. //depot/vendor/gnu/gdb/bfd/acinclude.m4#5 edit
.. //depot/vendor/gnu/gdb/bfd/aclocal.m4#6 edit
.. //depot/vendor/gnu/gdb/bfd/aix386-core.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/aix5ppc-core.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/aout-adobe.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/aout-arm.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/aout-cris.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/aout-encap.c#3 delete
.. //depot/vendor/gnu/gdb/bfd/aout-ns32k.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/aout-sparcle.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/aout-target.h#6 edit
.. //depot/vendor/gnu/gdb/bfd/aout-tic30.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/aout0.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/aout32.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/aout64.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/aoutf1.h#5 edit
.. //depot/vendor/gnu/gdb/bfd/aoutx.h#5 edit
.. //depot/vendor/gnu/gdb/bfd/archive.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/archive64.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/archures.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/armnetbsd.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/bfd-in.h#6 edit
.. //depot/vendor/gnu/gdb/bfd/bfd-in2.h#6 edit
.. //depot/vendor/gnu/gdb/bfd/bfd.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/bfd.m4#1 add
.. //depot/vendor/gnu/gdb/bfd/bfdio.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/bfdwin.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/binary.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/bout.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/cache.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/cf-i386lynx.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/cf-m68klynx.c#2 delete
.. //depot/vendor/gnu/gdb/bfd/cf-sparclynx.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/cisco-core.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/coff-a29k.c#4 delete
.. //depot/vendor/gnu/gdb/bfd/coff-alpha.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/coff-apollo.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/coff-arm.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/coff-aux.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/coff-go32.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/coff-h8300.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/coff-h8500.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/coff-i386.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/coff-i860.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/coff-i960.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/coff-ia64.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/coff-m68k.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/coff-m88k.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/coff-maxq.c#1 add
.. //depot/vendor/gnu/gdb/bfd/coff-mcore.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/coff-mips.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/coff-or32.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/coff-pmac.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/coff-ppc.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/coff-rs6000.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/coff-sh.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/coff-sparc.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/coff-stgo32.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/coff-svm68k.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/coff-tic30.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/coff-tic4x.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/coff-tic54x.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/coff-tic80.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/coff-u68k.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/coff-w65.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/coff-we32k.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/coff-z80.c#1 add
.. //depot/vendor/gnu/gdb/bfd/coff-z8k.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/coff64-rs6000.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/coffcode.h#6 edit
.. //depot/vendor/gnu/gdb/bfd/coffgen.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/cofflink.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/coffswap.h#2 edit
.. //depot/vendor/gnu/gdb/bfd/config.bfd#6 edit
.. //depot/vendor/gnu/gdb/bfd/config.in#6 edit
.. //depot/vendor/gnu/gdb/bfd/configure#6 edit
.. //depot/vendor/gnu/gdb/bfd/configure.in#6 edit
.. //depot/vendor/gnu/gdb/bfd/corefile.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-a29k.c#3 delete
.. //depot/vendor/gnu/gdb/bfd/cpu-alpha.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-arc.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-arm.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-avr.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-bfin.c#1 add
.. //depot/vendor/gnu/gdb/bfd/cpu-cr16c.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-cris.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-crx.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-d10v.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-d30v.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-dlx.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-fr30.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-frv.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-h8300.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-h8500.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-hppa.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-i370.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-i386.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-i860.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-i960.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-ia64-opc.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-ia64.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-ip2k.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-iq2000.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-m10200.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-m10300.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-m32c.c#1 add
.. //depot/vendor/gnu/gdb/bfd/cpu-m32r.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-m68hc11.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-m68hc12.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-m68k.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-m88k.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-maxq.c#1 add
.. //depot/vendor/gnu/gdb/bfd/cpu-mcore.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-mips.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-mmix.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-ms1.c#1 add
.. //depot/vendor/gnu/gdb/bfd/cpu-msp430.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-ns32k.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-openrisc.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-or32.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-pdp11.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-pj.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-powerpc.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-rs6000.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-s390.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-sh.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-sparc.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-tic30.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-tic4x.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-tic54x.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-tic80.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-v850.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-vax.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-w65.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-we32k.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-xstormy16.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-xtensa.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/cpu-z80.c#1 add
.. //depot/vendor/gnu/gdb/bfd/cpu-z8k.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/demo64.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/dep-in.sed#3 edit
.. //depot/vendor/gnu/gdb/bfd/doc/ChangeLog#6 edit
.. //depot/vendor/gnu/gdb/bfd/doc/Makefile.am#5 edit
.. //depot/vendor/gnu/gdb/bfd/doc/Makefile.in#6 edit
.. //depot/vendor/gnu/gdb/bfd/doc/aoutx.texi#3 edit
.. //depot/vendor/gnu/gdb/bfd/doc/archive.texi#4 edit
.. //depot/vendor/gnu/gdb/bfd/doc/archures.texi#6 edit
.. //depot/vendor/gnu/gdb/bfd/doc/bfd.info#6 edit
.. //depot/vendor/gnu/gdb/bfd/doc/bfd.info-1#6 edit
.. //depot/vendor/gnu/gdb/bfd/doc/bfd.info-2#6 edit
.. //depot/vendor/gnu/gdb/bfd/doc/bfd.texinfo#4 edit
.. //depot/vendor/gnu/gdb/bfd/doc/bfdint.texi#5 edit
.. //depot/vendor/gnu/gdb/bfd/doc/bfdt.texi#6 edit
.. //depot/vendor/gnu/gdb/bfd/doc/cache.texi#5 edit
.. //depot/vendor/gnu/gdb/bfd/doc/chew.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/doc/coffcode.texi#3 edit
.. //depot/vendor/gnu/gdb/bfd/doc/core.texi#4 edit
.. //depot/vendor/gnu/gdb/bfd/doc/elf.texi#2 edit
.. //depot/vendor/gnu/gdb/bfd/doc/fdl.texi#2 edit
.. //depot/vendor/gnu/gdb/bfd/doc/format.texi#4 edit
.. //depot/vendor/gnu/gdb/bfd/doc/hash.texi#4 edit
.. //depot/vendor/gnu/gdb/bfd/doc/init.texi#3 edit
.. //depot/vendor/gnu/gdb/bfd/doc/libbfd.texi#5 edit
.. //depot/vendor/gnu/gdb/bfd/doc/linker.texi#5 edit
.. //depot/vendor/gnu/gdb/bfd/doc/mmo.texi#2 edit
.. //depot/vendor/gnu/gdb/bfd/doc/opncls.texi#5 edit
.. //depot/vendor/gnu/gdb/bfd/doc/reloc.texi#6 edit
.. //depot/vendor/gnu/gdb/bfd/doc/section.texi#6 edit
.. //depot/vendor/gnu/gdb/bfd/doc/targets.texi#6 edit
.. //depot/vendor/gnu/gdb/bfd/dwarf1.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/dwarf2.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/ecoff.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/ecofflink.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/ecoffswap.h#4 edit
.. //depot/vendor/gnu/gdb/bfd/efi-app-ia32.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/efi-app-ia64.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/elf-bfd.h#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf-eh-frame.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf-hppa.h#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf-m10200.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/elf-m10300.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf-strtab.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/elf-vxworks.c#1 add
.. //depot/vendor/gnu/gdb/bfd/elf-vxworks.h#1 add
.. //depot/vendor/gnu/gdb/bfd/elf.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-am33lin.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-arc.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-arm.c#1 add
.. //depot/vendor/gnu/gdb/bfd/elf32-arm.h#6 delete
.. //depot/vendor/gnu/gdb/bfd/elf32-avr.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-bfin.c#1 add
.. //depot/vendor/gnu/gdb/bfd/elf32-cr16c.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-cris.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-crx.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-d10v.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-d30v.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-dlx.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-fr30.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-frv.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-gen.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-h8300.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-hppa.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-hppa.h#4 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-i370.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-i386.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-i860.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-i960.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-ip2k.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-iq2000.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-m32c.c#1 add
.. //depot/vendor/gnu/gdb/bfd/elf32-m32r.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-m68hc11.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-m68hc12.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-m68hc1x.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-m68hc1x.h#4 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-m68k.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-m88k.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-mcore.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-mips.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-ms1.c#1 add
.. //depot/vendor/gnu/gdb/bfd/elf32-msp430.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-openrisc.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-or32.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-pj.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-ppc.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-ppc.h#3 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-s390.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-sh-symbian.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-sh.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-sh64-com.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-sh64.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-sh64.h#3 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-sparc.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-v850.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-vax.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-xstormy16.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf32-xtensa.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/elf32.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/elf64-alpha.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf64-gen.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/elf64-hppa.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf64-hppa.h#2 edit
.. //depot/vendor/gnu/gdb/bfd/elf64-mips.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf64-mmix.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf64-ppc.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf64-ppc.h#5 edit
.. //depot/vendor/gnu/gdb/bfd/elf64-s390.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf64-sh64.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf64-sparc.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf64-x86-64.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elf64.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/elfarm-nabi.c#5 delete
.. //depot/vendor/gnu/gdb/bfd/elfarm-oabi.c#3 delete
.. //depot/vendor/gnu/gdb/bfd/elfcode.h#6 edit
.. //depot/vendor/gnu/gdb/bfd/elfcore.h#4 edit
.. //depot/vendor/gnu/gdb/bfd/elflink.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elfn32-mips.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/elfxx-ia64.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elfxx-mips.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/elfxx-mips.h#5 edit
.. //depot/vendor/gnu/gdb/bfd/elfxx-sparc.c#1 add
.. //depot/vendor/gnu/gdb/bfd/elfxx-sparc.h#1 add
.. //depot/vendor/gnu/gdb/bfd/elfxx-target.h#6 edit
.. //depot/vendor/gnu/gdb/bfd/epoc-pe-arm.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/epoc-pei-arm.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/format.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/freebsd.h#3 edit
.. //depot/vendor/gnu/gdb/bfd/gen-aout.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/genlink.h#3 edit
.. //depot/vendor/gnu/gdb/bfd/hash.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/host-aout.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/hosts/alphavms.h#2 edit
.. //depot/vendor/gnu/gdb/bfd/hosts/delta68.h#2 edit
.. //depot/vendor/gnu/gdb/bfd/hosts/vaxbsd.h#2 edit
.. //depot/vendor/gnu/gdb/bfd/hp300bsd.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/hp300hpux.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/hppabsd-core.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/hpux-core.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/i386aout.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/i386bsd.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/i386dynix.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/i386freebsd.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/i386linux.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/i386lynx.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/i386mach3.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/i386msdos.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/i386netbsd.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/i386os9k.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/ieee.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/ihex.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/init.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/irix-core.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/libaout.h#6 edit
.. //depot/vendor/gnu/gdb/bfd/libbfd-in.h#6 edit
.. //depot/vendor/gnu/gdb/bfd/libbfd.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/libbfd.h#6 edit
.. //depot/vendor/gnu/gdb/bfd/libcoff-in.h#6 edit
.. //depot/vendor/gnu/gdb/bfd/libcoff.h#6 edit
.. //depot/vendor/gnu/gdb/bfd/libecoff.h#6 edit
.. //depot/vendor/gnu/gdb/bfd/libhppa.h#3 edit
.. //depot/vendor/gnu/gdb/bfd/libieee.h#3 edit
.. //depot/vendor/gnu/gdb/bfd/libnlm.h#4 edit
.. //depot/vendor/gnu/gdb/bfd/liboasys.h#3 edit
.. //depot/vendor/gnu/gdb/bfd/libpei.h#4 edit
.. //depot/vendor/gnu/gdb/bfd/libxcoff.h#3 edit
.. //depot/vendor/gnu/gdb/bfd/linker.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/lynx-core.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/m68k4knetbsd.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/m68klinux.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/m68klynx.c#3 delete
.. //depot/vendor/gnu/gdb/bfd/m68knetbsd.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/m88kmach3.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/m88kopenbsd.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/mach-o-target.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/mach-o.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/mach-o.h#3 edit
.. //depot/vendor/gnu/gdb/bfd/merge.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/mipsbsd.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/mmo.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/netbsd-core.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/netbsd.h#3 edit
.. //depot/vendor/gnu/gdb/bfd/newsos3.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/nlm-target.h#5 edit
.. //depot/vendor/gnu/gdb/bfd/nlm.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/nlm32-alpha.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/nlm32-i386.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/nlm32-ppc.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/nlm32-sparc.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/nlm32.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/nlm64.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/nlmcode.h#5 edit
.. //depot/vendor/gnu/gdb/bfd/nlmswap.h#2 edit
.. //depot/vendor/gnu/gdb/bfd/ns32k.h#2 edit
.. //depot/vendor/gnu/gdb/bfd/ns32knetbsd.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/oasys.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/opncls.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/osf-core.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/pc532-mach.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/pdp11.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/pe-arm.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/pe-i386.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/pe-mcore.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/pe-mips.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/pe-ppc.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/pe-sh.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/peXXigen.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/pef-traceback.h#2 edit
.. //depot/vendor/gnu/gdb/bfd/pef.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/pef.h#2 edit
.. //depot/vendor/gnu/gdb/bfd/pei-arm.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/pei-i386.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/pei-mcore.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/pei-mips.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/pei-ppc.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/pei-sh.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/peicode.h#5 edit
.. //depot/vendor/gnu/gdb/bfd/po/Make-in#3 edit
.. //depot/vendor/gnu/gdb/bfd/po/SRC-POTFILES.in#6 edit
.. //depot/vendor/gnu/gdb/bfd/po/bfd.pot#6 edit
.. //depot/vendor/gnu/gdb/bfd/po/da.gmo#3 edit
.. //depot/vendor/gnu/gdb/bfd/po/es.gmo#4 edit
.. //depot/vendor/gnu/gdb/bfd/po/es.po#3 edit
.. //depot/vendor/gnu/gdb/bfd/po/fr.gmo#4 edit
.. //depot/vendor/gnu/gdb/bfd/po/ja.gmo#3 edit
.. //depot/vendor/gnu/gdb/bfd/po/ro.gmo#3 edit
.. //depot/vendor/gnu/gdb/bfd/po/rw.gmo#1 add
.. //depot/vendor/gnu/gdb/bfd/po/rw.po#1 add
.. //depot/vendor/gnu/gdb/bfd/po/sv.gmo#4 edit
.. //depot/vendor/gnu/gdb/bfd/po/tr.gmo#4 edit
.. //depot/vendor/gnu/gdb/bfd/po/vi.gmo#1 add
.. //depot/vendor/gnu/gdb/bfd/po/vi.po#1 add
.. //depot/vendor/gnu/gdb/bfd/po/zh_CN.gmo#3 edit
.. //depot/vendor/gnu/gdb/bfd/ppcboot.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/ptrace-core.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/reloc.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/reloc16.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/riscix.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/rs6000-core.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/sco5-core.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/section.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/simple.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/som.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/som.h#5 edit
.. //depot/vendor/gnu/gdb/bfd/sparclinux.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/sparclynx.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/sparcnetbsd.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/srec.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/stab-syms.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/stabs.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/sunos.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/syms.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/sysdep.h#3 edit
.. //depot/vendor/gnu/gdb/bfd/targets.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/tekhex.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/ticoff.h#3 edit
.. //depot/vendor/gnu/gdb/bfd/trad-core.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/vax1knetbsd.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/vaxbsd.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/vaxnetbsd.c#2 edit
.. //depot/vendor/gnu/gdb/bfd/versados.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/version.h#6 edit
.. //depot/vendor/gnu/gdb/bfd/vms-gsd.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/vms-hdr.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/vms-misc.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/vms-tir.c#4 edit
.. //depot/vendor/gnu/gdb/bfd/vms.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/vms.h#4 edit
.. //depot/vendor/gnu/gdb/bfd/warning.m4#1 add
.. //depot/vendor/gnu/gdb/bfd/xcoff-target.h#4 edit
.. //depot/vendor/gnu/gdb/bfd/xcofflink.c#6 edit
.. //depot/vendor/gnu/gdb/bfd/xsym.c#5 edit
.. //depot/vendor/gnu/gdb/bfd/xsym.h#3 edit
.. //depot/vendor/gnu/gdb/bfd/xtensa-isa.c#3 edit
.. //depot/vendor/gnu/gdb/bfd/xtensa-modules.c#3 edit
.. //depot/vendor/gnu/gdb/config-ml.in#5 edit
.. //depot/vendor/gnu/gdb/config.guess#5 edit
.. //depot/vendor/gnu/gdb/config.if#4 delete
.. //depot/vendor/gnu/gdb/config.sub#5 edit
.. //depot/vendor/gnu/gdb/config/ChangeLog#6 edit
.. //depot/vendor/gnu/gdb/config/accross.m4#3 delete
.. //depot/vendor/gnu/gdb/config/acx.m4#5 edit
.. //depot/vendor/gnu/gdb/config/depstand.m4#1 add
.. //depot/vendor/gnu/gdb/config/enable.m4#1 add
.. //depot/vendor/gnu/gdb/config/gcc-lib-path.m4#2 delete
.. //depot/vendor/gnu/gdb/config/gxx-include-dir.m4#1 add
.. //depot/vendor/gnu/gdb/config/lead-dot.m4#1 add
.. //depot/vendor/gnu/gdb/config/mh-mingw32#2 delete
.. //depot/vendor/gnu/gdb/config/mt-gnu#2 edit
.. //depot/vendor/gnu/gdb/config/no-executables.m4#2 edit
.. //depot/vendor/gnu/gdb/config/tls.m4#1 add
.. //depot/vendor/gnu/gdb/config/warnings.m4#2 edit
.. //depot/vendor/gnu/gdb/configure#6 edit
.. //depot/vendor/gnu/gdb/configure.in#6 edit
.. //depot/vendor/gnu/gdb/djunpack.bat#6 edit
.. //depot/vendor/gnu/gdb/etc/Makefile.in#3 edit
.. //depot/vendor/gnu/gdb/etc/configure.info#4 edit
.. //depot/vendor/gnu/gdb/etc/standards.info#4 edit
.. //depot/vendor/gnu/gdb/etc/texi2pod.pl#2 edit
.. //depot/vendor/gnu/gdb/gdb/ChangeLog#6 edit
.. //depot/vendor/gnu/gdb/gdb/ChangeLog-2004#1 add
.. //depot/vendor/gnu/gdb/gdb/MAINTAINERS#6 edit
.. //depot/vendor/gnu/gdb/gdb/Makefile.in#6 edit
.. //depot/vendor/gnu/gdb/gdb/NEWS#6 edit
.. //depot/vendor/gnu/gdb/gdb/README#6 edit
.. //depot/vendor/gnu/gdb/gdb/TODO#3 delete
.. //depot/vendor/gnu/gdb/gdb/abug-rom.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/acconfig.h#6 delete
.. //depot/vendor/gnu/gdb/gdb/acinclude.m4#4 edit
.. //depot/vendor/gnu/gdb/gdb/aclocal.m4#4 edit
.. //depot/vendor/gnu/gdb/gdb/ada-exp.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/ada-lang.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/ada-lang.h#5 edit
.. //depot/vendor/gnu/gdb/gdb/ada-lex.c#1 add
.. //depot/vendor/gnu/gdb/gdb/ada-typeprint.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/ada-valprint.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/aix-thread.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/alpha-linux-nat.c#1 add
.. //depot/vendor/gnu/gdb/gdb/alpha-linux-tdep.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/alpha-mdebug-tdep.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/alpha-nat.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/alpha-osf1-tdep.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/alpha-tdep.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/alphabsd-nat.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/alphanbsd-tdep.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/amd64-linux-nat.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/amd64-linux-tdep.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/amd64-sol2-tdep.c#1 add
.. //depot/vendor/gnu/gdb/gdb/amd64-tdep.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/amd64-tdep.h#3 edit
.. //depot/vendor/gnu/gdb/gdb/amd64bsd-nat.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/amd64fbsd-nat.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/amd64fbsd-tdep.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/amd64obsd-tdep.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/annotate.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/arch-utils.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/arch-utils.h#6 edit
.. //depot/vendor/gnu/gdb/gdb/arm-linux-nat.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/arm-linux-tdep.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/arm-tdep.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/arm-tdep.h#4 edit
.. //depot/vendor/gnu/gdb/gdb/armnbsd-nat.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/armnbsd-tdep.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/auxv.c#2 edit
.. //depot/vendor/gnu/gdb/gdb/auxv.h#2 edit
.. //depot/vendor/gnu/gdb/gdb/avr-tdep.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/ax-gdb.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/ax-general.c#2 edit
.. //depot/vendor/gnu/gdb/gdb/bcache.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/bfd-target.c#2 edit
.. //depot/vendor/gnu/gdb/gdb/blockframe.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/breakpoint.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/breakpoint.h#5 edit
.. //depot/vendor/gnu/gdb/gdb/bsd-kvm.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/bsd-uthread.c#1 add
.. //depot/vendor/gnu/gdb/gdb/bsd-uthread.h#1 add
.. //depot/vendor/gnu/gdb/gdb/buildsym.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/c-exp.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/c-exp.y#6 edit
.. //depot/vendor/gnu/gdb/gdb/c-lang.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/c-lang.h#4 edit
.. //depot/vendor/gnu/gdb/gdb/c-typeprint.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/c-valprint.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/charset.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/cli-out.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/cli/cli-cmds.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/cli/cli-decode.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/cli/cli-decode.h#4 edit
.. //depot/vendor/gnu/gdb/gdb/cli/cli-dump.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/cli/cli-dump.h#2 edit
.. //depot/vendor/gnu/gdb/gdb/cli/cli-interp.c#2 edit
.. //depot/vendor/gnu/gdb/gdb/cli/cli-logging.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/cli/cli-script.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/cli/cli-setshow.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/coff-pe-read.c#2 edit
.. //depot/vendor/gnu/gdb/gdb/coff-solib.c#2 edit
.. //depot/vendor/gnu/gdb/gdb/coff-solib.h#3 edit
.. //depot/vendor/gnu/gdb/gdb/coffread.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/command.h#6 edit
.. //depot/vendor/gnu/gdb/gdb/complaints.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/completer.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/config.in#6 edit
.. //depot/vendor/gnu/gdb/gdb/config/alpha/alpha-linux.mh#5 edit
.. //depot/vendor/gnu/gdb/gdb/config/alpha/fbsd.mh#2 edit
.. //depot/vendor/gnu/gdb/gdb/config/alpha/nbsd.mh#2 edit
.. //depot/vendor/gnu/gdb/gdb/config/alpha/nm-fbsd.h#5 edit
.. //depot/vendor/gnu/gdb/gdb/config/alpha/nm-nbsd.h#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/alpha/tm-alpha.h#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/arm/linux.mh#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/arm/linux.mt#5 edit
.. //depot/vendor/gnu/gdb/gdb/config/arm/nbsdaout.mh#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/arm/nbsdelf.mh#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/arm/tm-embed.h#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/arm/tm-linux.h#5 edit
.. //depot/vendor/gnu/gdb/gdb/config/d10v/d10v.mt#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/djgpp/README#2 edit
.. //depot/vendor/gnu/gdb/gdb/config/djgpp/config.sed#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/djgpp/djconfig.sh#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/djgpp/fnchange.lst#6 edit
.. //depot/vendor/gnu/gdb/gdb/config/h8300/h8300.mt#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/h8300/tm-h8300.h#4 delete
.. //depot/vendor/gnu/gdb/gdb/config/i386/cygwin.mh#2 edit
.. //depot/vendor/gnu/gdb/gdb/config/i386/fbsd.mt#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/i386/fbsd64.mt#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/i386/go32.mh#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/i386/i386lynx.mh#3 delete
.. //depot/vendor/gnu/gdb/gdb/config/i386/i386lynx.mt#3 delete
.. //depot/vendor/gnu/gdb/gdb/config/i386/i386sol2.mh#5 edit
.. //depot/vendor/gnu/gdb/gdb/config/i386/linux.mh#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/i386/linux64.mh#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/i386/linux64.mt#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/i386/nbsd.mt#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/i386/nbsd64.mt#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/i386/nm-fbsd.h#5 edit
.. //depot/vendor/gnu/gdb/gdb/config/i386/nm-i386gnu.h#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/i386/nm-i386sol2.h#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/i386/nm-i386v4.h#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/i386/nm-i386v42mp.h#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/i386/nm-linux.h#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/i386/nm-linux64.h#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/i386/nm-obsd.h#5 delete
.. //depot/vendor/gnu/gdb/gdb/config/i386/nto.mt#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/i386/obsd.mh#5 edit
.. //depot/vendor/gnu/gdb/gdb/config/i386/obsd.mt#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/i386/obsd64.mt#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/i386/obsdaout.mh#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/i386/sol2-64.mh#1 add
.. //depot/vendor/gnu/gdb/gdb/config/i386/sol2-64.mt#1 add
.. //depot/vendor/gnu/gdb/gdb/config/i386/tm-cygwin.h#5 edit
.. //depot/vendor/gnu/gdb/gdb/config/i386/vxworks.mt#3 delete
.. //depot/vendor/gnu/gdb/gdb/config/i386/xm-cygwin.h#2 delete
.. //depot/vendor/gnu/gdb/gdb/config/i386/xm-go32.h#3 delete
.. //depot/vendor/gnu/gdb/gdb/config/ia64/aix.mh#3 delete
.. //depot/vendor/gnu/gdb/gdb/config/ia64/aix.mt#3 delete
.. //depot/vendor/gnu/gdb/gdb/config/ia64/ia64.mt#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/ia64/linux.mh#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/ia64/linux.mt#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/ia64/nm-aix.h#2 delete
.. //depot/vendor/gnu/gdb/gdb/config/ia64/nm-linux.h#5 edit
.. //depot/vendor/gnu/gdb/gdb/config/ia64/tm-aix.h#3 delete
.. //depot/vendor/gnu/gdb/gdb/config/ia64/tm-ia64.h#4 delete
.. //depot/vendor/gnu/gdb/gdb/config/ia64/tm-linux.h#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/iq2000/iq2000.mt#1 add
.. //depot/vendor/gnu/gdb/gdb/config/m32r/linux.mh#2 edit
.. //depot/vendor/gnu/gdb/gdb/config/m32r/linux.mt#2 edit
.. //depot/vendor/gnu/gdb/gdb/config/m68k/linux.mh#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/m68k/linux.mt#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/m68k/nbsdaout.mh#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/m68k/nbsdelf.mh#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/m68k/nm-nbsdaout.h#4 delete
.. //depot/vendor/gnu/gdb/gdb/config/m68k/obsd.mh#2 edit
.. //depot/vendor/gnu/gdb/gdb/config/m68k/obsd.mt#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/m68k/os68k.mt#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/m68k/tm-os68k.h#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/m68k/tm-vx68.h#5 delete
.. //depot/vendor/gnu/gdb/gdb/config/m68k/vxworks68.mt#3 delete
.. //depot/vendor/gnu/gdb/gdb/config/m88k/obsd.mh#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/mcore/mcore.mt#2 delete
.. //depot/vendor/gnu/gdb/gdb/config/mips/embed.mt#5 edit
.. //depot/vendor/gnu/gdb/gdb/config/mips/irix5.mt#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/mips/irix6.mt#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/mips/linux.mh#5 edit
.. //depot/vendor/gnu/gdb/gdb/config/mips/linux.mt#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/mips/nbsd.mh#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/mips/nm-irix5.h#5 edit
.. //depot/vendor/gnu/gdb/gdb/config/mips/obsd64.mh#1 add
.. //depot/vendor/gnu/gdb/gdb/config/mips/obsd64.mt#1 add
.. //depot/vendor/gnu/gdb/gdb/config/mips/tm-linux.h#5 edit
.. //depot/vendor/gnu/gdb/gdb/config/mips/tm-mips.h#6 delete
.. //depot/vendor/gnu/gdb/gdb/config/mips/tm-nbsd.h#5 edit
.. //depot/vendor/gnu/gdb/gdb/config/mips/tm-vxmips.h#3 delete
.. //depot/vendor/gnu/gdb/gdb/config/mips/tm-wince.h#2 edit
.. //depot/vendor/gnu/gdb/gdb/config/mips/vxmips.mt#3 delete
.. //depot/vendor/gnu/gdb/gdb/config/mn10300/linux.mt#1 add
.. //depot/vendor/gnu/gdb/gdb/config/mn10300/mn10300.mt#2 edit
.. //depot/vendor/gnu/gdb/gdb/config/ms1/ms1.mt#1 add
.. //depot/vendor/gnu/gdb/gdb/config/nm-bsd.h#3 delete
.. //depot/vendor/gnu/gdb/gdb/config/nm-gnu.h#4 delete
.. //depot/vendor/gnu/gdb/gdb/config/nm-linux.h#6 edit
.. //depot/vendor/gnu/gdb/gdb/config/nm-sysv4.h#4 delete
.. //depot/vendor/gnu/gdb/gdb/config/ns32k/nbsdaout.mh#3 delete
.. //depot/vendor/gnu/gdb/gdb/config/ns32k/nbsdaout.mt#4 delete
.. //depot/vendor/gnu/gdb/gdb/config/ns32k/nm-nbsd.h#3 delete
.. //depot/vendor/gnu/gdb/gdb/config/ns32k/nm-nbsdaout.h#2 delete
.. //depot/vendor/gnu/gdb/gdb/config/ns32k/tm-ns32k.h#3 delete
.. //depot/vendor/gnu/gdb/gdb/config/pa/hppa64.mt#5 edit
.. //depot/vendor/gnu/gdb/gdb/config/pa/hppahpux.mh#3 delete
.. //depot/vendor/gnu/gdb/gdb/config/pa/hppahpux.mt#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/pa/hpux.mh#1 add
.. //depot/vendor/gnu/gdb/gdb/config/pa/hpux1020.mh#3 delete
.. //depot/vendor/gnu/gdb/gdb/config/pa/hpux11.mh#3 delete
.. //depot/vendor/gnu/gdb/gdb/config/pa/hpux11w.mh#3 delete
.. //depot/vendor/gnu/gdb/gdb/config/pa/linux.mh#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/pa/linux.mt#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/pa/nm-hppah.h#6 delete
.. //depot/vendor/gnu/gdb/gdb/config/pa/nm-hppah11.h#2 delete
.. //depot/vendor/gnu/gdb/gdb/config/pa/obsd.mh#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/pa/obsd.mt#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/pa/tm-hppa.h#6 edit
.. //depot/vendor/gnu/gdb/gdb/config/pa/tm-hppah.h#5 edit
.. //depot/vendor/gnu/gdb/gdb/config/pa/tm-linux.h#2 edit
.. //depot/vendor/gnu/gdb/gdb/config/powerpc/linux.mh#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/powerpc/linux.mt#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/powerpc/obsd.mh#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/powerpc/obsd.mt#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/powerpc/ppc-eabi.mt#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/powerpc/ppc-sim.mt#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/powerpc/ppc64-linux.mh#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/powerpc/tm-linux.h#5 edit
.. //depot/vendor/gnu/gdb/gdb/config/powerpc/tm-vxworks.h#2 delete
.. //depot/vendor/gnu/gdb/gdb/config/powerpc/vxworks.mt#3 delete
.. //depot/vendor/gnu/gdb/gdb/config/rs6000/tm-rs6000ly.h#2 edit
.. //depot/vendor/gnu/gdb/gdb/config/s390/nm-linux.h#5 edit
.. //depot/vendor/gnu/gdb/gdb/config/s390/s390.mh#5 edit
.. //depot/vendor/gnu/gdb/gdb/config/sh/embed.mt#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/sh/linux.mt#5 edit
.. //depot/vendor/gnu/gdb/gdb/config/sh/sh64.mt#1 add
.. //depot/vendor/gnu/gdb/gdb/config/sh/tm-linux.h#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/sparc/fbsd.mh#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/sparc/fbsd.mt#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/sparc/linux.mh#5 edit
.. //depot/vendor/gnu/gdb/gdb/config/sparc/linux.mt#5 edit
.. //depot/vendor/gnu/gdb/gdb/config/sparc/linux64.mh#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/sparc/nbsd.mt#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/sparc/nbsd64.mh#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/sparc/nbsd64.mt#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/sparc/nbsdaout.mh#4 edit
.. //depot/vendor/gnu/gdb/gdb/config/sparc/nbsdelf.mh#5 edit
.. //depot/vendor/gnu/gdb/gdb/config/sparc/nm-fbsd.h#4 delete
.. //depot/vendor/gnu/gdb/gdb/config/sparc/nm-nbsd.h#4 delete
.. //depot/vendor/gnu/gdb/gdb/config/sparc/nm-nbsdaout.h#3 delete
.. //depot/vendor/gnu/gdb/gdb/config/sparc/obsd.mt#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/sparc/obsd64.mt#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/sparc/vxworks.mt#3 delete
.. //depot/vendor/gnu/gdb/gdb/config/tm-linux.h#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/tm-lynx.h#3 delete
.. //depot/vendor/gnu/gdb/gdb/config/tm-nto.h#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/tm-sysv4.h#3 delete
.. //depot/vendor/gnu/gdb/gdb/config/tm-vxworks.h#2 delete
.. //depot/vendor/gnu/gdb/gdb/config/vax/nbsdaout.mh#3 edit
.. //depot/vendor/gnu/gdb/gdb/config/vax/nm-nbsdaout.h#3 delete
.. //depot/vendor/gnu/gdb/gdb/config/vax/obsd.mt#1 add
.. //depot/vendor/gnu/gdb/gdb/config/vax/vax.mh#2 edit
.. //depot/vendor/gnu/gdb/gdb/configure#6 edit
.. //depot/vendor/gnu/gdb/gdb/configure.ac#1 add
.. //depot/vendor/gnu/gdb/gdb/configure.host#6 edit
.. //depot/vendor/gnu/gdb/gdb/configure.in#6 delete
.. //depot/vendor/gnu/gdb/gdb/configure.tgt#6 edit
.. //depot/vendor/gnu/gdb/gdb/copying.c#2 edit
.. //depot/vendor/gnu/gdb/gdb/core-aout.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/core-regset.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/corefile.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/corelow.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/cp-abi.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/cp-abi.h#3 edit
.. //depot/vendor/gnu/gdb/gdb/cp-name-parser.c#1 add
.. //depot/vendor/gnu/gdb/gdb/cp-name-parser.y#1 add
.. //depot/vendor/gnu/gdb/gdb/cp-namespace.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/cp-support.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/cp-support.h#4 edit
.. //depot/vendor/gnu/gdb/gdb/cp-valprint.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/cris-tdep.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/d10v-tdep.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/dbxread.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/dcache.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/dcache.h#2 edit
.. //depot/vendor/gnu/gdb/gdb/defs.h#6 edit
.. //depot/vendor/gnu/gdb/gdb/demangle.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/dictionary.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/disasm.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/doc/ChangeLog#6 edit
.. //depot/vendor/gnu/gdb/gdb/doc/GDBvn.texi#6 edit
.. //depot/vendor/gnu/gdb/gdb/doc/annotate.info#5 edit
.. //depot/vendor/gnu/gdb/gdb/doc/configure#2 edit
.. //depot/vendor/gnu/gdb/gdb/doc/configure.ac#1 add
.. //depot/vendor/gnu/gdb/gdb/doc/configure.in#2 delete
.. //depot/vendor/gnu/gdb/gdb/doc/gdb.info#6 edit
.. //depot/vendor/gnu/gdb/gdb/doc/gdb.info-1#6 edit
.. //depot/vendor/gnu/gdb/gdb/doc/gdb.info-2#6 edit
.. //depot/vendor/gnu/gdb/gdb/doc/gdb.info-3#6 edit
.. //depot/vendor/gnu/gdb/gdb/doc/gdb.info-4#4 edit
.. //depot/vendor/gnu/gdb/gdb/doc/gdb.texinfo#6 edit
.. //depot/vendor/gnu/gdb/gdb/doc/gdbint.info#6 edit
.. //depot/vendor/gnu/gdb/gdb/doc/gdbint.info-1#4 edit
.. //depot/vendor/gnu/gdb/gdb/doc/gdbint.info-2#4 edit
.. //depot/vendor/gnu/gdb/gdb/doc/gdbint.texinfo#6 edit
.. //depot/vendor/gnu/gdb/gdb/doc/observer.texi#4 edit
.. //depot/vendor/gnu/gdb/gdb/doc/stabs.info#6 edit
.. //depot/vendor/gnu/gdb/gdb/doublest.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/doublest.h#4 edit
.. //depot/vendor/gnu/gdb/gdb/dsrec.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/dummy-frame.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/dve3900-rom.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/dwarf2-frame.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/dwarf2-frame.h#3 edit
.. //depot/vendor/gnu/gdb/gdb/dwarf2expr.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/dwarf2expr.h#3 edit
.. //depot/vendor/gnu/gdb/gdb/dwarf2loc.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/dwarf2loc.h#3 edit
.. //depot/vendor/gnu/gdb/gdb/dwarf2read.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/dwarfread.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/elfread.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/environ.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/environ.h#2 edit
.. //depot/vendor/gnu/gdb/gdb/eval.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/event-loop.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/event-top.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/exceptions.c#1 add
.. //depot/vendor/gnu/gdb/gdb/exceptions.h#1 add
.. //depot/vendor/gnu/gdb/gdb/exec.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/exec.h#2 edit
.. //depot/vendor/gnu/gdb/gdb/expprint.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/expression.h#5 edit
.. //depot/vendor/gnu/gdb/gdb/f-exp.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/f-exp.y#5 edit
.. //depot/vendor/gnu/gdb/gdb/f-lang.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/f-lang.h#2 edit
.. //depot/vendor/gnu/gdb/gdb/f-typeprint.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/f-valprint.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/fbsd-nat.c#2 edit
.. //depot/vendor/gnu/gdb/gdb/findvar.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/fork-child.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/frame-unwind.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/frame-unwind.h#4 edit
.. //depot/vendor/gnu/gdb/gdb/frame.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/frame.h#6 edit
.. //depot/vendor/gnu/gdb/gdb/frv-linux-tdep.c#2 edit
.. //depot/vendor/gnu/gdb/gdb/frv-tdep.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/frv-tdep.h#2 edit
.. //depot/vendor/gnu/gdb/gdb/gcore.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/gdb-events.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/gdb-events.h#5 edit
.. //depot/vendor/gnu/gdb/gdb/gdb-events.sh#6 edit
.. //depot/vendor/gnu/gdb/gdb/gdb-stabs.h#3 edit
.. //depot/vendor/gnu/gdb/gdb/gdb.h#3 edit
.. //depot/vendor/gnu/gdb/gdb/gdb_assert.h#3 edit
.. //depot/vendor/gnu/gdb/gdb/gdb_curses.h#3 edit
.. //depot/vendor/gnu/gdb/gdb/gdb_gcore.sh#2 edit
.. //depot/vendor/gnu/gdb/gdb/gdb_ptrace.h#2 edit
.. //depot/vendor/gnu/gdb/gdb/gdb_string.h#2 edit
.. //depot/vendor/gnu/gdb/gdb/gdbarch.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/gdbarch.h#6 edit
.. //depot/vendor/gnu/gdb/gdb/gdbarch.sh#6 edit
.. //depot/vendor/gnu/gdb/gdb/gdbcmd.h#3 edit
.. //depot/vendor/gnu/gdb/gdb/gdbcore.h#5 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/ChangeLog#5 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/Makefile.in#5 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/acconfig.h#2 delete
.. //depot/vendor/gnu/gdb/gdb/gdbserver/acinclude.m4#2 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/aclocal.m4#2 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/config.in#3 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/configure#4 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/configure.ac#1 add
.. //depot/vendor/gnu/gdb/gdb/gdbserver/configure.in#4 delete
.. //depot/vendor/gnu/gdb/gdb/gdbserver/configure.srv#4 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/gdbreplay.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/i387-fp.c#2 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/inferiors.c#2 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/linux-arm-low.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/linux-cris-low.c#1 add
.. //depot/vendor/gnu/gdb/gdb/gdbserver/linux-crisv32-low.c#1 add
.. //depot/vendor/gnu/gdb/gdb/gdbserver/linux-i386-low.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/linux-ia64-low.c#2 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/linux-low.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/linux-low.h#3 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/linux-m32r-low.c#1 add
.. //depot/vendor/gnu/gdb/gdb/gdbserver/linux-m68k-low.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/linux-mips-low.c#2 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/linux-ppc-low.c#2 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/linux-ppc64-low.c#1 add
.. //depot/vendor/gnu/gdb/gdb/gdbserver/linux-s390-low.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/linux-sh-low.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/linux-x86-64-low.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/mem-break.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/mem-break.h#2 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/proc-service.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/regcache.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/remote-utils.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/server.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/server.h#4 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/target.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/target.h#4 edit
.. //depot/vendor/gnu/gdb/gdb/gdbserver/thread-db.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/gdbtypes.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/gdbtypes.h#6 edit
.. //depot/vendor/gnu/gdb/gdb/gnu-nat.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/gnu-v2-abi.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/gnu-v2-abi.h#1 add
.. //depot/vendor/gnu/gdb/gdb/gnu-v3-abi.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/go32-nat.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/h8300-tdep.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/hpacc-abi.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/hppa-hpux-nat.c#1 add
.. //depot/vendor/gnu/gdb/gdb/hppa-hpux-tdep.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/hppa-linux-nat.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/hppa-linux-tdep.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/hppa-tdep.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/hppa-tdep.h#3 edit
.. //depot/vendor/gnu/gdb/gdb/hppabsd-nat.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/hppabsd-tdep.c#2 edit
.. //depot/vendor/gnu/gdb/gdb/hppah-nat.c#6 delete
.. //depot/vendor/gnu/gdb/gdb/hpread.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/hpux-thread.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/i386-cygwin-tdep.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/i386-linux-nat.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/i386-linux-tdep.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/i386-nat.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/i386-nto-tdep.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/i386-sol2-nat.c#1 add
.. //depot/vendor/gnu/gdb/gdb/i386-tdep.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/i386-tdep.h#6 edit
.. //depot/vendor/gnu/gdb/gdb/i386bsd-nat.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/i386bsd-tdep.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/i386fbsd-nat.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/i386fbsd-tdep.c#2 edit
.. //depot/vendor/gnu/gdb/gdb/i386gnu-nat.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/i386ly-tdep.c#4 delete
.. //depot/vendor/gnu/gdb/gdb/i386nbsd-nat.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/i386nbsd-tdep.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/i386obsd-nat.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/i386obsd-tdep.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/i386v4-nat.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/i387-tdep.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/i387-tdep.h#5 edit
.. //depot/vendor/gnu/gdb/gdb/ia64-aix-nat.c#5 delete
.. //depot/vendor/gnu/gdb/gdb/ia64-aix-tdep.c#2 delete
.. //depot/vendor/gnu/gdb/gdb/ia64-linux-nat.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/ia64-linux-tdep.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/ia64-tdep.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/ia64-tdep.h#2 edit
.. //depot/vendor/gnu/gdb/gdb/inf-child.c#2 edit
.. //depot/vendor/gnu/gdb/gdb/inf-loop.c#2 edit
.. //depot/vendor/gnu/gdb/gdb/inf-ptrace.c#2 edit
.. //depot/vendor/gnu/gdb/gdb/inf-ptrace.h#2 edit
.. //depot/vendor/gnu/gdb/gdb/inf-ttrace.c#1 add
.. //depot/vendor/gnu/gdb/gdb/inf-ttrace.h#1 add
.. //depot/vendor/gnu/gdb/gdb/infcall.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/infcmd.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/inferior.h#6 edit
.. //depot/vendor/gnu/gdb/gdb/inflow.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/inflow.h#2 edit
.. //depot/vendor/gnu/gdb/gdb/infptrace.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/infrun.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/inftarg.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/infttrace.c#6 delete
.. //depot/vendor/gnu/gdb/gdb/infttrace.h#3 delete
.. //depot/vendor/gnu/gdb/gdb/interps.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/interps.h#3 edit
.. //depot/vendor/gnu/gdb/gdb/iq2000-tdep.c#1 add
.. //depot/vendor/gnu/gdb/gdb/irix5-nat.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/jv-exp.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/jv-lang.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/jv-lang.h#2 edit
.. //depot/vendor/gnu/gdb/gdb/jv-valprint.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/kod-cisco.c#2 edit
.. //depot/vendor/gnu/gdb/gdb/kod.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/language.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/language.h#6 edit
.. //depot/vendor/gnu/gdb/gdb/libunwind-frame.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/libunwind-frame.h#2 edit
.. //depot/vendor/gnu/gdb/gdb/linespec.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/linux-nat.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/linux-nat.h#4 edit
.. //depot/vendor/gnu/gdb/gdb/linux-thread-db.c#1 add
.. //depot/vendor/gnu/gdb/gdb/m2-exp.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/m2-lang.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/m2-lang.h#2 edit
.. //depot/vendor/gnu/gdb/gdb/m2-valprint.c#2 edit
.. //depot/vendor/gnu/gdb/gdb/m32r-linux-nat.c#2 edit
.. //depot/vendor/gnu/gdb/gdb/m32r-linux-tdep.c#2 edit
.. //depot/vendor/gnu/gdb/gdb/m32r-rom.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/m32r-tdep.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/m68hc11-tdep.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/m68k-tdep.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/m68kbsd-nat.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/m68kbsd-tdep.c#2 edit
.. //depot/vendor/gnu/gdb/gdb/m68klinux-nat.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/m68klinux-tdep.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/m88k-tdep.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/m88kbsd-nat.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/macrocmd.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/macroexp.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/macroscope.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/macrotab.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/main.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/main.h#3 edit
.. //depot/vendor/gnu/gdb/gdb/maint.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/mcore-rom.c#3 delete
.. //depot/vendor/gnu/gdb/gdb/mcore-tdep.c#6 delete
.. //depot/vendor/gnu/gdb/gdb/mdebugread.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/mdebugread.h#1 add
.. //depot/vendor/gnu/gdb/gdb/mem-break.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/memattr.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/mi/gdb-mi.el#2 edit
.. //depot/vendor/gnu/gdb/gdb/mi/mi-cmd-break.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/mi/mi-cmd-disas.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/mi/mi-cmd-env.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/mi/mi-cmd-file.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/mi/mi-cmd-stack.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/mi/mi-cmd-var.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/mi/mi-cmds.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/mi/mi-cmds.h#5 edit
.. //depot/vendor/gnu/gdb/gdb/mi/mi-common.c#1 add
.. //depot/vendor/gnu/gdb/gdb/mi/mi-common.h#1 add
.. //depot/vendor/gnu/gdb/gdb/mi/mi-console.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/mi/mi-getopt.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/mi/mi-interp.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/mi/mi-main.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/mi/mi-out.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/mi/mi-symbol-cmds.c#2 edit
.. //depot/vendor/gnu/gdb/gdb/mips-linux-nat.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/mips-linux-tdep.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/mips-mdebug-tdep.c#1 add
.. //depot/vendor/gnu/gdb/gdb/mips-mdebug-tdep.h#1 add
.. //depot/vendor/gnu/gdb/gdb/mips-tdep.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/mips-tdep.h#4 edit
.. //depot/vendor/gnu/gdb/gdb/mips64obsd-nat.c#1 add
.. //depot/vendor/gnu/gdb/gdb/mips64obsd-tdep.c#1 add
.. //depot/vendor/gnu/gdb/gdb/mipsnbsd-nat.c#3 edit
.. //depot/vendor/gnu/gdb/gdb/mipsnbsd-tdep.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/mipsread.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/mipsv4-nat.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/mn10300-linux-tdep.c#1 add
.. //depot/vendor/gnu/gdb/gdb/mn10300-tdep.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/mn10300-tdep.h#1 add
.. //depot/vendor/gnu/gdb/gdb/monitor.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/ms1-tdep.c#1 add
.. //depot/vendor/gnu/gdb/gdb/nlmread.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/ns32k-tdep.c#6 delete
.. //depot/vendor/gnu/gdb/gdb/ns32k-tdep.h#4 delete
.. //depot/vendor/gnu/gdb/gdb/ns32knbsd-nat.c#6 delete
.. //depot/vendor/gnu/gdb/gdb/ns32knbsd-tdep.c#3 delete
.. //depot/vendor/gnu/gdb/gdb/nto-procfs.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/nto-tdep.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/nto-tdep.h#2 edit
.. //depot/vendor/gnu/gdb/gdb/objc-exp.c#4 edit
.. //depot/vendor/gnu/gdb/gdb/objc-lang.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/objc-lang.h#3 edit
.. //depot/vendor/gnu/gdb/gdb/objfiles.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/objfiles.h#6 edit
.. //depot/vendor/gnu/gdb/gdb/observer.c#5 edit
.. //depot/vendor/gnu/gdb/gdb/observer.sh#3 edit
.. //depot/vendor/gnu/gdb/gdb/ocd.c#6 edit
.. //depot/vendor/gnu/gdb/gdb/osabi.c#5 edit

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Dec  5 05:18:46 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2E49C16A46E; Wed,  5 Dec 2007 05:18: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 E71DF16A419
	for ; Wed,  5 Dec 2007 05:18:45 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D12D213C461
	for ; Wed,  5 Dec 2007 05:18:45 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB55Ijjd026097
	for ; Wed, 5 Dec 2007 05:18:45 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB55IiqV026093
	for perforce@freebsd.org; Wed, 5 Dec 2007 05:18:44 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 5 Dec 2007 05:18:44 GMT
Message-Id: <200712050518.lB55IiqV026093@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130239 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 05 Dec 2007 05:18:46 -0000

http://perforce.freebsd.org/chv.cgi?CH=130239

Change 130239 by kmacy@entropy_kmacy_xen31 on 2007/12/05 05:18:09

	IFC #130230

Affected files ...

.. //depot/projects/xen31/Makefile.inc1#3 integrate
.. //depot/projects/xen31/contrib/bind9/lib/isc/arm/include/isc/atomic.h#2 integrate
.. //depot/projects/xen31/lib/csu/common/crtbrand.c#2 integrate
.. //depot/projects/xen31/lib/libarchive/archive_read_support_format_zip.c#2 integrate
.. //depot/projects/xen31/lib/libc/amd64/Makefile.inc#2 integrate
.. //depot/projects/xen31/lib/libc/gdtoa/_ldtoa.c#3 integrate
.. //depot/projects/xen31/lib/libc/gdtoa/machdep_ldisQ.c#2 integrate
.. //depot/projects/xen31/lib/libc/gdtoa/machdep_ldisx.c#2 integrate
.. //depot/projects/xen31/lib/libc/gen/closedir.c#3 integrate
.. //depot/projects/xen31/lib/libc/gen/readdir.c#2 integrate
.. //depot/projects/xen31/lib/libc/gen/seekdir.c#2 integrate
.. //depot/projects/xen31/lib/libc/gen/telldir.c#2 integrate
.. //depot/projects/xen31/lib/libc/i386/Makefile.inc#2 integrate
.. //depot/projects/xen31/lib/libc/ia64/Makefile.inc#2 integrate
.. //depot/projects/xen31/lib/libc/nameser/ns_parse.c#2 integrate
.. //depot/projects/xen31/lib/libc/resolv/res_data.c#2 integrate
.. //depot/projects/xen31/lib/libc/resolv/res_init.c#2 integrate
.. //depot/projects/xen31/lib/libc/sparc64/Makefile.inc#2 integrate
.. //depot/projects/xen31/lib/libpmc/pmc.3#3 integrate
.. //depot/projects/xen31/lib/libpmc/pmclog.c#2 integrate
.. //depot/projects/xen31/lib/libpmc/pmclog.h#2 integrate
.. //depot/projects/xen31/release/Makefile#4 integrate
.. //depot/projects/xen31/share/misc/iso3166#3 integrate
.. //depot/projects/xen31/share/zoneinfo/asia#3 integrate
.. //depot/projects/xen31/share/zoneinfo/northamerica#3 integrate
.. //depot/projects/xen31/share/zoneinfo/southamerica#2 integrate
.. //depot/projects/xen31/share/zoneinfo/zone.tab#2 integrate
.. //depot/projects/xen31/sys/amd64/amd64/pmap.c#5 integrate
.. //depot/projects/xen31/sys/amd64/amd64/trap.c#3 integrate
.. //depot/projects/xen31/sys/compat/freebsd32/freebsd32_misc.c#2 integrate
.. //depot/projects/xen31/sys/compat/ndis/subr_ndis.c#3 integrate
.. //depot/projects/xen31/sys/compat/ndis/subr_ntoskrnl.c#3 integrate
.. //depot/projects/xen31/sys/conf/NOTES#5 integrate
.. //depot/projects/xen31/sys/conf/files.pc98#4 integrate
.. //depot/projects/xen31/sys/dev/if_ndis/if_ndis.c#3 integrate
.. //depot/projects/xen31/sys/dev/if_ndis/if_ndis_pci.c#2 integrate
.. //depot/projects/xen31/sys/dev/if_ndis/if_ndisvar.h#2 integrate
.. //depot/projects/xen31/sys/dev/ipw/if_ipw.c#2 integrate
.. //depot/projects/xen31/sys/dev/re/if_re.c#4 integrate
.. //depot/projects/xen31/sys/dev/snp/snp.c#2 integrate
.. //depot/projects/xen31/sys/dev/sound/pcm/channel.c#2 integrate
.. //depot/projects/xen31/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate
.. //depot/projects/xen31/sys/i386/i386/pmap.c#5 integrate
.. //depot/projects/xen31/sys/i386/i386/trap.c#3 integrate
.. //depot/projects/xen31/sys/kern/imgact_elf.c#4 integrate
.. //depot/projects/xen31/sys/kern/init_main.c#5 integrate
.. //depot/projects/xen31/sys/kern/kern_conf.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_exec.c#5 integrate
.. //depot/projects/xen31/sys/kern/kern_mbuf.c#4 integrate
.. //depot/projects/xen31/sys/kern/kern_mib.c#2 integrate
.. //depot/projects/xen31/sys/kern/subr_stack.c#3 integrate
.. //depot/projects/xen31/sys/kern/vfs_mount.c#4 integrate
.. //depot/projects/xen31/sys/net/if_lagg.c#3 integrate
.. //depot/projects/xen31/sys/netinet/if_ether.c#3 integrate
.. //depot/projects/xen31/sys/netinet/sctp.h#2 integrate
.. //depot/projects/xen31/sys/netinet/sctp_output.c#3 integrate
.. //depot/projects/xen31/sys/netinet/sctp_structs.h#2 integrate
.. //depot/projects/xen31/sys/netinet/sctp_usrreq.c#3 integrate
.. //depot/projects/xen31/sys/netinet/sctputil.c#3 integrate
.. //depot/projects/xen31/sys/netinet/tcp_syncache.c#6 integrate
.. //depot/projects/xen31/sys/pc98/include/stack.h#1 branch
.. //depot/projects/xen31/sys/security/audit/audit.c#4 integrate
.. //depot/projects/xen31/sys/sys/param.h#6 integrate
.. //depot/projects/xen31/sys/sys/pmc.h#2 integrate
.. //depot/projects/xen31/sys/sys/pmclog.h#2 integrate
.. //depot/projects/xen31/sys/sys/proc.h#5 integrate
.. //depot/projects/xen31/sys/sys/systm.h#2 integrate
.. //depot/projects/xen31/tools/regression/lib/libc/stdio/test-printfloat.c#2 integrate
.. //depot/projects/xen31/tools/regression/lib/libc/stdio/test-scanfloat.c#2 integrate
.. //depot/projects/xen31/tools/tools/ath/athdebug/athdebug.c#2 integrate
.. //depot/projects/xen31/tools/tools/ath/athstats/athstats.c#2 integrate
.. //depot/projects/xen31/tools/tools/ath/athstats/athstats.h#2 integrate
.. //depot/projects/xen31/tools/tools/ath/athstats/main.c#2 integrate
.. //depot/projects/xen31/tools/tools/ath/athstats/statfoo.c#2 integrate
.. //depot/projects/xen31/tools/tools/ath/athstats/statfoo.h#2 integrate
.. //depot/projects/xen31/tools/tools/net80211/wlanstats/main.c#3 integrate
.. //depot/projects/xen31/tools/tools/net80211/wlanstats/statfoo.c#3 integrate
.. //depot/projects/xen31/tools/tools/net80211/wlanstats/statfoo.h#2 integrate
.. //depot/projects/xen31/tools/tools/net80211/wlanstats/wlanstats.c#3 integrate
.. //depot/projects/xen31/tools/tools/net80211/wlanstats/wlanstats.h#2 integrate
.. //depot/projects/xen31/tools/tools/net80211/wlanwatch/wlanwatch.c#2 integrate
.. //depot/projects/xen31/usr.bin/procstat/procstat_kstack.c#2 integrate
.. //depot/projects/xen31/usr.bin/procstat/procstat_threads.c#2 integrate
.. //depot/projects/xen31/usr.sbin/pmcstat/pmcstat_log.c#2 integrate
.. //depot/projects/xen31/usr.sbin/zic/zic.c#2 integrate

Differences ...

==== //depot/projects/xen31/Makefile.inc1#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.590 2007/10/31 09:26:42 yar Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.591 2007/12/04 12:55:27 yar Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -591,17 +591,25 @@
 #
 distributeworld installworld: installcheck
 	mkdir -p ${INSTALLTMP}
-	for prog in ${ITOOLS}; do \
+	progs=$$(for prog in ${ITOOLS}; do \
 		if progpath=`which $$prog`; then \
-			progs="$$progs $$progpath"; \
+			echo $$progpath; \
 		else \
 			echo "Required tool $$prog not found in PATH." >&2; \
 			exit 1; \
 		fi; \
-	done; \
-	cp $$progs ${INSTALLTMP}; \
-	cp `ldd -f "%p\n" -f "%p\n" $$progs 2>/dev/null | \
-	    sort -u` ${INSTALLTMP}
+	    done); \
+	libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | \
+	    while read line; do \
+		set -- $$line; \
+		if [ "$$2 $$3" != "not found" ]; then \
+			echo $$2; \
+		else \
+			echo "Required library $$1 not found." >&2; \
+			exit 1; \
+		fi; \
+	    done); \
+	cp $$libs $$progs ${INSTALLTMP}
 	cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale
 	${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
 	    ${IMAKEENV} rm -rf ${INSTALLTMP}

==== //depot/projects/xen31/contrib/bind9/lib/isc/arm/include/isc/atomic.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/contrib/bind9/lib/isc/arm/include/isc/atomic.h,v 1.1.1.1 2007/06/05 22:15:38 dougb Exp $
+ * $FreeBSD: src/contrib/bind9/lib/isc/arm/include/isc/atomic.h,v 1.1.1.2 2007/12/03 08:26:34 dougb Exp $
  */
 
 #ifndef ISC_ATOMIC_H
@@ -49,7 +49,29 @@
 static inline isc_int32_t
 isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val)
 {
-	return atomic_cmpset_int(p, cmpval, val);
+	register int done, ras_start;
+
+	__asm __volatile("1:\n"
+	    "adr	%1, 1b\n"
+	    "mov	%0, #0xe0000004\n"
+	    "str	%1, [%0]\n"
+	    "mov	%0, #0xe0000008\n"
+	    "adr	%1, 2f\n"
+	    "str	%1, [%0]\n"
+	    "ldr	%1, [%2]\n"
+	    "cmp	%1, %3\n"
+	    "streq	%4, [%2]\n"
+	    "2:\n"
+	    "mov	%3, #0\n"
+	    "mov	%0, #0xe0000004\n"
+	    "str	%3, [%0]\n"
+	    "mov	%3, #0xffffffff\n"
+	    "mov	%0, #0xe0000008\n"
+	    "str	%3, [%0]\n"
+	    : "=r" (ras_start), "=r" (done)
+	    ,"+r" (p), "+r" (cmpval), "+r" (val) : : "memory");
+	return (done);
+
 }
 #else /* !FreeBSD */
 

==== //depot/projects/xen31/lib/csu/common/crtbrand.c#2 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/csu/common/crtbrand.c,v 1.4 2003/10/17 15:43:13 peter Exp $");
+__FBSDID("$FreeBSD: src/lib/csu/common/crtbrand.c,v 1.6 2007/12/04 12:18:43 kib Exp $");
 
 #include 
 
@@ -43,7 +43,7 @@
     int32_t	type;
     char	name[sizeof ABI_VENDOR];
     int32_t	desc;
-} abitag __attribute__ ((section (ABI_SECTION), aligned(4))) __unused = {
+} abitag __attribute__ ((section (ABI_SECTION), aligned(4))) __used = {
     sizeof ABI_VENDOR,
     sizeof(int32_t),
     ABI_NOTETYPE,

==== //depot/projects/xen31/lib/libarchive/archive_read_support_format_zip.c#2 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.15 2007/10/12 04:08:28 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.16 2007/12/04 06:32:12 kientzle Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include 
@@ -336,7 +336,8 @@
 	zip->entry_offset = 0;
 
 	/* If there's no body, force read_data() to return EOF immediately. */
-	if (zip->entry_bytes_remaining < 1)
+	if (0 == (zip->flags & ZIP_LENGTH_AT_END)
+	    && zip->entry_bytes_remaining < 1)
 		zip->end_of_entry = 1;
 
 	/* Set up a more descriptive format name. */

==== //depot/projects/xen31/lib/libc/amd64/Makefile.inc#2 (text+ko) ====

@@ -1,9 +1,9 @@
-# $FreeBSD: src/lib/libc/amd64/Makefile.inc,v 1.5 2006/03/16 14:22:19 ru Exp $
+# $FreeBSD: src/lib/libc/amd64/Makefile.inc,v 1.6 2007/12/03 07:17:32 das Exp $
 #
 # Machine dependent definitions for the amd64 architecture.
 #
 
 # Long double is 80 bits
-GDTOASRCS+=strtopx.c
+GDTOASRCS+=strtorx.c
 MDSRCS+=machdep_ldisx.c
 SYM_MAPS+=${.CURDIR}/amd64/Symbol.map

==== //depot/projects/xen31/lib/libc/gdtoa/_ldtoa.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_ldtoa.c,v 1.3 2007/11/21 01:10:42 jb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_ldtoa.c,v 1.4 2007/12/03 07:17:32 das Exp $");
 
 #include 
 #include 
@@ -46,11 +46,11 @@
 __ldtoa(long double *ld, int mode, int ndigits, int *decpt, int *sign,
     char **rve)
 {
-	static FPI fpi = {
+	FPI fpi = {
 		LDBL_MANT_DIG,			/* nbits */
 		LDBL_MIN_EXP - LDBL_MANT_DIG,	/* emin */
 		LDBL_MAX_EXP - LDBL_MANT_DIG,	/* emax */
-		FPI_Round_near,	       		/* rounding */
+		FLT_ROUNDS,	       		/* rounding */
 #ifdef Sudden_Underflow	/* unused, but correct anyway */
 		1
 #else
@@ -64,7 +64,15 @@
 	void *vbits = bits;
 
 	u.e = *ld;
+
+	/*
+	 * gdtoa doesn't know anything about the sign of the number, so
+	 * if the number is negative, we need to swap rounding modes of
+	 * 2 (upwards) and 3 (downwards).
+	 */
 	*sign = u.bits.sign;
+	fpi.rounding ^= (fpi.rounding >> 1) & u.bits.sign;
+
 	be = u.bits.exp - (LDBL_MAX_EXP - 1) - (LDBL_MANT_DIG - 1);
 	LDBL_TO_ARRAY32(u, bits);
 

==== //depot/projects/xen31/lib/libc/gdtoa/machdep_ldisQ.c#2 (text+ko) ====

@@ -31,7 +31,9 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisQ.c,v 1.2 2003/04/09 05:58:43 das Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisQ.c,v 1.3 2007/12/03 07:17:32 das Exp $");
+
+#include 
 
 #include "gdtoaimp.h"
 
@@ -40,6 +42,6 @@
 {
 	long double result;
 
-	strtopQ(s, sp, &result);
+	strtorQ(s, sp, FLT_ROUNDS, &result);
 	return result;
 }

==== //depot/projects/xen31/lib/libc/gdtoa/machdep_ldisx.c#2 (text+ko) ====

@@ -31,7 +31,9 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisx.c,v 1.2 2003/04/09 05:58:43 das Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisx.c,v 1.3 2007/12/03 07:17:32 das Exp $");
+
+#include 
 
 #include "gdtoaimp.h"
 
@@ -40,6 +42,6 @@
 {
 	long double result;
 
-	strtopx(s, sp, &result);
+	strtorx(s, sp, FLT_ROUNDS, &result);
 	return result;
 }

==== //depot/projects/xen31/lib/libc/gen/closedir.c#3 (text+ko) ====

@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)closedir.c	8.1 (Berkeley) 6/10/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/gen/closedir.c,v 1.12 2007/11/19 21:57:28 cognet Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/closedir.c,v 1.13 2007/12/03 14:33:50 des Exp $");
 
 #include "namespace.h"
 #include 
@@ -54,7 +54,7 @@
 	int fd;
 
 	if (__isthreaded)
-		_pthread_mutex_lock((void *)&dirp->dd_lock);
+		_pthread_mutex_lock(&dirp->dd_lock);
 	_seekdir(dirp, dirp->dd_rewind);	/* free seekdir storage */
 	fd = dirp->dd_fd;
 	dirp->dd_fd = -1;
@@ -62,8 +62,8 @@
 	free((void *)dirp->dd_buf);
 	_reclaim_telldir(dirp);
 	if (__isthreaded) {
-		_pthread_mutex_unlock((void *)&dirp->dd_lock);
-		_pthread_mutex_destroy((void *)&dirp->dd_lock);
+		_pthread_mutex_unlock(&dirp->dd_lock);
+		_pthread_mutex_destroy(&dirp->dd_lock);
 	}
 	free((void *)dirp);
 	return(_close(fd));

==== //depot/projects/xen31/lib/libc/gen/readdir.c#2 (text+ko) ====

@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)readdir.c	8.3 (Berkeley) 9/29/94";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/gen/readdir.c,v 1.13 2007/01/09 00:27:55 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/readdir.c,v 1.14 2007/12/03 14:33:50 des Exp $");
 
 #include "namespace.h"
 #include 
@@ -87,9 +87,9 @@
 	struct dirent	*dp;
 
 	if (__isthreaded) {
-		_pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock);
+		_pthread_mutex_lock(&dirp->dd_lock);
 		dp = _readdir_unlocked(dirp);
-		_pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock);
+		_pthread_mutex_unlock(&dirp->dd_lock);
 	}
 	else
 		dp = _readdir_unlocked(dirp);
@@ -108,10 +108,10 @@
 	saved_errno = errno;
 	errno = 0;
 	if (__isthreaded) {
-		_pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock);
+		_pthread_mutex_lock(&dirp->dd_lock);
 		if ((dp = _readdir_unlocked(dirp)) != NULL)
 			memcpy(entry, dp, _GENERIC_DIRSIZ(dp));
-		_pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock);
+		_pthread_mutex_unlock(&dirp->dd_lock);
 	}
 	else if ((dp = _readdir_unlocked(dirp)) != NULL)
 		memcpy(entry, dp, _GENERIC_DIRSIZ(dp));

==== //depot/projects/xen31/lib/libc/gen/seekdir.c#2 (text+ko) ====

@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)seekdir.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/gen/seekdir.c,v 1.6 2007/01/09 00:27:55 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/seekdir.c,v 1.7 2007/12/03 14:33:51 des Exp $");
 
 #include "namespace.h"
 #include 
@@ -52,8 +52,8 @@
 	long loc;
 {
 	if (__isthreaded)
-		_pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock);
+		_pthread_mutex_lock(&dirp->dd_lock);
 	_seekdir(dirp, loc);
 	if (__isthreaded)
-		_pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock);
+		_pthread_mutex_unlock(&dirp->dd_lock);
 }

==== //depot/projects/xen31/lib/libc/gen/telldir.c#2 (text+ko) ====

@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)telldir.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/gen/telldir.c,v 1.9 2007/01/09 00:27:55 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/telldir.c,v 1.10 2007/12/03 14:33:51 des Exp $");
 
 #include "namespace.h"
 #include 
@@ -64,13 +64,13 @@
 	if ((lp = (struct ddloc *)malloc(sizeof(struct ddloc))) == NULL)
 		return (-1);
 	if (__isthreaded)
-		_pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock);
+		_pthread_mutex_lock(&dirp->dd_lock);
 	lp->loc_index = dirp->dd_td->td_loccnt++;
 	lp->loc_seek = dirp->dd_seek;
 	lp->loc_loc = dirp->dd_loc;
 	LIST_INSERT_HEAD(&dirp->dd_td->td_locq, lp, loc_lqe);
 	if (__isthreaded)
-		_pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock);
+		_pthread_mutex_unlock(&dirp->dd_lock);
 	return (lp->loc_index);
 }
 

==== //depot/projects/xen31/lib/libc/i386/Makefile.inc#2 (text+ko) ====

@@ -1,6 +1,6 @@
-# $FreeBSD: src/lib/libc/i386/Makefile.inc,v 1.2 2006/03/13 01:14:57 deischen Exp $
+# $FreeBSD: src/lib/libc/i386/Makefile.inc,v 1.3 2007/12/03 07:17:32 das Exp $
 
 # Long double is 80 bits
-GDTOASRCS+=strtopx.c
+GDTOASRCS+=strtorx.c
 MDSRCS+=machdep_ldisx.c
 SYM_MAPS+=${.CURDIR}/i386/Symbol.map

==== //depot/projects/xen31/lib/libc/ia64/Makefile.inc#2 (text+ko) ====

@@ -1,9 +1,9 @@
-# $FreeBSD: src/lib/libc/ia64/Makefile.inc,v 1.7 2006/03/16 14:27:17 ru Exp $
+# $FreeBSD: src/lib/libc/ia64/Makefile.inc,v 1.8 2007/12/03 07:17:32 das Exp $
 #
 # Machine dependent definitions for the ia64 architecture.
 #
 
 # Long double is 80 bits
-GDTOASRCS+=strtopx.c
+GDTOASRCS+=strtorx.c
 MDSRCS+=machdep_ldisx.c
 SYM_MAPS+=${.CURDIR}/ia64/Symbol.map

==== //depot/projects/xen31/lib/libc/nameser/ns_parse.c#2 (text) ====

@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_parse.c,v 1.5.18.3 2005/10/11 00:25:10 marka Exp $";
+static const char rcsid[] = "$Id: ns_parse.c,v 1.5.18.4 2007/08/27 03:34:24 marka Exp $";
 #endif
 
 /* Import. */
@@ -40,7 +40,7 @@
 
 /* Macros. */
 
-#ifndef SOLARIS2
+#if !defined(SOLARIS2) || defined(__COVERITY__)
 #define RETERR(err) do { errno = (err); return (-1); } while (0)
 #else
 #define RETERR(err) \

==== //depot/projects/xen31/lib/libc/resolv/res_data.c#2 (text) ====

@@ -16,10 +16,10 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: res_data.c,v 1.3.18.1 2005/04/27 05:01:10 sra Exp $";
+static const char rcsid[] = "$Id: res_data.c,v 1.3.18.2 2007/09/14 05:35:47 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/resolv/res_data.c,v 1.4 2007/06/03 17:20:27 ume Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/resolv/res_data.c,v 1.5 2007/12/03 15:13:44 ume Exp $");
 
 #include "port_before.h"
 

==== //depot/projects/xen31/lib/libc/resolv/res_init.c#2 (text) ====

@@ -66,10 +66,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
-static const char rcsid[] = "$Id: res_init.c,v 1.16.18.5 2006/08/30 23:23:13 marka Exp $";
+static const char rcsid[] = "$Id: res_init.c,v 1.16.18.7 2007/07/09 01:52:58 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/resolv/res_init.c,v 1.6 2007/06/03 17:20:27 ume Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/resolv/res_init.c,v 1.7 2007/12/03 15:13:44 ume Exp $");
 
 #include "port_before.h"
 
@@ -168,7 +168,9 @@
 #endif
 	int dots;
 	union res_sockaddr_union u[2];
+	int maxns = MAXNS;
 
+	RES_SET_H_ERRNO(statp, 0);
 	if (statp->_u._ext.ext != NULL)
 		res_ndestroy(statp);
 
@@ -218,8 +220,22 @@
 		statp->_u._ext.ext->nsaddrs[0].sin = statp->nsaddr;
 		strcpy(statp->_u._ext.ext->nsuffix, "ip6.arpa");
 		strcpy(statp->_u._ext.ext->nsuffix2, "ip6.int");
-	} else
-		return (-1);
+	} else {
+		/*
+		 * Historically res_init() rarely, if at all, failed.
+		 * Examples and applications exist which do not check
+		 * our return code.  Furthermore several applications
+		 * simply call us to get the systems domainname.  So
+		 * rather then immediately fail here we store the
+		 * failure, which is returned later, in h_errno.  And
+		 * prevent the collection of 'nameserver' information
+		 * by setting maxns to 0.  Thus applications that fail
+		 * to check our return code wont be able to make
+		 * queries anyhow.
+		 */
+		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
+		maxns = 0;
+	}
 #ifdef RESOLVSORT
 	statp->nsort = 0;
 #endif
@@ -240,9 +256,9 @@
 				buf[0] = '.';
 			cp = strchr(buf, '.');
 			cp = (cp == NULL) ? buf : (cp + 1);
-			if (strlen(cp) >= sizeof(statp->defdname))
-				goto freedata; 
-			strcpy(statp->defdname, cp);
+			strncpy(statp->defdname, cp,
+				sizeof(statp->defdname) - 1);
+			statp->defdname[sizeof(statp->defdname) - 1] = '\0';
 		}
 	}
 #endif	/* SOLARIS2 */
@@ -348,7 +364,7 @@
 		    continue;
 		}
 		/* read nameservers to query */
-		if (MATCH(buf, "nameserver") && nserv < MAXNS) {
+		if (MATCH(buf, "nameserver") && nserv < maxns) {
 		    struct addrinfo hints, *ai;
 		    char sbuf[NI_MAXSERV];
 		    const size_t minsiz =
@@ -541,16 +557,7 @@
 	else if ((cp = getenv("RES_OPTIONS")) != NULL)
 		res_setoptions(statp, cp, "env");
 	statp->options |= RES_INIT;
-	return (0);
-
-#ifdef	SOLARIS2
- freedata:
-	if (statp->_u._ext.ext != NULL) {
-		free(statp->_u._ext.ext);
-		statp->_u._ext.ext = NULL;
-	}
-	return (-1);
-#endif
+	return (statp->res_h_errno);
 }
 
 static void

==== //depot/projects/xen31/lib/libc/sparc64/Makefile.inc#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/sparc64/Makefile.inc,v 1.6 2006/03/16 14:22:19 ru Exp $
+# $FreeBSD: src/lib/libc/sparc64/Makefile.inc,v 1.7 2007/12/03 07:17:33 das Exp $
 #
 # Machine dependent definitions for the ultra sparc architecture.
 #
@@ -6,6 +6,6 @@
 .include "fpu/Makefile.inc"
 
 # Long double is quad precision
-GDTOASRCS+=strtopQ.c
+GDTOASRCS+=strtorQ.c
 MDSRCS+=machdep_ldisQ.c
 SYM_MAPS+=${.CURDIR}/sparc64/Symbol.map

==== //depot/projects/xen31/lib/libpmc/pmc.3#3 (text+ko) ====

@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.14 2007/11/25 06:50:31 jkoshy Exp $
+.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.15 2007/12/03 10:59:23 jkoshy Exp $
 .\"
 .Dd November 25, 2007
 .Os
@@ -393,10 +393,8 @@
 Event specifiers are strings comprising of an event name, followed by
 optional parameters modifying the semantics of the hardware event
 being probed.
-Event names are PMC architecture dependent, but the
-.Xr hwpmc 4
-library defines machine independent aliases for commonly used
-events.
+Event names are PMC architecture dependent, but the PMC library defines
+machine independent aliases for commonly used events.
 .Ss Event Name Aliases
 Event name aliases are CPU architecture independent names for commonly
 used events.

==== //depot/projects/xen31/lib/libpmc/pmclog.c#2 (text+ko) ====

@@ -1,7 +1,11 @@
 /*-
- * Copyright (c) 2005-2006 Joseph Koshy
+ * Copyright (c) 2005-2007 Joseph Koshy
+ * Copyright (c) 2007 The FreeBSD Foundation
  * All rights reserved.
  *
+ * Portions of this software were developed by A. Joseph Koshy under
+ * sponsorship from the FreeBSD Foundation and Google, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -25,7 +29,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libpmc/pmclog.c,v 1.4 2006/03/26 12:20:53 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/lib/libpmc/pmclog.c,v 1.5 2007/12/03 11:15:46 jkoshy Exp $");
 
 #include 
 #include 
@@ -270,7 +274,7 @@
     struct pmclog_ev *ev)
 {
 	int evlen, pathlen;
-	uint32_t h, *le;
+	uint32_t h, *le, npc;
 	enum pmclog_parser_state e;
 	struct pmclog_parse_state *ps;
 
@@ -310,7 +314,22 @@
 			goto error;					\
 	} while (0)
 
+#define	PMCLOG_GET_CALLCHAIN_SIZE(SZ,E) do {				\
+		(SZ) = ((E) - offsetof(struct pmclog_callchain, pl_pc))	\
+			/ sizeof(uintfptr_t);				\
+	} while (0);
+
 	switch (ev->pl_type = PMCLOG_HEADER_TO_TYPE(h)) {
+	case PMCLOG_TYPE_CALLCHAIN:
+		PMCLOG_READ32(le,ev->pl_u.pl_cc.pl_pid);
+		PMCLOG_READ32(le,ev->pl_u.pl_cc.pl_pmcid);
+		PMCLOG_READ32(le,ev->pl_u.pl_cc.pl_cpuflags);
+		PMCLOG_GET_CALLCHAIN_SIZE(ev->pl_u.pl_cc.pl_npc,evlen);
+		for (npc = 0; npc < ev->pl_u.pl_cc.pl_npc; npc++)
+			PMCLOG_READADDR(le,ev->pl_u.pl_cc.pl_pc[npc]);
+		for (;npc < PMC_CALLCHAIN_DEPTH_MAX; npc++)
+			ev->pl_u.pl_cc.pl_pc[npc] = (uintfptr_t) 0;
+		break;
 	case PMCLOG_TYPE_CLOSELOG:
 	case PMCLOG_TYPE_DROPNOTIFY:
 		/* nothing to do */
@@ -387,7 +406,7 @@
 	default:	/* unknown record type */
 		ps->ps_state = PL_STATE_ERROR;
 		ev->pl_state = PMCLOG_ERROR;
-		return -1;
+		return (-1);
 	}
 
 	ev->pl_offset = (ps->ps_offset += evlen);

==== //depot/projects/xen31/lib/libpmc/pmclog.h#2 (text+ko) ====

@@ -1,7 +1,11 @@
 /*-
- * Copyright (c) 2005-2006 Joseph Koshy
+ * Copyright (c) 2005-2007 Joseph Koshy
+ * Copyright (c) 2007 The FreeBSD Foundation
  * All rights reserved.
  *
+ * Portions of this software were developed by A. Joseph Koshy under
+ * sponsorship from the FreeBSD Foundation and Google, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -23,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libpmc/pmclog.h,v 1.3 2006/03/26 12:20:53 jkoshy Exp $
+ * $FreeBSD: src/lib/libpmc/pmclog.h,v 1.4 2007/12/03 11:15:46 jkoshy Exp $
  */
 
 #ifndef	_PMCLOG_H_
@@ -38,6 +42,14 @@
 	PMCLOG_ERROR
 };
 
+struct pmclog_ev_callchain {
+	uint32_t	pl_pid;
+	uint32_t	pl_pmcid;
+	uint32_t	pl_cpuflags;
+	uint32_t	pl_npc;
+	uintfptr_t	pl_pc[PMC_CALLCHAIN_DEPTH_MAX];
+};
+
 struct pmclog_ev_dropnotify {
 };
 
@@ -125,6 +137,7 @@
 	struct timespec   pl_ts;	/* log entry timestamp */
 	enum pmclog_type  pl_type;	/* type of log entry */
 	union { 			/* log entry data */
+		struct pmclog_ev_callchain	pl_cc;
 		struct pmclog_ev_closelog	pl_cl;
 		struct pmclog_ev_dropnotify	pl_dn;
 		struct pmclog_ev_initialize	pl_i;

==== //depot/projects/xen31/release/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.928 2007/11/22 20:06:50 simon Exp $
+# $FreeBSD: src/release/Makefile,v 1.929 2007/12/04 02:22:35 kensmith Exp $
 #
 # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
 #     [RELEASETAG=tag]
@@ -618,7 +618,7 @@
 	rm -rf ${j}_crunch
 	mkdir ${j}_crunch
 	cd ${j}_crunch; ${WMAKEENV} MAKEFLAGS="-m ${.CURDIR}/../share/mk" \
-	    crunchgen -o \
+	    NO_WERROR= crunchgen -o \
 	    ${.CURDIR}/${TARGET}/${j}_crunch.conf
 	cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk subclean
 	cd ${.CURDIR}/..; ${BINMAKE} -f Makefile.inc1 _build-tools

==== //depot/projects/xen31/share/misc/iso3166#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/misc/iso3166,v 1.16 2007/11/28 11:03:06 keramida Exp $
+# $FreeBSD: src/share/misc/iso3166,v 1.17 2007/12/04 00:20:57 edwin Exp $
 #
 # ISO 3166 country codes
 # This includes many places that are not legally independent countries,
@@ -199,8 +199,10 @@
 RO	ROU	642	Romania
 RU	RUS	643	Russian Federation
 RW	RWA	646	Rwanda
+BL	BLM	652	Saint Barthelemy
 KN	KNA	659	Saint Kitts and Nevis
 LC	LCA	662	Saint Lucia
+MF	MAF	663	Saint Martin (French part)
 VC	VCT	670	Saint Vincent and the Grenadines
 WS	WSM	882	Samoa
 SM	SMR	674	San Marino
@@ -513,3 +515,6 @@
 #
 # Newsletter V-12 2006-09-26
 #  Removed SERBIA AND MONTENEGRO (CS).  Added SERBIA (RS) and MONTENEGRO (ME).
+#
+# Newsletter VI-1 2007-09-21
+#  Added SAINT BARTHELEMY (BL) and SAINT MARTIN (MF).

==== //depot/projects/xen31/share/zoneinfo/asia#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)asia	8.13
+# @(#)asia	8.14
 # 
 
 # This data is by no means authoritative; if you think you know better,
@@ -577,6 +577,15 @@
 # daylight saving time ...
 # http://uk.reuters.com/article/oilRpt/idUKBLA65048420070916
 #
+# From Roozbeh Pournader (2007-11-05):
+# This is quoted from Official Gazette of the Islamic Republic of
+# Iran, Volume 63, Number 18242, dated Tuesday 1386/6/24
+# [2007-10-16]. I am doing the best translation I can:...
+# The official time of the country will be moved forward for one hour
+# on the 24 hours of the first day of the month of Farvardin and will
+# be changed back to its previous state on the 24 hours of the
+# thirtieth day of Shahrivar.
+#
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Iran	1978	1980	-	Mar	21	0:00	1:00	D
 Rule	Iran	1978	only	-	Oct	21	0:00	0	S

==== //depot/projects/xen31/share/zoneinfo/northamerica#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)northamerica	8.19
+# @(#)northamerica	8.20
 # 
 
 # also includes Central America and the Caribbean
@@ -2303,6 +2303,10 @@
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Guadeloupe	-4:06:08 -	LMT	1911 Jun 8	# Pointe a Pitre
 			-4:00	-	AST
+# St Barthelemy
+Link America/Guadeloupe	America/St_Barthelemy
+# St Martin (French part)
+Link America/Guadeloupe	America/Marigot
 
 # Guatemala
 #

==== //depot/projects/xen31/share/zoneinfo/southamerica#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)southamerica	8.12
+# @(#)southamerica	8.13
 # 
 
 # This data is by no means authoritative; if you think you know better,
@@ -1107,19 +1107,17 @@
 
 # Venezuela
 #
-# From Kiraz Janicke (2007-09-25), in
-# http://www.venezuelanalysis.com/analysis/2645:
-# The proposal ... involves turning the clock back half an hour from
-# +4.00 Greenwich Mean Time (GMT), to +4.30GMT, the time zone
-# Venezuela had until December 31, 1964, when the current time zone
-# was adopted. The change was due to take place on September 17 and
-# then on September 24, but has since been postponed until December
-# 31, to allow for compliance with international organizations, such
-# as the International Office of Weights and Measures.
+# From John Stainforth (2007-11-28):
+# ... the change for Venezuela originally expected for 2007-12-31 has
+# been brought forward to 2007-12-09.  The official announcement was
+# published today in the "Gaceta Oficial de la Republica Bolivariana
+# de Venezuela, numero 38.819" (official document for all laws or
+# resolution publication)
+# http://www.globovision.com/news.php?nid=72208
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Caracas	-4:27:44 -	LMT	1890
 			-4:27:40 -	CMT	1912 Feb 12 # Caracas Mean Time?
 			-4:30	-	VET	1965	     # Venezuela Time
-			-4:00	-	VET	2008
+			-4:00	-	VET	2007 Dec  9 03:00
 			-4:30	-	VET

==== //depot/projects/xen31/share/zoneinfo/zone.tab#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)zone.tab	8.11
+# @(#)zone.tab	8.12
 #
 # TZ zone descriptions
 #
@@ -77,6 +77,7 @@
 BH	+2623+05035	Asia/Bahrain
 BI	-0323+02922	Africa/Bujumbura
 BJ	+0629+00237	Africa/Porto-Novo
+BL	+1753-06251	America/St_Barthelemy
 BM	+3217-06446	Atlantic/Bermuda
 BN	+0456+11455	Asia/Brunei
 BO	-1630-06809	America/La_Paz
@@ -250,6 +251,7 @@
 MC	+4342+00723	Europe/Monaco
 MD	+4700+02850	Europe/Chisinau
 ME	+4226+01916	Europe/Podgorica
+MF	+1804-06305	America/Marigot
 MG	-1855+04731	Indian/Antananarivo
 MH	+0709+17112	Pacific/Majuro	most locations
 MH	+0905+16720	Pacific/Kwajalein	Kwajalein

==== //depot/projects/xen31/sys/amd64/amd64/pmap.c#5 (text+ko) ====

@@ -77,7 +77,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.596 2007/11/30 07:14:42 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.597 2007/12/04 08:17:04 alc Exp $");
 
 /*
  *	Manages physical address maps.
@@ -1430,9 +1430,9 @@
 	 * This supports switching from a 2MB page to a
 	 * normal 4K page.
 	 */
-	if (pd != 0 && (*pd & (PG_PS | PG_V)) == (PG_PS | PG_V)) {
+	if (pd != NULL && (*pd & (PG_PS | PG_V)) == (PG_PS | PG_V)) {
 		*pd = 0;
-		pd = 0;
+		pd = NULL;
 		pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE;
 		free = NULL;
 		pmap_unuse_pt(pmap, va, *pmap_pdpe(pmap, va), &free);
@@ -1444,7 +1444,7 @@
 	 * If the page table page is mapped, we just increment the
 	 * hold count, and activate it.
 	 */
-	if (pd != 0 && (*pd & PG_V) != 0) {
+	if (pd != NULL && (*pd & PG_V) != 0) {
 		m = PHYS_TO_VM_PAGE(*pd & PG_FRAME);
 		m->wire_count++;
 	} else {

==== //depot/projects/xen31/sys/amd64/amd64/trap.c#3 (text+ko) ====

@@ -38,7 +38,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.322 2007/11/15 22:00:57 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.323 2007/12/04 12:33:03 kib Exp $");
 
 /*
  * AMD64 Trap and System call handling
@@ -144,6 +144,9 @@
 static int panic_on_nmi = 1;
 SYSCTL_INT(_machdep, OID_AUTO, panic_on_nmi, CTLFLAG_RW,
 	&panic_on_nmi, 0, "Panic on NMI");
+static int prot_fault_translation = 0;
+SYSCTL_INT(_machdep, OID_AUTO, prot_fault_translation, CTLFLAG_RW,
+	&prot_fault_translation, 0, "Select signal to deliver on protection fault");
 
 extern char *syscallnames[];
 
@@ -312,8 +315,32 @@
 			if (i == SIGSEGV)
 				ucode = SEGV_MAPERR;
 			else {
-				i = SIGSEGV; /* XXX hack */
-				ucode = SEGV_ACCERR;
+				if (prot_fault_translation == 0) {
+					/*
+					 * Autodetect.
+					 * This check also covers the images
+					 * without the ABI-tag ELF note.
+					 */
+					if (p->p_osrel >= 700004) {
+						i = SIGSEGV;
+						ucode = SEGV_ACCERR;
+					} else {
+						i = SIGBUS;
+						ucode = BUS_PAGE_FAULT;
+					}
+				} else if (prot_fault_translation == 1) {
+					/*
+					 * Always compat mode.
+					 */
+					i = SIGBUS;
+					ucode = BUS_PAGE_FAULT;
+				} else {
+					/*
+					 * Always SIGSEGV mode.
+					 */
+					i = SIGSEGV;
+					ucode = SEGV_ACCERR;
+				}
 			}
 			break;
 

==== //depot/projects/xen31/sys/compat/freebsd32/freebsd32_misc.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Dec  5 05:21:52 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 566EF16A419; Wed,  5 Dec 2007 05:21: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 E683516A417
	for ; Wed,  5 Dec 2007 05:21:51 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D050113C467
	for ; Wed,  5 Dec 2007 05:21:51 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB55Lp99026838
	for ; Wed, 5 Dec 2007 05:21:51 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB55LnGi026818
	for perforce@freebsd.org; Wed, 5 Dec 2007 05:21:49 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 5 Dec 2007 05:21:49 GMT
Message-Id: <200712050521.lB55LnGi026818@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130240 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 05 Dec 2007 05:21:52 -0000

http://perforce.freebsd.org/chv.cgi?CH=130240

Change 130240 by jb@jb_freebsd1 on 2007/12/05 05:21:47

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#51 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/faq/book.sgml#6 integrate
.. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/mail/chapter.sgml#4 integrate
.. //depot/projects/dtrace/ports/MOVED#52 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.ruby.mk#9 integrate
.. //depot/projects/dtrace/src/Makefile.inc1#33 integrate
.. //depot/projects/dtrace/src/contrib/bind9/lib/isc/arm/include/isc/atomic.h#2 integrate
.. //depot/projects/dtrace/src/lib/csu/common/crtbrand.c#4 integrate
.. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_zip.c#8 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/Makefile.inc#4 integrate
.. //depot/projects/dtrace/src/lib/libc/gdtoa/_ldtoa.c#5 integrate
.. //depot/projects/dtrace/src/lib/libc/gdtoa/machdep_ldisQ.c#4 integrate
.. //depot/projects/dtrace/src/lib/libc/gdtoa/machdep_ldisx.c#4 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/closedir.c#6 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/readdir.c#5 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/seekdir.c#5 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/telldir.c#5 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/Makefile.inc#4 integrate
.. //depot/projects/dtrace/src/lib/libc/ia64/Makefile.inc#4 integrate
.. //depot/projects/dtrace/src/lib/libc/nameser/ns_parse.c#4 integrate
.. //depot/projects/dtrace/src/lib/libc/resolv/res_data.c#4 integrate
.. //depot/projects/dtrace/src/lib/libc/resolv/res_init.c#6 integrate
.. //depot/projects/dtrace/src/lib/libc/sparc64/Makefile.inc#4 integrate
.. //depot/projects/dtrace/src/lib/libpmc/pmc.3#6 integrate
.. //depot/projects/dtrace/src/lib/libpmc/pmclog.c#4 integrate
.. //depot/projects/dtrace/src/lib/libpmc/pmclog.h#4 integrate
.. //depot/projects/dtrace/src/release/Makefile#16 integrate
.. //depot/projects/dtrace/src/share/misc/iso3166#6 integrate
.. //depot/projects/dtrace/src/share/zoneinfo/asia#9 integrate
.. //depot/projects/dtrace/src/share/zoneinfo/northamerica#8 integrate
.. //depot/projects/dtrace/src/share/zoneinfo/southamerica#8 integrate
.. //depot/projects/dtrace/src/share/zoneinfo/zone.tab#7 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#26 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/trap.c#17 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_misc.c#11 integrate
.. //depot/projects/dtrace/src/sys/compat/ndis/subr_ndis.c#6 integrate
.. //depot/projects/dtrace/src/sys/compat/ndis/subr_ntoskrnl.c#9 integrate
.. //depot/projects/dtrace/src/sys/conf/NOTES#34 integrate
.. //depot/projects/dtrace/src/sys/conf/files.pc98#17 integrate
.. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndis.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndis_pci.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndisvar.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/ipw/if_ipw.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/re/if_re.c#12 integrate
.. //depot/projects/dtrace/src/sys/dev/snp/snp.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/sound/pcm/channel.c#8 integrate
.. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#22 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/trap.c#20 integrate
.. //depot/projects/dtrace/src/sys/kern/imgact_elf.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/init_main.c#22 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_conf.c#8 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_exec.c#19 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_mbuf.c#11 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_mib.c#6 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_stack.c#6 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#20 integrate
.. //depot/projects/dtrace/src/sys/net/if_lagg.c#5 integrate
.. //depot/projects/dtrace/src/sys/netinet/if_ether.c#12 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp.h#3 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_output.c#10 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_structs.h#7 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_usrreq.c#11 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctputil.c#14 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_syncache.c#13 integrate
.. //depot/projects/dtrace/src/sys/pc98/include/stack.h#1 branch
.. //depot/projects/dtrace/src/sys/security/audit/audit.c#12 integrate
.. //depot/projects/dtrace/src/sys/sys/param.h#26 integrate
.. //depot/projects/dtrace/src/sys/sys/pmc.h#4 integrate
.. //depot/projects/dtrace/src/sys/sys/pmclog.h#4 integrate
.. //depot/projects/dtrace/src/sys/sys/proc.h#27 integrate
.. //depot/projects/dtrace/src/sys/sys/systm.h#15 integrate
.. //depot/projects/dtrace/src/tools/regression/lib/libc/stdio/test-printfloat.c#4 integrate
.. //depot/projects/dtrace/src/tools/regression/lib/libc/stdio/test-scanfloat.c#5 integrate
.. //depot/projects/dtrace/src/tools/tools/ath/athdebug/athdebug.c#4 integrate
.. //depot/projects/dtrace/src/tools/tools/ath/athstats/athstats.c#6 integrate
.. //depot/projects/dtrace/src/tools/tools/ath/athstats/athstats.h#3 integrate
.. //depot/projects/dtrace/src/tools/tools/ath/athstats/main.c#3 integrate
.. //depot/projects/dtrace/src/tools/tools/ath/athstats/statfoo.c#3 integrate
.. //depot/projects/dtrace/src/tools/tools/ath/athstats/statfoo.h#3 integrate
.. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/main.c#4 integrate
.. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/statfoo.c#4 integrate
.. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/statfoo.h#3 integrate
.. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/wlanstats.c#7 integrate
.. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/wlanstats.h#3 integrate
.. //depot/projects/dtrace/src/tools/tools/net80211/wlanwatch/wlanwatch.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/Makefile#12 integrate
.. //depot/projects/dtrace/src/usr.bin/procstat/Makefile#1 branch
.. //depot/projects/dtrace/src/usr.bin/procstat/procstat.1#1 branch
.. //depot/projects/dtrace/src/usr.bin/procstat/procstat.c#1 branch
.. //depot/projects/dtrace/src/usr.bin/procstat/procstat.h#1 branch
.. //depot/projects/dtrace/src/usr.bin/procstat/procstat_args.c#1 branch
.. //depot/projects/dtrace/src/usr.bin/procstat/procstat_basic.c#1 branch
.. //depot/projects/dtrace/src/usr.bin/procstat/procstat_bin.c#1 branch
.. //depot/projects/dtrace/src/usr.bin/procstat/procstat_cred.c#1 branch
.. //depot/projects/dtrace/src/usr.bin/procstat/procstat_files.c#1 branch
.. //depot/projects/dtrace/src/usr.bin/procstat/procstat_kstack.c#1 branch
.. //depot/projects/dtrace/src/usr.bin/procstat/procstat_threads.c#1 branch
.. //depot/projects/dtrace/src/usr.bin/procstat/procstat_vm.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/pmcstat/pmcstat_log.c#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/zic/zic.c#4 integrate
.. //depot/projects/dtrace/www/en/platforms/amd64/motherboards.sgml#20 integrate
.. //depot/projects/dtrace/www/share/sgml/release.ent#16 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#51 (text+ko) ====

@@ -1,4 +1,4 @@
-
+
 
 
 
@@ -30,127 +30,120 @@
     ·§­z
     email
 
-    Electronic Mail, better known as email, is one of the
-      most widely used forms of communication today.  This chapter provides
-      a basic introduction to running a mail server on &os;, as well as an
-      introduction to sending and receiving email using &os;; however,
-      it is not a complete reference and in fact many important
-      considerations are omitted.  For more complete coverage of the
-      subject, the reader is referred to the many excellent books listed
-      in .
+    ¹q¤l¶l¥ó©ÎªÌ«UºÙªº email¡A
+      ¤D¬O²{¤µ¨Ï¥Î³Ì¼sªxªº·¾³q¤è¦¡¤§¤@¡C  ¥»³¹¥D­n¤¶²Ð¦p¦ó¦b &os; ¤W¦w¸Ë¡B
+      ³]©w email ªA°È¡A¥H¤Î¦p¦ó¦b &os; ¦¬µo«H¥ó¡F  µM¦Ó³o¨Ã¤£¬O§¹¾ãªº°Ñ¦Ò¤â¥U¡A
+      ¹ê»Ú¤W³\¦h»Ý¦Ò¶qªº­«­n¨Æ¶µ¨Ã¥¼´£¤Î¡A­Y±ýÁA¸Ñ²Ó¸`½Ð°Ñ¾\  ¤ºªº°Ñ¦Ò®ÑÄy¡C
 
-    After reading this chapter, you will know:
+    Ū§¹³o³¹¡A±z±N¤F¸Ñ¡J
 
     
       
-	What software components are involved in sending and receiving
-	  electronic mail.
+	­þ¨Ç³nÅ餸¥ó»P¦¬µo¹q¤l¶l¥ó¦³Ãö¡C
       
 
       
-	Where basic sendmail configuration
-	  files are located in FreeBSD.
+	FreeBSD ¤ºªº sendmail
+	  °ò¥»³]©wÀɦb­þ¡C
       
 
       
-        The difference between remote and
-	  local mailboxes.
+        »·ºÝ«H½c»P¥»¾÷«H½cªº°Ï§O¡C
       
 
       
-	How to block spammers from illegally using your mail server as a
-	  relay.
+	¦p¦óªý¾× spammer(©U§£¶l¥ó»s³yªÌ)«Dªk¹B¥Î±zªº¶l¥ó¦øªA¾¹§@¬°
+	  relay(Âàµo¤¤Ä~ÂI)¡C
       
 
       
-	How to install and configure an alternate Mail Transfer Agent on
-	  your system, replacing sendmail.
+	¦p¦ó¦w¸Ë¡B³]©w¨ä¥L Mail Transfer Agent(MTA) ¨Ó¨ú¥N
+	  sendmail¡C
       
 
       
-	How to troubleshoot common mail server problems.
+	¦p¦ó³B²z±`¨£ªº¶l¥ó¦øªA¾¹°ÝÃD¡C
       
 
       
-	How to use SMTP with UUCP.
+	¦p¦ó¨Ï¥Î UUCP ¨Ó¶i¦æ SMTP¡C
       
 
       
-	How to set up the system to send mail only.
+	¦p¦ó³]©w¨t²Î¡A¨Ï¨ä¥u¯àµo°e¶l¥ó¡C
       
 
       
-	How to use mail with a dialup connection.
+	¦p¦ó¦b¼·±µ¤WºôÀô¹Ò¤¤¡A¦¬µo¶l¥ó¡C
       
 
       
-        How to configure SMTP Authentication for added security.
+        ¦p¦ó³]©w SMTP ÅçÃÒ¡A¥H¥[±j¦w¥þ©Ê¡C
       
 
       
-        How to install and use a Mail User Agent, such as
-	  mutt to send and receive email.
+        ¦p¦ó¦w¸Ë¡B¨Ï¥Î Mail User Agent(MUA) µ{¦¡¡A¤ñ¦p
+	  mutt ¨Ó¦¬µo¶l¥ó¡C
       
 
       
 
-        How to download your mail from a remote POP
-	  or IMAP server.
+        ¦p¦ó±q»·ºÝ POP ©Î IMAP
+	  ¥D¾÷¥h¤U¸ü¶l¥ó¡C
       
 
       
-        How to automatically apply filters and rules to incoming
-	  email.
+        ¦p¦ó¦b¦¬«H¤è­±¡A¦Û°Ê®M¥Î¶l¥ó¹LÂo¡C
       
     
 
-    Before reading this chapter, you should:
+    ¦b¶}©l¾\Ū³o³¹¤§«e¡A±z»Ý­n¡J
 
     
       
-	Properly set up your network connection
-	  ().
+	¥ý³]¦n§Aªººô¸ô
+	  ()¡C
       
 
       
-	Properly set up the DNS information for your mail host
-	  ().
+	¯à¥¿½T¬°¶l¥ó¦øªA¾¹³]©w DNS
+	  ()¡C
       
 
       
-	Know how to install additional third-party software
-	  ().
+	ª¾¹D¦p¦ó³z¹L port/package ¦w¸Ë³nÅé
+	  ()¡C
     
   
 
   
-    Using Electronic Mail
+    ¨Ï¥Î¹q¤l¶l¥ó
     POP
     IMAP
     DNS
 
-    There are five major parts involved in an email exchange.  They
-      are: the user program, the server daemon, DNS, a
-      remote or local mailbox, and of course, the
-      mailhost itself.
+    ¦b email ¥æ´«ªº¹Lµ{¤¤¦³ 5 ­Ó¥D­n³¡¤À¡A¤À§O¬O¡GMUA¡BMTA¡B
+      DNS¡B
+      »·ºÝ©Î¥»¾÷ªº«H½c¡A·íµMÁÙ¦³ ¶l¥ó¥D¾÷¥»¨­
+      ¡C
 
     
-      The User Program
+      MUA µ{¦¡
 
-      This includes command line programs such as
-	mutt,
-	pine, elm,
-	and mail, and GUI programs such as
-	balsa,
-	xfmail to name a few, and something
-	more sophisticated like a WWW browser.  These
-	programs simply pass off the email transactions to the local
-	mailhost, either
-	by calling one of the server
-	daemons available, or delivering it over TCP.
-	
+      ¥]¬A¤@¨Ç¤å¦r¤¶­±ªºµ{¦¡¡A¹³¬O
+	mutt¡B
+	pine¡Belm¡B
+	and mail¡A¥H¤Î GUI ¤¶­±ªºµ{¦¡¡A
+	¹³¬O balsa¡B
+	xfmail µ¥µ¥¡C  ¦¹¥~¡AÁÙ¦³§ó
+	½ÆÂøªº ¹³¬O WWW ÂsÄý¾¹¡C
+	³o¨Çµ{¦¡·|¶l¥ó³B²z¥æµ¹ ¶l¥ó¥D¾÷¡A©ÎªÌ³z¹L©I¥s
+	MTA(­Y¦³ªº¸Ü)©ÎªÌ¬O³z¹L
+	TCP ¨Ó¶Ç»¼¶l¥ó¡C
+    
 
     
       Mailhost Server Daemon
@@ -1336,17 +1329,7 @@
       via &man.m4.1; preprocessing, where the actual configuration
       occurs on a higher abstraction level. The &man.m4.1;
       configuration files can be found under
-      /usr/src/usr.sbin/sendmail/cf.
-
-    If you did not install your system with full sources, the
-      sendmail configuration set has been broken out into a separate source
-      distribution tarball. Assuming you have your FreeBSD source code
-      CDROM mounted, do:
-
-    &prompt.root; cd /cdrom/src
-&prompt.root; cat scontrib.?? | tar xzf - -C /usr/src/contrib/sendmail
-
-    This extracts to only a few hundred kilobytes.  The file
+      /usr/share/sendmail/cf.  The file
       README in the cf
       directory can serve as a basic introduction to &man.m4.1;
       configuration.
@@ -1357,13 +1340,13 @@
 
     First, you have to create your .mc
       file.  The directory
-      /usr/src/usr.sbin/sendmail/cf/cf contains a
+      /usr/share/sendmail/cf/cf contains a
       few examples.  Assuming you have named your file
       foo.mc, all you need to do in order to
       convert it into a valid sendmail.cf
       is:
 
-    &prompt.root; cd /usr/src/usr.sbin/sendmail/cf/cf
+    &prompt.root; cd /etc/mail
 &prompt.root; make foo.cf
 &prompt.root; cp foo.cf /etc/mail/sendmail.cf
 
@@ -1656,26 +1639,38 @@
 
     
       
-	Install security/cyrus-sasl
+	Install security/cyrus-sasl2
 	  from the ports. You can find this port in
-	  security/cyrus-sasl.
-	  security/cyrus-sasl has
-	  a number of compile time options to choose from and, for
-	  the method we will be using here, make sure to select the
-	   option.
+	  security/cyrus-sasl2.  The
+	  security/cyrus-sasl2 port
+	  supports a number of compile-time options.  For the SMTP
+	  Authentication method we will be using here, make sure that
+	  the  option is not disabled.
       
 
 
       
-	After installing security/cyrus-sasl,
-	  edit /usr/local/lib/sasl/Sendmail.conf
+	After installing security/cyrus-sasl2,
+	  edit /usr/local/lib/sasl2/Sendmail.conf
 	  (or create it if it does not exist) and add the following
 	  line:
 
-	pwcheck_method: passwd
+	pwcheck_method: saslauthd
+      
+
+      
+	Next, install security/cyrus-sasl2-saslauthd,
+	  edit /etc/rc.conf to add the following
+	  line:
+
+	saslauthd_enable="YES"
+
+	and finally start the saslauthd daemon:
+
+	&prompt.root; /usr/local/etc/rc.d/saslauthd start
 
-	This method will enable sendmail
-	  to authenticate against your FreeBSD passwd
+	This daemon serves as a broker for sendmail to
+	  authenticate against your FreeBSD passwd
 	  database.  This saves the trouble of creating a new set of usernames
 	  and passwords for each user that needs to use
 	  SMTP authentication, and keeps the login
@@ -1686,14 +1681,14 @@
 	Now edit /etc/make.conf and add the
 	  following lines:
 
-	SENDMAIL_CFLAGS=-I/usr/local/include/sasl1 -DSASL
+	SENDMAIL_CFLAGS=-I/usr/local/include/sasl -DSASL
 SENDMAIL_LDFLAGS=-L/usr/local/lib
-SENDMAIL_LDADD=-lsasl
+SENDMAIL_LDADD=-lsasl2
 
 	These lines will give sendmail
 	the proper configuration options for linking
-	to cyrus-sasl at compile time.
-	Make sure that cyrus-sasl
+	to cyrus-sasl2 at compile time.
+	Make sure that cyrus-sasl2
 	has been installed before recompiling
 	sendmail.
       
@@ -1701,11 +1696,12 @@
       
 	Recompile sendmail by executing the following commands:
 
-	&prompt.root; cd /usr/src/usr.sbin/sendmail
-&prompt.root; make cleandir
-&prompt.root; make obj
-&prompt.root; make
-&prompt.root; make install
+	&prompt.root; cd /usr/src/lib/libsmutil
+&prompt.root; make cleandir && make obj && make
+&prompt.root; cd /usr/src/lib/libsm
+&prompt.root; make cleandir && make obj && make
+&prompt.root; cd /usr/src/usr.sbin/sendmail
+&prompt.root; make cleandir && make obj && make && make install
 
 	The compile of sendmail should not have any problems
 	  if /usr/src has not been changed extensively
@@ -1721,8 +1717,7 @@
 
 	dnl set SASL options
 TRUST_AUTH_MECH(`GSSAPI DIGEST-MD5 CRAM-MD5 LOGIN')dnl
-define(`confAUTH_MECHANISMS', `GSSAPI DIGEST-MD5 CRAM-MD5 LOGIN')dnl
-define(`confDEF_AUTH_INFO', `/etc/mail/auth-info')dnl
+define(`confAUTH_MECHANISMS', `GSSAPI DIGEST-MD5 CRAM-MD5 LOGIN')dnl
 
 	These options configure the different methods available to
 	sendmail for authenticating users.
@@ -1750,14 +1745,6 @@
       sendmail to 13 and watch
       /var/log/maillog for any errors.
 
-    You may wish to add the following line to /etc/rc.conf
-      so this service will be available after every system boot:
-
-    cyrus_pwcheck_enable="YES"
-
-    This will ensure the initialization of SMTP_AUTH upon system
-      boot.
-
     For more information, please see the sendmail
       page regarding
       
@@ -1840,7 +1827,7 @@
 	that should be displayed.  In this example, we will read the
 	first email:
 
-      & t 1
+      & t 1
 Message 1:
 From root@localhost  Mon Mar  8 14:05:52 2004
 X-Original-To: marcs@localhost
@@ -1870,7 +1857,7 @@
 	single . on a new line.  An example can be seen
 	below:
 
-      & R 1
+      & R 1
 To: root@localhost
 Subject: Re: test
 
@@ -1887,7 +1874,7 @@
 	be specified by putting a single . on a new
 	line.
 
-      & mail root@localhost
+      & mail root@localhost
 Subject: I mastered mail
 
 Now I can send and receive email using mail ... :)
@@ -1995,7 +1982,11 @@
 	  &man.vi.1; command as an editor for creating and replying to
 	  emails.  This may be customized by the user by creating or
 	  editing their own .muttrc file in their home directory and setting the
-	  editor variable.
+	  editor variable or by setting the
+	  EDITOR environment variable.  See
+	   for more
+	  information about configuring
+	  mutt.
       
 
       In order to compose a new mail message, press
@@ -2018,6 +2009,7 @@
 	help, which can be accessed from most of the menus by pressing
 	the ? key.  The top line also displays the
 	keyboard shortcuts where appropriate.
+
     
 
     
@@ -2281,7 +2273,7 @@
       address of goodmail@example2.com:
 
     :0
-* < 1000
+* < 1000
 ! goodmail@example2.com
 
     Send all mail sent to alternate@example.com

==== //depot/projects/dtrace/ports/MOVED#52 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # MOVED - a list of (recently) moved or removed ports
 #
-# $FreeBSD: ports/MOVED,v 1.1512 2007/11/03 23:36:39 gerald Exp $
+# $FreeBSD: ports/MOVED,v 1.1513 2007/12/03 09:43:40 dougb Exp $
 #
 # Each entry consists of a single line containing the following four
 # fields in the order named, separated with the pipe (`|') character:
@@ -3325,3 +3325,7 @@
 devel/py-qt4-qct|devel/qct|2007-10-26|Since it's an application but not a Py/Qt library the port was renamed
 net-mgmt/wispy-tools|net-mgmt/spectools|2007-10-29|project renamed
 lang/gcc40|lang/gcc42|2007-11-04|Superseded by gcc41 and later, gcc42 being the recommended update path
+chinese/bind8||2007-12-03|EOL: Use dns/bind94 instead
+dns/bind8||2007-12-03|EOL: Use dns/bind94 instead
+dns/bind84||2007-12-03|EOL: Use dns/bind94 instead
+mail/smc-milter||2007-12-03|Relies on BIND 8, which is EOL

==== //depot/projects/dtrace/ports/Mk/bsd.ruby.mk#9 (text+ko) ====

@@ -3,7 +3,7 @@
 #
 # Created by: Akinori MUSHA 
 #
-# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.164 2007/10/30 11:24:58 stas Exp $
+# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.165 2007/12/04 12:26:06 stas Exp $
 #
 
 .if !defined(Ruby_Include)
@@ -162,7 +162,7 @@
 
 .if defined(RUBY_VER) && ${RUBY_VER} == 1.8
 RUBY_RELVERSION=	1.8.6
-RUBY_PORTREVISION=	0
+RUBY_PORTREVISION=	1
 RUBY_PORTEPOCH=		1
 RUBY_PATCHLEVEL=	111
 

==== //depot/projects/dtrace/src/Makefile.inc1#33 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.590 2007/10/31 09:26:42 yar Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.591 2007/12/04 12:55:27 yar Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -606,17 +606,25 @@
 #
 distributeworld installworld: installcheck
 	mkdir -p ${INSTALLTMP}
-	for prog in ${ITOOLS}; do \
+	progs=$$(for prog in ${ITOOLS}; do \
 		if progpath=`which $$prog`; then \
-			progs="$$progs $$progpath"; \
+			echo $$progpath; \
 		else \
 			echo "Required tool $$prog not found in PATH." >&2; \
 			exit 1; \
 		fi; \
-	done; \
-	cp $$progs ${INSTALLTMP}; \
-	cp `ldd -f "%p\n" -f "%p\n" $$progs 2>/dev/null | \
-	    sort -u` ${INSTALLTMP}
+	    done); \
+	libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | \
+	    while read line; do \
+		set -- $$line; \
+		if [ "$$2 $$3" != "not found" ]; then \
+			echo $$2; \
+		else \
+			echo "Required library $$1 not found." >&2; \
+			exit 1; \
+		fi; \
+	    done); \
+	cp $$libs $$progs ${INSTALLTMP}
 	cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale
 	${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
 	    ${IMAKEENV} rm -rf ${INSTALLTMP}

==== //depot/projects/dtrace/src/contrib/bind9/lib/isc/arm/include/isc/atomic.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/contrib/bind9/lib/isc/arm/include/isc/atomic.h,v 1.1.1.1 2007/06/05 22:15:38 dougb Exp $
+ * $FreeBSD: src/contrib/bind9/lib/isc/arm/include/isc/atomic.h,v 1.1.1.2 2007/12/03 08:26:34 dougb Exp $
  */
 
 #ifndef ISC_ATOMIC_H
@@ -49,7 +49,29 @@
 static inline isc_int32_t
 isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val)
 {
-	return atomic_cmpset_int(p, cmpval, val);
+	register int done, ras_start;
+
+	__asm __volatile("1:\n"
+	    "adr	%1, 1b\n"
+	    "mov	%0, #0xe0000004\n"
+	    "str	%1, [%0]\n"
+	    "mov	%0, #0xe0000008\n"
+	    "adr	%1, 2f\n"
+	    "str	%1, [%0]\n"
+	    "ldr	%1, [%2]\n"
+	    "cmp	%1, %3\n"
+	    "streq	%4, [%2]\n"
+	    "2:\n"
+	    "mov	%3, #0\n"
+	    "mov	%0, #0xe0000004\n"
+	    "str	%3, [%0]\n"
+	    "mov	%3, #0xffffffff\n"
+	    "mov	%0, #0xe0000008\n"
+	    "str	%3, [%0]\n"
+	    : "=r" (ras_start), "=r" (done)
+	    ,"+r" (p), "+r" (cmpval), "+r" (val) : : "memory");
+	return (done);
+
 }
 #else /* !FreeBSD */
 

==== //depot/projects/dtrace/src/lib/csu/common/crtbrand.c#4 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/csu/common/crtbrand.c,v 1.4 2003/10/17 15:43:13 peter Exp $");
+__FBSDID("$FreeBSD: src/lib/csu/common/crtbrand.c,v 1.6 2007/12/04 12:18:43 kib Exp $");
 
 #include 
 
@@ -43,7 +43,7 @@
     int32_t	type;
     char	name[sizeof ABI_VENDOR];
     int32_t	desc;
-} abitag __attribute__ ((section (ABI_SECTION), aligned(4))) __unused = {
+} abitag __attribute__ ((section (ABI_SECTION), aligned(4))) __used = {
     sizeof ABI_VENDOR,
     sizeof(int32_t),
     ABI_NOTETYPE,

==== //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_zip.c#8 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.15 2007/10/12 04:08:28 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.16 2007/12/04 06:32:12 kientzle Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include 
@@ -336,7 +336,8 @@
 	zip->entry_offset = 0;
 
 	/* If there's no body, force read_data() to return EOF immediately. */
-	if (zip->entry_bytes_remaining < 1)
+	if (0 == (zip->flags & ZIP_LENGTH_AT_END)
+	    && zip->entry_bytes_remaining < 1)
 		zip->end_of_entry = 1;
 
 	/* Set up a more descriptive format name. */

==== //depot/projects/dtrace/src/lib/libc/amd64/Makefile.inc#4 (text+ko) ====

@@ -1,9 +1,9 @@
-# $FreeBSD: src/lib/libc/amd64/Makefile.inc,v 1.5 2006/03/16 14:22:19 ru Exp $
+# $FreeBSD: src/lib/libc/amd64/Makefile.inc,v 1.6 2007/12/03 07:17:32 das Exp $
 #
 # Machine dependent definitions for the amd64 architecture.
 #
 
 # Long double is 80 bits
-GDTOASRCS+=strtopx.c
+GDTOASRCS+=strtorx.c
 MDSRCS+=machdep_ldisx.c
 SYM_MAPS+=${.CURDIR}/amd64/Symbol.map

==== //depot/projects/dtrace/src/lib/libc/gdtoa/_ldtoa.c#5 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_ldtoa.c,v 1.3 2007/11/21 01:10:42 jb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_ldtoa.c,v 1.4 2007/12/03 07:17:32 das Exp $");
 
 #include 
 #include 
@@ -46,11 +46,11 @@
 __ldtoa(long double *ld, int mode, int ndigits, int *decpt, int *sign,
     char **rve)
 {
-	static FPI fpi = {
+	FPI fpi = {
 		LDBL_MANT_DIG,			/* nbits */
 		LDBL_MIN_EXP - LDBL_MANT_DIG,	/* emin */
 		LDBL_MAX_EXP - LDBL_MANT_DIG,	/* emax */
-		FPI_Round_near,	       		/* rounding */
+		FLT_ROUNDS,	       		/* rounding */
 #ifdef Sudden_Underflow	/* unused, but correct anyway */
 		1
 #else
@@ -64,7 +64,15 @@
 	void *vbits = bits;
 
 	u.e = *ld;
+
+	/*
+	 * gdtoa doesn't know anything about the sign of the number, so
+	 * if the number is negative, we need to swap rounding modes of
+	 * 2 (upwards) and 3 (downwards).
+	 */
 	*sign = u.bits.sign;
+	fpi.rounding ^= (fpi.rounding >> 1) & u.bits.sign;
+
 	be = u.bits.exp - (LDBL_MAX_EXP - 1) - (LDBL_MANT_DIG - 1);
 	LDBL_TO_ARRAY32(u, bits);
 

==== //depot/projects/dtrace/src/lib/libc/gdtoa/machdep_ldisQ.c#4 (text+ko) ====

@@ -31,7 +31,9 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisQ.c,v 1.2 2003/04/09 05:58:43 das Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisQ.c,v 1.3 2007/12/03 07:17:32 das Exp $");
+
+#include 
 
 #include "gdtoaimp.h"
 
@@ -40,6 +42,6 @@
 {
 	long double result;
 
-	strtopQ(s, sp, &result);
+	strtorQ(s, sp, FLT_ROUNDS, &result);
 	return result;
 }

==== //depot/projects/dtrace/src/lib/libc/gdtoa/machdep_ldisx.c#4 (text+ko) ====

@@ -31,7 +31,9 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisx.c,v 1.2 2003/04/09 05:58:43 das Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisx.c,v 1.3 2007/12/03 07:17:32 das Exp $");
+
+#include 
 
 #include "gdtoaimp.h"
 
@@ -40,6 +42,6 @@
 {
 	long double result;
 
-	strtopx(s, sp, &result);
+	strtorx(s, sp, FLT_ROUNDS, &result);
 	return result;
 }

==== //depot/projects/dtrace/src/lib/libc/gen/closedir.c#6 (text+ko) ====

@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)closedir.c	8.1 (Berkeley) 6/10/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/gen/closedir.c,v 1.12 2007/11/19 21:57:28 cognet Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/closedir.c,v 1.13 2007/12/03 14:33:50 des Exp $");
 
 #include "namespace.h"
 #include 
@@ -54,7 +54,7 @@
 	int fd;
 
 	if (__isthreaded)
-		_pthread_mutex_lock((void *)&dirp->dd_lock);
+		_pthread_mutex_lock(&dirp->dd_lock);
 	_seekdir(dirp, dirp->dd_rewind);	/* free seekdir storage */
 	fd = dirp->dd_fd;
 	dirp->dd_fd = -1;
@@ -62,8 +62,8 @@
 	free((void *)dirp->dd_buf);
 	_reclaim_telldir(dirp);
 	if (__isthreaded) {
-		_pthread_mutex_unlock((void *)&dirp->dd_lock);
-		_pthread_mutex_destroy((void *)&dirp->dd_lock);
+		_pthread_mutex_unlock(&dirp->dd_lock);
+		_pthread_mutex_destroy(&dirp->dd_lock);
 	}
 	free((void *)dirp);
 	return(_close(fd));

==== //depot/projects/dtrace/src/lib/libc/gen/readdir.c#5 (text+ko) ====

@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)readdir.c	8.3 (Berkeley) 9/29/94";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/gen/readdir.c,v 1.13 2007/01/09 00:27:55 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/readdir.c,v 1.14 2007/12/03 14:33:50 des Exp $");
 
 #include "namespace.h"
 #include 
@@ -87,9 +87,9 @@
 	struct dirent	*dp;
 
 	if (__isthreaded) {
-		_pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock);
+		_pthread_mutex_lock(&dirp->dd_lock);
 		dp = _readdir_unlocked(dirp);
-		_pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock);
+		_pthread_mutex_unlock(&dirp->dd_lock);
 	}
 	else
 		dp = _readdir_unlocked(dirp);
@@ -108,10 +108,10 @@
 	saved_errno = errno;
 	errno = 0;
 	if (__isthreaded) {
-		_pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock);
+		_pthread_mutex_lock(&dirp->dd_lock);
 		if ((dp = _readdir_unlocked(dirp)) != NULL)
 			memcpy(entry, dp, _GENERIC_DIRSIZ(dp));
-		_pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock);
+		_pthread_mutex_unlock(&dirp->dd_lock);
 	}
 	else if ((dp = _readdir_unlocked(dirp)) != NULL)
 		memcpy(entry, dp, _GENERIC_DIRSIZ(dp));

==== //depot/projects/dtrace/src/lib/libc/gen/seekdir.c#5 (text+ko) ====

@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)seekdir.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/gen/seekdir.c,v 1.6 2007/01/09 00:27:55 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/seekdir.c,v 1.7 2007/12/03 14:33:51 des Exp $");
 
 #include "namespace.h"
 #include 
@@ -52,8 +52,8 @@
 	long loc;
 {
 	if (__isthreaded)
-		_pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock);
+		_pthread_mutex_lock(&dirp->dd_lock);
 	_seekdir(dirp, loc);
 	if (__isthreaded)
-		_pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock);
+		_pthread_mutex_unlock(&dirp->dd_lock);
 }

==== //depot/projects/dtrace/src/lib/libc/gen/telldir.c#5 (text+ko) ====

@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)telldir.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/gen/telldir.c,v 1.9 2007/01/09 00:27:55 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/telldir.c,v 1.10 2007/12/03 14:33:51 des Exp $");
 
 #include "namespace.h"
 #include 
@@ -64,13 +64,13 @@
 	if ((lp = (struct ddloc *)malloc(sizeof(struct ddloc))) == NULL)
 		return (-1);
 	if (__isthreaded)
-		_pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock);
+		_pthread_mutex_lock(&dirp->dd_lock);
 	lp->loc_index = dirp->dd_td->td_loccnt++;
 	lp->loc_seek = dirp->dd_seek;
 	lp->loc_loc = dirp->dd_loc;
 	LIST_INSERT_HEAD(&dirp->dd_td->td_locq, lp, loc_lqe);
 	if (__isthreaded)
-		_pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock);
+		_pthread_mutex_unlock(&dirp->dd_lock);
 	return (lp->loc_index);
 }
 

==== //depot/projects/dtrace/src/lib/libc/i386/Makefile.inc#4 (text+ko) ====

@@ -1,6 +1,6 @@
-# $FreeBSD: src/lib/libc/i386/Makefile.inc,v 1.2 2006/03/13 01:14:57 deischen Exp $
+# $FreeBSD: src/lib/libc/i386/Makefile.inc,v 1.3 2007/12/03 07:17:32 das Exp $
 
 # Long double is 80 bits
-GDTOASRCS+=strtopx.c
+GDTOASRCS+=strtorx.c
 MDSRCS+=machdep_ldisx.c
 SYM_MAPS+=${.CURDIR}/i386/Symbol.map

==== //depot/projects/dtrace/src/lib/libc/ia64/Makefile.inc#4 (text+ko) ====

@@ -1,9 +1,9 @@
-# $FreeBSD: src/lib/libc/ia64/Makefile.inc,v 1.7 2006/03/16 14:27:17 ru Exp $
+# $FreeBSD: src/lib/libc/ia64/Makefile.inc,v 1.8 2007/12/03 07:17:32 das Exp $
 #
 # Machine dependent definitions for the ia64 architecture.
 #
 
 # Long double is 80 bits
-GDTOASRCS+=strtopx.c
+GDTOASRCS+=strtorx.c
 MDSRCS+=machdep_ldisx.c
 SYM_MAPS+=${.CURDIR}/ia64/Symbol.map

==== //depot/projects/dtrace/src/lib/libc/nameser/ns_parse.c#4 (text) ====

@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_parse.c,v 1.5.18.3 2005/10/11 00:25:10 marka Exp $";
+static const char rcsid[] = "$Id: ns_parse.c,v 1.5.18.4 2007/08/27 03:34:24 marka Exp $";
 #endif
 
 /* Import. */

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Dec  5 05:34:06 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1DC4B16A46B; Wed,  5 Dec 2007 05:34: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 B73FD16A421
	for ; Wed,  5 Dec 2007 05:34:05 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A316E13C46A
	for ; Wed,  5 Dec 2007 05:34:05 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB55Y594028982
	for ; Wed, 5 Dec 2007 05:34:05 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB55Y5wg028979
	for perforce@freebsd.org; Wed, 5 Dec 2007 05:34:05 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 5 Dec 2007 05:34:05 GMT
Message-Id: <200712050534.lB55Y5wg028979@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130242 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 05 Dec 2007 05:34:06 -0000

http://perforce.freebsd.org/chv.cgi?CH=130242

Change 130242 by kmacy@entropy_kmacy_xen31 on 2007/12/05 05:33:47

	fix conflict with xen support code's definition of test_and_clear_bit

Affected files ...

.. //depot/projects/xen31/sys/dev/cxgb/cxgb_osdep.h#3 edit
.. //depot/projects/xen31/sys/dev/cxgb/cxgb_sge.c#2 edit

Differences ...

==== //depot/projects/xen31/sys/dev/cxgb/cxgb_osdep.h#3 (text+ko) ====

@@ -179,7 +179,7 @@
 
 #define t3_os_sleep(x) DELAY((x) * 1000)
 
-#define test_and_clear_bit(bit, p) atomic_cmpset_int((p), ((*(p)) | bit), ((*(p)) & ~bit)) 
+#define TEST_AND_CLEAR_BIT(bit, p) atomic_cmpset_int((p), ((*(p)) | bit), ((*(p)) & ~bit)) 
 
 
 #define max_t(type, a, b) (type)max((a), (b))

==== //depot/projects/xen31/sys/dev/cxgb/cxgb_sge.c#2 (text+ko) ====

@@ -1410,7 +1410,7 @@
 		smp_mb();
 
 		if (should_restart_tx(q) &&
-		    test_and_clear_bit(qid, &qs->txq_stopped))
+		    TEST_AND_CLEAR_BIT(qid, &qs->txq_stopped))
 			return 2;
 
 		q->stops++;
@@ -1529,7 +1529,7 @@
 		smp_mb();
 
 		if (should_restart_tx(q) &&
-		    test_and_clear_bit(TXQ_CTRL, &qs->txq_stopped))
+		    TEST_AND_CLEAR_BIT(TXQ_CTRL, &qs->txq_stopped))
 			goto again;
 		q->stops++;
 	}
@@ -1917,7 +1917,7 @@
 			smp_mb();
 
 			if (should_restart_tx(q) &&
-			    test_and_clear_bit(TXQ_OFLD, &qs->txq_stopped))
+			    TEST_AND_CLEAR_BIT(TXQ_OFLD, &qs->txq_stopped))
 				goto again;
 			q->stops++;
 			break;
@@ -2043,13 +2043,13 @@
 	
 	if (isset(&qs->txq_stopped, TXQ_OFLD) &&
 	    should_restart_tx(&qs->txq[TXQ_OFLD]) &&
-	    test_and_clear_bit(TXQ_OFLD, &qs->txq_stopped)) {
+	    TEST_AND_CLEAR_BIT(TXQ_OFLD, &qs->txq_stopped)) {
 		qs->txq[TXQ_OFLD].restarts++;
 		taskqueue_enqueue(sc->tq, &qs->txq[TXQ_OFLD].qresume_task);
 	}
 	if (isset(&qs->txq_stopped, TXQ_CTRL) &&
 	    should_restart_tx(&qs->txq[TXQ_CTRL]) &&
-	    test_and_clear_bit(TXQ_CTRL, &qs->txq_stopped)) {
+	    TEST_AND_CLEAR_BIT(TXQ_CTRL, &qs->txq_stopped)) {
 		qs->txq[TXQ_CTRL].restarts++;
 		taskqueue_enqueue(sc->tq, &qs->txq[TXQ_CTRL].qresume_task);
 	}

From owner-p4-projects@FreeBSD.ORG  Wed Dec  5 06:50:36 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7A76D16A473; Wed,  5 Dec 2007 06:50: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 2887516A46B
	for ; Wed,  5 Dec 2007 06:50:36 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 07E2213C442
	for ; Wed,  5 Dec 2007 06:50:36 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB56oZZ9041301
	for ; Wed, 5 Dec 2007 06:50:35 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB56oZEh041298
	for perforce@freebsd.org; Wed, 5 Dec 2007 06:50:35 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 5 Dec 2007 06:50:35 GMT
Message-Id: <200712050650.lB56oZEh041298@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130248 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 05 Dec 2007 06:50:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=130248

Change 130248 by kmacy@entropy_kmacy_xen31 on 2007/12/05 06:49:52

	import missing header files for xen_machdep.c
	make neccessary changes to get xen_machdep.c to build

Affected files ...

.. //depot/projects/xen31/sys/i386/include/cpufunc.h#2 edit
.. //depot/projects/xen31/sys/i386/include/pmap.h#4 edit
.. //depot/projects/xen31/sys/i386/include/xen/evtchn.h#1 add
.. //depot/projects/xen31/sys/i386/include/xen/synch_bitops.h#1 add
.. //depot/projects/xen31/sys/i386/include/xen/xen-os.h#2 edit
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/grant_table.h#2 edit
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/xen.h#2 edit
.. //depot/projects/xen31/sys/i386/xen/xen_machdep.c#2 edit

Differences ...

==== //depot/projects/xen31/sys/i386/include/cpufunc.h#2 (text+ko) ====

@@ -42,6 +42,18 @@
 #error this file needs sys/cdefs.h as a prerequisite
 #endif
 
+#ifdef XEN
+#include 
+#define NO_EXCHANGE
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+struct thread;
+#endif
+
 struct region_descriptor;
 
 #define readb(va)	(*(volatile u_int8_t *) (va))

==== //depot/projects/xen31/sys/i386/include/pmap.h#4 (text+ko) ====

@@ -192,6 +192,7 @@
 
 
 #ifdef XEN
+#include 
 #include 
 #include 
 #include 
@@ -202,6 +203,8 @@
 #define FALSE 0
 #endif
 
+#define PG_KERNEL  (PG_V | PG_A | PG_RW | PG_M)
+
 static __inline vm_paddr_t
 pmap_kextract_ma(vm_offset_t va)
 {
@@ -227,6 +230,26 @@
 void    pmap_map_readonly(struct pmap *pmap, vm_offset_t va, int len);
 void    pmap_map_readwrite(struct pmap *pmap, vm_offset_t va, int len);
 
+static __inline pt_entry_t
+pte_load_clear(pt_entry_t *ptep)
+{
+	pt_entry_t r;
+
+	r = PT_GET(ptep);
+	PT_CLEAR_VA(ptep, TRUE);
+	return (r);
+}
+static __inline pt_entry_t
+pte_load_store(pt_entry_t *ptep, pt_entry_t v)
+{
+	pt_entry_t r;
+	r = PT_GET(ptep);
+	PT_SET_VA(ptep, v, TRUE);
+	return (r);
+}
+
+#define	pte_store(ptep, pte)	pte_load_store((ptep), (pt_entry_t)pte)
+
 #else
 /*
  *	Routine:	pmap_kextract
@@ -338,7 +361,7 @@
 	*ptep = pte;
 }
 
-#endif /* PAE */
+#endif /* !PAE */
 
 #define	pte_clear(ptep)		pte_store((ptep), (pt_entry_t)0ULL)
 

==== //depot/projects/xen31/sys/i386/include/xen/xen-os.h#2 (text+ko) ====

@@ -12,7 +12,9 @@
 #define NULL (void *)0
 #endif
 
+#ifndef PANIC_IF
 #define PANIC_IF(exp) if (unlikely(exp)) {printk("panic - %s: %s:%d\n",#exp, __FILE__, __LINE__); panic("%s: %s:%d", #exp, __FILE__, __LINE__);} 
+#endif
 
 /* Somewhere in the middle of the GCC 2.96 development cycle, we implemented
    a mechanism by which the user can annotate likely branch directions and
@@ -146,9 +148,15 @@
 #define spin_unlock_irqrestore mtx_unlock_irqrestore
 
 
+#ifndef mb
 #define mb() __asm__ __volatile__("lock; addl $0, 0(%%esp)": : :"memory")
+#endif
+#ifndef rmb
 #define rmb() mb()
+#endif
+#ifndef wmb
 #define wmb() barrier()
+#endif
 #ifdef SMP
 #define smp_mb() mb() 
 #define smp_rmb() rmb()
@@ -217,7 +225,7 @@
  * This operation is atomic and cannot be reordered.  
  * It also implies a memory barrier.
  */
-static __inline__ int test_and_clear_bit(int nr, volatile void * addr)
+static __inline int test_and_clear_bit(int nr, volatile void * addr)
 {
         int oldbit;
 
@@ -228,12 +236,12 @@
         return oldbit;
 }
 
-static __inline__ int constant_test_bit(int nr, const volatile void * addr)
+static __inline int constant_test_bit(int nr, const volatile void * addr)
 {
     return ((1UL << (nr & 31)) & (((const volatile unsigned int *) addr)[nr >> 5])) != 0;
 }
 
-static __inline__ int variable_test_bit(int nr, volatile void * addr)
+static __inline int variable_test_bit(int nr, volatile void * addr)
 {
     int oldbit;
     

==== //depot/projects/xen31/sys/i386/include/xen/xen-public/grant_table.h#2 (text+ko) ====

@@ -235,11 +235,11 @@
 #define GNTTABOP_transfer                4
 typedef struct gnttab_transfer {
     /* IN parameters. */
-    unsigned long mfn;
-    domid_t       domid;
-    grant_ref_t   ref;
+    xen_pfn_t       mfn;
+    domid_t         domid;
+    grant_ref_t     ref;
     /* OUT parameters. */
-    int16_t       status;
+    int16_t         status;
 } gnttab_transfer_t;
 DEFINE_GUEST_HANDLE(gnttab_transfer_t);
 

==== //depot/projects/xen31/sys/i386/include/xen/xen-public/xen.h#2 (text+ko) ====

@@ -19,6 +19,8 @@
 #error "Unsupported architecture"
 #endif
 
+typedef unsigned long xen_pfn_t;
+
 /*
  * XEN "SYSTEM CALLS" (a.k.a. HYPERCALLS).
  */
@@ -406,8 +408,16 @@
     uint32_t flags;             /* SIF_xxx flags.                         */
     unsigned long store_mfn;    /* MACHINE page number of shared page.    */
     uint32_t store_evtchn;      /* Event channel for store communication. */
-    unsigned long console_mfn;  /* MACHINE address of console page.       */
-    uint32_t console_evtchn;    /* Event channel for console messages.    */
+    union {
+        struct {
+            xen_pfn_t mfn;      /* MACHINE page number of console page.   */
+            uint32_t  evtchn;   /* Event channel for console page.        */
+        } domU;
+        struct {
+            uint32_t info_off;  /* Offset of console_info struct.         */
+            uint32_t info_size; /* Size of console_info struct from start.*/
+        } dom0;
+    } console;
     /* THE FOLLOWING ARE ONLY FILLED IN ON INITIAL BOOT (NOT RESUME).     */
     unsigned long pt_base;      /* VIRTUAL address of page directory.     */
     unsigned long nr_pt_frames; /* Number of bootstrap p.t. frames.       */

==== //depot/projects/xen31/sys/i386/xen/xen_machdep.c#2 (text+ko) ====

@@ -59,6 +59,10 @@
 #include 
 #include 
 
+#ifdef SMP
+#include 
+#endif
+
 #define	IDTVEC(name)	__CONCAT(X,name)
 
 extern inthand_t
@@ -787,18 +791,19 @@
 	cur_space += PAGE_SIZE;
 	console_page = (char *)cur_space;
 	PT_SET_MA(console_page,
-		  (xen_start_info->console_mfn << PAGE_SHIFT)| PG_KERNEL);
+		  (xen_start_info->console.domU.mfn << PAGE_SHIFT)| PG_KERNEL);
 	cur_space += PAGE_SIZE;
 
 	printk("#5\n");
 
 	HYPERVISOR_shared_info->arch.pfn_to_mfn_frame_list_list = (unsigned long)xen_phys_machine;
-#ifdef SMP
+#if 0 && defined(SMP)
 	for (i = 0; i < ncpus; i++) {
-		int npages = (sizeof(struct privatespace) + 1)/PAGE_SIZE;
+		int j, npages = (sizeof(struct privatespace) + 1)/PAGE_SIZE;
+
 		for (j = 0; j < npages; j++) {
-			vm_paddr_t ma = xpmap_ptom(tmpindex << PAGE_SHIFT);
-			tmpindex++;
+			vm_paddr_t ma = xpmap_ptom(cur_space);
+			cur_space += PAGE_SIZE;
 			PT_SET_VA_MA(SMPpt + i*npages + j, ma | PG_KERNEL, FALSE);
 		}
 	}
@@ -1007,7 +1012,7 @@
 	pmap_kremove(HYPERVISOR_shared_info);
 
 	xen_start_info->store_mfn = mfn_to_pfn(xen_start_info->store_mfn);
-	xen_start_info->console_mfn = mfn_to_pfn(xen_start_info->console_mfn);
+	xen_start_info->console.domU.mfn = mfn_to_pfn(xen_start_info->console.domU.mfn);
 
 	/*
 	 * We'll stop somewhere inside this hypercall. When it returns,

From owner-p4-projects@FreeBSD.ORG  Wed Dec  5 12:48:18 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6C0BE16A420; Wed,  5 Dec 2007 12:48: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 0FF1916A417
	for ; Wed,  5 Dec 2007 12:48:18 +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 F030613C458
	for ; Wed,  5 Dec 2007 12:48:17 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB5CmHoJ020760
	for ; Wed, 5 Dec 2007 12:48:18 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB5Cm3xI020757
	for perforce@freebsd.org; Wed, 5 Dec 2007 12:48:03 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Wed, 5 Dec 2007 12:48:03 GMT
Message-Id: <200712051248.lB5Cm3xI020757@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 130261 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 05 Dec 2007 12:48:18 -0000

http://perforce.freebsd.org/chv.cgi?CH=130261

Change 130261 by gonzo@gonzo_jeeves on 2007/12/05 12:47:55

	o IFC @130260 

Affected files ...

.. //depot/projects/mips2/src/Makefile.inc1#7 integrate
.. //depot/projects/mips2/src/ObsoleteFiles.inc#11 integrate
.. //depot/projects/mips2/src/UPDATING#9 integrate
.. //depot/projects/mips2/src/cddl/Makefile.inc#2 integrate
.. //depot/projects/mips2/src/cddl/lib/libnvpair/Makefile#2 integrate
.. //depot/projects/mips2/src/compat/opensolaris/include/alloca.h#1 branch
.. //depot/projects/mips2/src/compat/opensolaris/include/fcntl.h#1 branch
.. //depot/projects/mips2/src/compat/opensolaris/include/stdio.h#1 branch
.. //depot/projects/mips2/src/compat/opensolaris/include/stdlib.h#1 branch
.. //depot/projects/mips2/src/compat/opensolaris/include/strings.h#1 branch
.. //depot/projects/mips2/src/compat/opensolaris/include/unistd.h#1 branch
.. //depot/projects/mips2/src/contrib/bind9/CHANGES#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/COPYRIGHT#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/FAQ#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/FAQ.xml#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/Makefile.in#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/README#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/check/check-tool.c#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/check/named-checkconf.8#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/check/named-checkconf.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/check/named-checkconf.html#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/check/named-checkzone.8#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/check/named-checkzone.c#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/check/named-checkzone.docbook#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/check/named-checkzone.html#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/dig/dig.1#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/dig/dig.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/dig/dig.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/dig/dig.html#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/dig/dighost.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/dig/host.1#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/dig/host.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/dig/host.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/dig/host.html#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/dig/include/dig/dig.h#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/dig/nslookup.1#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/dig/nslookup.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/dig/nslookup.docbook#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/dig/nslookup.html#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/named/client.c#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/named/config.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/named/control.c#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/named/lwresd.8#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/named/lwresd.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/named/lwresd.html#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/named/named.8#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/named/named.conf.5#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/named/named.conf.docbook#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/named/named.conf.html#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/named/named.docbook#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/named/named.html#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/named/query.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/named/server.c#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/named/update.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/nsupdate/nsupdate.8#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/nsupdate/nsupdate.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/nsupdate/nsupdate.html#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/rndc/Makefile.in#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.8#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.conf.5#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.conf.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.conf.html#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.html#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/configure.in#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch10.html#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.html#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.pdf#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/arm/Makefile.in#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.dig.html#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.dnssec-keygen.html#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.dnssec-signzone.html#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.host.html#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.named-checkconf.html#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.named-checkzone.html#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.named.html#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.rndc-confgen.html#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.rndc.conf.html#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.rndc.html#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#2 delete
.. //depot/projects/mips2/src/contrib/bind9/doc/misc/Makefile.in#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/misc/migration#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/rfc/index#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/doc/rfc/rfc4398.txt#1 branch
.. //depot/projects/mips2/src/contrib/bind9/doc/rfc/rfc4408.txt#1 branch
.. //depot/projects/mips2/src/contrib/bind9/doc/rfc/rfc4470.txt#1 branch
.. //depot/projects/mips2/src/contrib/bind9/doc/rfc/rfc4634.txt#1 branch
.. //depot/projects/mips2/src/contrib/bind9/doc/rfc/rfc4641.txt#1 branch
.. //depot/projects/mips2/src/contrib/bind9/lib/bind/api#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/bind/config.h.in#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/bind/configure#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/bind/configure.in#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/bind/dst/dst_api.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/bind/dst/hmac_link.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/gai_strerror.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/irs_data.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/ctl_clnt.c#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/bind/make/rules.in#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/bind/nameser/ns_parse.c#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/bind/port_before.h.in#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_data.c#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_init.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/bind9/api#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/bind9/check.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/adb.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/api#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/dispatch.c#5 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/dnssec.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/db.h#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/dispatch.h#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/validator.h#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/journal.c#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/lookup.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/master.c#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/message.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/openssl_link.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/openssldh_link.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/openssldsa_link.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/rbtdb.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/ds_43.c#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdataslab.c#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/resolver.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/rootns.c#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/sdb.c#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/sdlz.c#2 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/tsig.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/validator.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/view.c#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/xfrin.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/dns/zone.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/Makefile.in#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/alpha/Makefile.in#1 branch
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/alpha/include/Makefile.in#1 branch
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#1 branch
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/api#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/arm/include/isc/atomic.h#2 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/hmacsha.c#2 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/ia64/Makefile.in#1 branch
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/ia64/include/Makefile.in#1 branch
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#1 branch
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/platform.h.in#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/string.h#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/mem.c#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/mips/Makefile.in#1 branch
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/mips/include/Makefile.in#1 branch
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#1 branch
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/noatomic/Makefile.in#1 branch
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/noatomic/include/Makefile.in#1 branch
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#1 branch
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/powerpc/Makefile.in#1 branch
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/powerpc/include/Makefile.in#1 branch
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in#1 branch
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#2 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/sparc64/Makefile.in#1 branch
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/sparc64/include/Makefile.in#1 branch
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in#1 branch
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/timer.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/net.c#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/socket.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/syslog.c#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/x86_32/Makefile.in#1 branch
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/x86_32/include/Makefile.in#1 branch
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in#1 branch
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/x86_64/Makefile.in#1 branch
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/x86_64/include/Makefile.in#1 branch
.. //depot/projects/mips2/src/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in#1 branch
.. //depot/projects/mips2/src/contrib/bind9/lib/isccc/symtab.c#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/api#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/lwres/api#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/lwres/context.c#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/lwres/getaddrinfo.c#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/lwres/getipnode.c#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/lwres/lwres_gnba.c#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_config.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_context.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_noop.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_packet.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#3 integrate
.. //depot/projects/mips2/src/contrib/bind9/make/rules.in#4 integrate
.. //depot/projects/mips2/src/contrib/bind9/version#5 integrate
.. //depot/projects/mips2/src/contrib/binutils/opcodes/ppc-dis.c#2 integrate
.. //depot/projects/mips2/src/contrib/less/NEWS#6 integrate
.. //depot/projects/mips2/src/contrib/less/README#6 integrate
.. //depot/projects/mips2/src/contrib/less/less.man#6 integrate
.. //depot/projects/mips2/src/contrib/less/less.nro#6 integrate
.. //depot/projects/mips2/src/contrib/less/lessecho.man#5 integrate
.. //depot/projects/mips2/src/contrib/less/lessecho.nro#5 integrate
.. //depot/projects/mips2/src/contrib/less/lesskey.man#6 integrate
.. //depot/projects/mips2/src/contrib/less/lesskey.nro#6 integrate
.. //depot/projects/mips2/src/contrib/less/search.c#6 integrate
.. //depot/projects/mips2/src/contrib/less/version.c#6 integrate
.. //depot/projects/mips2/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate
.. //depot/projects/mips2/src/etc/defaults/periodic.conf#5 integrate
.. //depot/projects/mips2/src/etc/freebsd-update.conf#3 integrate
.. //depot/projects/mips2/src/etc/gss/mech#2 integrate
.. //depot/projects/mips2/src/etc/periodic/security/100.chksetuid#2 integrate
.. //depot/projects/mips2/src/gnu/usr.bin/groff/tmac/mdoc.local#4 integrate
.. //depot/projects/mips2/src/include/assert.h#2 integrate
.. //depot/projects/mips2/src/include/elf.h#3 integrate
.. //depot/projects/mips2/src/lib/bind/bind/Makefile#3 integrate
.. //depot/projects/mips2/src/lib/bind/bind/config.h#3 integrate
.. //depot/projects/mips2/src/lib/bind/bind/port_before.h#4 integrate
.. //depot/projects/mips2/src/lib/bind/config.h#4 integrate
.. //depot/projects/mips2/src/lib/bind/config.mk#3 integrate
.. //depot/projects/mips2/src/lib/bind/isc/isc/platform.h#3 integrate
.. //depot/projects/mips2/src/lib/bind/lwres/Makefile#3 integrate
.. //depot/projects/mips2/src/lib/csu/common/crtbrand.c#2 integrate
.. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_zip.c#6 integrate
.. //depot/projects/mips2/src/lib/libc/amd64/Makefile.inc#2 integrate
.. //depot/projects/mips2/src/lib/libc/gdtoa/_ldtoa.c#3 integrate
.. //depot/projects/mips2/src/lib/libc/gdtoa/machdep_ldisQ.c#2 integrate
.. //depot/projects/mips2/src/lib/libc/gdtoa/machdep_ldisx.c#2 integrate
.. //depot/projects/mips2/src/lib/libc/gen/Symbol.map#5 integrate
.. //depot/projects/mips2/src/lib/libc/gen/closedir.c#4 integrate
.. //depot/projects/mips2/src/lib/libc/gen/readdir.c#3 integrate
.. //depot/projects/mips2/src/lib/libc/gen/seekdir.c#3 integrate
.. //depot/projects/mips2/src/lib/libc/gen/telldir.c#3 integrate
.. //depot/projects/mips2/src/lib/libc/i386/Makefile.inc#2 integrate
.. //depot/projects/mips2/src/lib/libc/ia64/Makefile.inc#2 integrate
.. //depot/projects/mips2/src/lib/libc/nameser/ns_parse.c#3 integrate
.. //depot/projects/mips2/src/lib/libc/resolv/res_data.c#3 integrate
.. //depot/projects/mips2/src/lib/libc/resolv/res_init.c#4 integrate
.. //depot/projects/mips2/src/lib/libc/sparc64/Makefile.inc#2 integrate
.. //depot/projects/mips2/src/lib/libc/sparc64/fpu/fpu_explode.c#3 integrate
.. //depot/projects/mips2/src/lib/libc/stdlib/malloc.3#4 integrate
.. //depot/projects/mips2/src/lib/libc/stdlib/malloc.c#7 integrate
.. //depot/projects/mips2/src/lib/libdisk/libdisk.3#3 integrate
.. //depot/projects/mips2/src/lib/libelf/elf.3#3 integrate
.. //depot/projects/mips2/src/lib/libelf/gelf_xlatetof.3#2 integrate
.. //depot/projects/mips2/src/lib/libelf/libelf_data.c#2 integrate
.. //depot/projects/mips2/src/lib/libelf/libelf_xlate.c#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_acquire_cred.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/Makefile#3 integrate
.. //depot/projects/mips2/src/lib/libkse/arch/amd64/include/atomic_ops.h#2 integrate
.. //depot/projects/mips2/src/lib/libkse/arch/amd64/include/pthread_md.h#2 integrate
.. //depot/projects/mips2/src/lib/libkse/arch/arm/include/atomic_ops.h#2 integrate
.. //depot/projects/mips2/src/lib/libkse/arch/i386/include/atomic_ops.h#2 integrate
.. //depot/projects/mips2/src/lib/libkse/arch/i386/include/pthread_md.h#2 integrate
.. //depot/projects/mips2/src/lib/libkse/arch/ia64/include/atomic_ops.h#2 integrate
.. //depot/projects/mips2/src/lib/libkse/arch/ia64/include/pthread_md.h#2 integrate
.. //depot/projects/mips2/src/lib/libkse/arch/powerpc/include/atomic_ops.h#2 integrate
.. //depot/projects/mips2/src/lib/libkse/arch/powerpc/include/pthread_md.h#2 integrate
.. //depot/projects/mips2/src/lib/libkse/arch/sparc64/include/atomic_ops.h#2 integrate
.. //depot/projects/mips2/src/lib/libkse/arch/sparc64/include/pthread_md.h#2 integrate
.. //depot/projects/mips2/src/lib/libkse/kse.map#2 integrate
.. //depot/projects/mips2/src/lib/libkse/sys/lock.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/sys/lock.h#2 integrate
.. //depot/projects/mips2/src/lib/libkse/sys/thr_error.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_accept.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_aio_suspend.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_atfork.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_destroy.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_get_np.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_getdetachstate.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_getguardsize.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_getinheritsched.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_getschedparam.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_getschedpolicy.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_getscope.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_getstack.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_getstackaddr.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_getstacksize.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_init.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_setdetachstate.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_setguardsize.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_setinheritsched.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_setschedparam.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_setschedpolicy.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_setscope.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_setstack.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_setstackaddr.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_setstacksize.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_barrier.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_barrierattr.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_cancel.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_clean.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_close.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_concurrency.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_cond.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_condattr_destroy.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_condattr_init.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_condattr_pshared.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_connect.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_creat.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_create.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_detach.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_equal.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_execve.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_exit.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_fcntl.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_find_thread.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_fork.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_fsync.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_getschedparam.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_info.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_init.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_join.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_kern.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_kill.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_main_np.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_mattr_init.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_mattr_kind_np.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_mattr_pshared.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_msync.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_multi_np.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_mutex.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_mutex_prioceiling.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_mutex_protocol.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_mutexattr_destroy.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_nanosleep.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_once.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_open.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_pause.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_poll.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_priority_queue.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_private.h#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_pselect.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_pspinlock.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_raise.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_read.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_readv.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_resume_np.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_rtld.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_rwlock.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_rwlockattr.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_select.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_self.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_seterrno.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_setprio.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_setschedparam.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_sig.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_sigaction.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_sigaltstack.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_sigmask.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_sigpending.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_sigprocmask.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_sigsuspend.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_sigwait.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_single_np.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_sleep.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_spec.c#3 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_spinlock.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_stack.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_suspend_np.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_switch_np.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_symbols.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_system.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_tcdrain.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_vfork.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_wait.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_wait4.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_waitpid.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_write.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_writev.c#2 integrate
.. //depot/projects/mips2/src/lib/libkse/thread/thr_yield.c#2 integrate
.. //depot/projects/mips2/src/lib/libpmc/Makefile#2 integrate
.. //depot/projects/mips2/src/lib/libpmc/pmc.3#4 integrate
.. //depot/projects/mips2/src/lib/libpmc/pmc_allocate.3#1 branch
.. //depot/projects/mips2/src/lib/libpmc/pmc_attach.3#1 branch
.. //depot/projects/mips2/src/lib/libpmc/pmc_capabilities.3#1 branch
.. //depot/projects/mips2/src/lib/libpmc/pmc_configure_logfile.3#1 branch
.. //depot/projects/mips2/src/lib/libpmc/pmc_disable.3#1 branch
.. //depot/projects/mips2/src/lib/libpmc/pmc_event_names_of_class.3#1 branch
.. //depot/projects/mips2/src/lib/libpmc/pmc_get_driver_stats.3#1 branch
.. //depot/projects/mips2/src/lib/libpmc/pmc_get_msr.3#1 branch
.. //depot/projects/mips2/src/lib/libpmc/pmc_init.3#1 branch
.. //depot/projects/mips2/src/lib/libpmc/pmc_name_of_capability.3#1 branch
.. //depot/projects/mips2/src/lib/libpmc/pmc_read.3#1 branch
.. //depot/projects/mips2/src/lib/libpmc/pmc_set.3#1 branch
.. //depot/projects/mips2/src/lib/libpmc/pmc_start.3#1 branch
.. //depot/projects/mips2/src/lib/libpmc/pmclog.c#2 integrate
.. //depot/projects/mips2/src/lib/libpmc/pmclog.h#2 integrate
.. //depot/projects/mips2/src/lib/libthr/pthread.map#4 integrate
.. //depot/projects/mips2/src/lib/libthr/thread/thr_mutex.c#7 integrate
.. //depot/projects/mips2/src/lib/libthr/thread/thr_sem.c#4 integrate
.. //depot/projects/mips2/src/libexec/rtld-elf/sparc64/rtld_machdep.h#2 integrate
.. //depot/projects/mips2/src/libexec/tftpd/Makefile#2 integrate
.. //depot/projects/mips2/src/libexec/tftpd/tftpd.8#4 integrate
.. //depot/projects/mips2/src/libexec/tftpd/tftpd.c#2 integrate
.. //depot/projects/mips2/src/release/Makefile#8 integrate
.. //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#11 integrate
.. //depot/projects/mips2/src/release/doc/share/sgml/release.ent#5 integrate
.. //depot/projects/mips2/src/release/picobsd/tinyware/msg/msg.c#2 integrate
.. //depot/projects/mips2/src/sbin/atacontrol/atacontrol.8#2 integrate
.. //depot/projects/mips2/src/sbin/geom/class/nop/gnop.8#3 integrate
.. //depot/projects/mips2/src/sbin/ipfw/ipfw.8#8 integrate
.. //depot/projects/mips2/src/sbin/mdconfig/mdconfig.8#5 integrate
.. //depot/projects/mips2/src/sbin/mount/mount.8#6 integrate
.. //depot/projects/mips2/src/sbin/newfs/newfs.8#3 integrate
.. //depot/projects/mips2/src/sbin/newfs/newfs.c#3 integrate
.. //depot/projects/mips2/src/sbin/newfs/newfs.h#3 integrate
.. //depot/projects/mips2/src/sbin/sysctl/sysctl.8#4 integrate
.. //depot/projects/mips2/src/share/man/man4/aac.4#4 integrate
.. //depot/projects/mips2/src/share/man/man4/agp.4#2 integrate
.. //depot/projects/mips2/src/share/man/man4/enc.4#5 integrate
.. //depot/projects/mips2/src/share/man/man4/hwpmc.4#4 integrate
.. //depot/projects/mips2/src/share/man/man4/ichsmb.4#2 integrate
.. //depot/projects/mips2/src/share/man/man4/msk.4#4 integrate
.. //depot/projects/mips2/src/share/man/man4/nfe.4#6 integrate
.. //depot/projects/mips2/src/share/man/man4/rl.4#3 integrate
.. //depot/projects/mips2/src/share/man/man9/Makefile#8 integrate
.. //depot/projects/mips2/src/share/man/man9/rwlock.9#4 integrate
.. //depot/projects/mips2/src/share/man/man9/stack.9#1 branch
.. //depot/projects/mips2/src/share/man/man9/sx.9#5 integrate
.. //depot/projects/mips2/src/share/misc/iso3166#3 integrate
.. //depot/projects/mips2/src/share/mk/bsd.sys.mk#5 integrate
.. //depot/projects/mips2/src/share/mk/sys.mk#10 integrate
.. //depot/projects/mips2/src/share/zoneinfo/asia#5 integrate
.. //depot/projects/mips2/src/share/zoneinfo/northamerica#6 integrate
.. //depot/projects/mips2/src/share/zoneinfo/southamerica#5 integrate
.. //depot/projects/mips2/src/share/zoneinfo/zone.tab#5 integrate
.. //depot/projects/mips2/src/sys/amd64/amd64/busdma_machdep.c#5 integrate
.. //depot/projects/mips2/src/sys/amd64/amd64/db_trace.c#5 integrate
.. //depot/projects/mips2/src/sys/amd64/amd64/genassym.c#5 integrate
.. //depot/projects/mips2/src/sys/amd64/amd64/pmap.c#12 integrate
.. //depot/projects/mips2/src/sys/amd64/amd64/prof_machdep.c#3 integrate
.. //depot/projects/mips2/src/sys/amd64/amd64/stack_machdep.c#1 branch
.. //depot/projects/mips2/src/sys/amd64/amd64/trap.c#7 integrate
.. //depot/projects/mips2/src/sys/amd64/conf/GENERIC#8 integrate
.. //depot/projects/mips2/src/sys/amd64/conf/NOTES#7 integrate
.. //depot/projects/mips2/src/sys/amd64/include/pci_cfgreg.h#2 integrate
.. //depot/projects/mips2/src/sys/amd64/include/stack.h#1 branch
.. //depot/projects/mips2/src/sys/amd64/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/mips2/src/sys/arm/arm/busdma_machdep.c#6 integrate
.. //depot/projects/mips2/src/sys/arm/arm/cpufunc.c#6 integrate
.. //depot/projects/mips2/src/sys/arm/arm/db_trace.c#3 integrate
.. //depot/projects/mips2/src/sys/arm/arm/nexus_io.c#3 delete
.. //depot/projects/mips2/src/sys/arm/arm/nexus_io_asm.S#2 delete
.. //depot/projects/mips2/src/sys/arm/arm/pmap.c#8 integrate
.. //depot/projects/mips2/src/sys/arm/arm/stack_machdep.c#1 branch
.. //depot/projects/mips2/src/sys/arm/conf/AVILA#4 integrate
.. //depot/projects/mips2/src/sys/arm/conf/BWCT#2 integrate
.. //depot/projects/mips2/src/sys/arm/conf/CRB#3 integrate
.. //depot/projects/mips2/src/sys/arm/conf/EP80219#2 integrate
.. //depot/projects/mips2/src/sys/arm/conf/HL200#2 integrate
.. //depot/projects/mips2/src/sys/arm/conf/IQ31244#3 integrate
.. //depot/projects/mips2/src/sys/arm/conf/KB920X#5 integrate
.. //depot/projects/mips2/src/sys/arm/conf/SIMICS#3 integrate
.. //depot/projects/mips2/src/sys/arm/conf/SKYEYE#3 integrate
.. //depot/projects/mips2/src/sys/arm/include/asmacros.h#3 integrate
.. //depot/projects/mips2/src/sys/arm/include/atomic.h#3 integrate
.. //depot/projects/mips2/src/sys/arm/include/stack.h#1 branch
.. //depot/projects/mips2/src/sys/arm/sa11x0/files.sa11x0#2 integrate
.. //depot/projects/mips2/src/sys/boot/i386/gptboot/gptldr.S#2 integrate
.. //depot/projects/mips2/src/sys/boot/i386/pmbr/pmbr.s#2 integrate
.. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_misc.c#6 integrate
.. //depot/projects/mips2/src/sys/compat/linprocfs/linprocfs.c#7 integrate
.. //depot/projects/mips2/src/sys/compat/ndis/ndis_var.h#3 integrate
.. //depot/projects/mips2/src/sys/compat/ndis/ntoskrnl_var.h#3 integrate
.. //depot/projects/mips2/src/sys/compat/ndis/subr_ndis.c#4 integrate
.. //depot/projects/mips2/src/sys/compat/ndis/subr_ntoskrnl.c#6 integrate
.. //depot/projects/mips2/src/sys/compat/opensolaris/rpc/xdr.h#2 integrate
.. //depot/projects/mips2/src/sys/compat/opensolaris/sys/atomic.h#3 integrate
.. //depot/projects/mips2/src/sys/compat/opensolaris/sys/bitmap.h#1 branch
.. //depot/projects/mips2/src/sys/compat/opensolaris/sys/cpupart.h#1 branch
.. //depot/projects/mips2/src/sys/compat/opensolaris/sys/cpuvar.h#1 branch
.. //depot/projects/mips2/src/sys/compat/opensolaris/sys/cyclic.h#1 branch
.. //depot/projects/mips2/src/sys/compat/opensolaris/sys/elf.h#1 branch
.. //depot/projects/mips2/src/sys/compat/opensolaris/sys/kmem.h#2 integrate
.. //depot/projects/mips2/src/sys/compat/opensolaris/sys/mman.h#1 branch
.. //depot/projects/mips2/src/sys/compat/opensolaris/sys/modctl.h#1 branch
.. //depot/projects/mips2/src/sys/compat/opensolaris/sys/objfs.h#1 branch
.. //depot/projects/mips2/src/sys/compat/opensolaris/sys/param.h#1 branch
.. //depot/projects/mips2/src/sys/compat/opensolaris/sys/pcpu.h#1 branch
.. //depot/projects/mips2/src/sys/compat/opensolaris/sys/proc.h#4 integrate
.. //depot/projects/mips2/src/sys/compat/opensolaris/sys/stat.h#1 branch
.. //depot/projects/mips2/src/sys/compat/opensolaris/sys/time.h#2 integrate
.. //depot/projects/mips2/src/sys/compat/opensolaris/sys/types.h#3 integrate
.. //depot/projects/mips2/src/sys/conf/NOTES#11 integrate
.. //depot/projects/mips2/src/sys/conf/files#13 integrate
.. //depot/projects/mips2/src/sys/conf/files.amd64#9 integrate
.. //depot/projects/mips2/src/sys/conf/files.arm#6 integrate
.. //depot/projects/mips2/src/sys/conf/files.i386#10 integrate
.. //depot/projects/mips2/src/sys/conf/files.ia64#7 integrate
.. //depot/projects/mips2/src/sys/conf/files.pc98#7 integrate
.. //depot/projects/mips2/src/sys/conf/files.powerpc#7 integrate
.. //depot/projects/mips2/src/sys/conf/files.sparc64#4 integrate
.. //depot/projects/mips2/src/sys/conf/files.sun4v#4 integrate
.. //depot/projects/mips2/src/sys/conf/options#9 integrate
.. //depot/projects/mips2/src/sys/conf/options.amd64#4 integrate
.. //depot/projects/mips2/src/sys/conf/options.i386#4 integrate
.. //depot/projects/mips2/src/sys/contrib/ipfilter/netinet/fil.c#5 integrate
.. //depot/projects/mips2/src/sys/contrib/ipfilter/netinet/ip_auth.c#5 integrate
.. //depot/projects/mips2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#5 integrate
.. //depot/projects/mips2/src/sys/contrib/opensolaris/common/avl/avl.c#2 integrate
.. //depot/projects/mips2/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate
.. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 integrate
.. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate
.. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate
.. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate
.. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate
.. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#4 integrate
.. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate
.. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate
.. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate
.. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate
.. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/procset.h#2 integrate
.. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate
.. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#2 integrate
.. //depot/projects/mips2/src/sys/dev/aac/aac_debug.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/agp/agp_i810.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/amr/amr.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/amr/amr_cam.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/amr/amr_pci.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/an/if_an.c#7 integrate
.. //depot/projects/mips2/src/sys/dev/asmc/asmc.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/ata/ata-chipset.c#9 integrate
.. //depot/projects/mips2/src/sys/dev/ata/ata-disk.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/em/if_em.c#8 integrate
.. //depot/projects/mips2/src/sys/dev/em/if_em.h#7 integrate
.. //depot/projects/mips2/src/sys/dev/hwpmc/hwpmc_x86.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/ichsmb/ichsmb_pci.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/if_ndis/if_ndis.c#6 integrate
.. //depot/projects/mips2/src/sys/dev/if_ndis/if_ndis_pci.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/if_ndis/if_ndisvar.h#3 integrate
.. //depot/projects/mips2/src/sys/dev/ipw/if_ipw.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/msk/if_msk.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/msk/if_mskreg.h#4 integrate
.. //depot/projects/mips2/src/sys/dev/random/yarrow.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/re/if_re.c#9 integrate
.. //depot/projects/mips2/src/sys/dev/si/si_pci.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/sio/sio.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/sio/sio_isa.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/sio/sio_puc.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/snp/snp.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/sound/pci/hda/hdac.c#6 integrate
.. //depot/projects/mips2/src/sys/dev/sound/pcm/channel.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/usb/if_zyd.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb/usbdevs#9 integrate
.. //depot/projects/mips2/src/sys/dev/wpi/if_wpi.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/wpi/if_wpireg.h#2 integrate
.. //depot/projects/mips2/src/sys/fs/tmpfs/tmpfs_vnops.c#6 integrate
.. //depot/projects/mips2/src/sys/i386/conf/GENERIC#8 integrate
.. //depot/projects/mips2/src/sys/i386/conf/NOTES#7 integrate
.. //depot/projects/mips2/src/sys/i386/conf/XBOX#3 integrate
.. //depot/projects/mips2/src/sys/i386/i386/busdma_machdep.c#5 integrate
.. //depot/projects/mips2/src/sys/i386/i386/db_trace.c#4 integrate
.. //depot/projects/mips2/src/sys/i386/i386/genassym.c#5 integrate
.. //depot/projects/mips2/src/sys/i386/i386/pmap.c#11 integrate
.. //depot/projects/mips2/src/sys/i386/i386/stack_machdep.c#1 branch
.. //depot/projects/mips2/src/sys/i386/i386/trap.c#8 integrate
.. //depot/projects/mips2/src/sys/i386/include/stack.h#1 branch
.. //depot/projects/mips2/src/sys/i386/isa/prof_machdep.c#3 integrate
.. //depot/projects/mips2/src/sys/i386/linux/linux_machdep.c#4 integrate
.. //depot/projects/mips2/src/sys/i386/pci/pci_cfgreg.c#3 integrate
.. //depot/projects/mips2/src/sys/ia64/conf/GENERIC#7 integrate
.. //depot/projects/mips2/src/sys/ia64/ia64/busdma_machdep.c#4 integrate
.. //depot/projects/mips2/src/sys/ia64/ia64/db_machdep.c#6 integrate
.. //depot/projects/mips2/src/sys/ia64/ia64/stack_machdep.c#1 branch
.. //depot/projects/mips2/src/sys/ia64/include/atomic.h#3 integrate
.. //depot/projects/mips2/src/sys/kern/imgact_elf.c#6 integrate
.. //depot/projects/mips2/src/sys/kern/init_main.c#7 integrate
.. //depot/projects/mips2/src/sys/kern/kern_clock.c#6 integrate
.. //depot/projects/mips2/src/sys/kern/kern_conf.c#4 integrate
.. //depot/projects/mips2/src/sys/kern/kern_descrip.c#7 integrate
.. //depot/projects/mips2/src/sys/kern/kern_exec.c#6 integrate
.. //depot/projects/mips2/src/sys/kern/kern_linker.c#7 integrate
.. //depot/projects/mips2/src/sys/kern/kern_lock.c#6 integrate
.. //depot/projects/mips2/src/sys/kern/kern_mbuf.c#6 integrate
.. //depot/projects/mips2/src/sys/kern/kern_mib.c#4 integrate
.. //depot/projects/mips2/src/sys/kern/kern_mutex.c#7 integrate
.. //depot/projects/mips2/src/sys/kern/kern_proc.c#8 integrate
.. //depot/projects/mips2/src/sys/kern/kern_rwlock.c#6 integrate
.. //depot/projects/mips2/src/sys/kern/kern_sysctl.c#5 integrate
.. //depot/projects/mips2/src/sys/kern/kern_timeout.c#6 integrate
.. //depot/projects/mips2/src/sys/kern/subr_bus.c#6 integrate
.. //depot/projects/mips2/src/sys/kern/subr_stack.c#2 integrate
.. //depot/projects/mips2/src/sys/kern/subr_witness.c#7 integrate
.. //depot/projects/mips2/src/sys/kern/vfs_bio.c#9 integrate
.. //depot/projects/mips2/src/sys/kern/vfs_cache.c#6 integrate
.. //depot/projects/mips2/src/sys/kern/vfs_mount.c#8 integrate
.. //depot/projects/mips2/src/sys/kern/vfs_subr.c#9 integrate
.. //depot/projects/mips2/src/sys/modules/amr/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/modules/zfs/Makefile#3 integrate
.. //depot/projects/mips2/src/sys/net/if_enc.c#5 integrate
.. //depot/projects/mips2/src/sys/net/if_lagg.c#6 integrate
.. //depot/projects/mips2/src/sys/net/pfil.c#2 integrate
.. //depot/projects/mips2/src/sys/net/pfil.h#3 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211.c#6 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211.h#7 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_ht.c#4 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_node.c#5 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_output.c#7 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_proto.c#6 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_scan_sta.c#3 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_var.h#6 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_cisco.c#2 integrate
.. //depot/projects/mips2/src/sys/netinet/if_ether.c#5 integrate
.. //depot/projects/mips2/src/sys/netinet/ip_input.c#6 integrate
.. //depot/projects/mips2/src/sys/netinet/libalias/alias_util.c#3 integrate
.. //depot/projects/mips2/src/sys/netinet/sctp.h#6 integrate
.. //depot/projects/mips2/src/sys/netinet/sctp_output.c#9 integrate
.. //depot/projects/mips2/src/sys/netinet/sctp_structs.h#8 integrate
.. //depot/projects/mips2/src/sys/netinet/sctp_usrreq.c#10 integrate
.. //depot/projects/mips2/src/sys/netinet/sctputil.c#11 integrate
.. //depot/projects/mips2/src/sys/netinet/tcp_output.c#8 integrate
.. //depot/projects/mips2/src/sys/netinet/tcp_subr.c#10 integrate
.. //depot/projects/mips2/src/sys/netinet/tcp_syncache.c#10 integrate
.. //depot/projects/mips2/src/sys/netipsec/ipsec.c#4 integrate
.. //depot/projects/mips2/src/sys/netipsec/ipsec.h#3 integrate
.. //depot/projects/mips2/src/sys/netipsec/ipsec_input.c#5 integrate
.. //depot/projects/mips2/src/sys/netipsec/ipsec_output.c#3 integrate
.. //depot/projects/mips2/src/sys/netipsec/xform.h#2 integrate
.. //depot/projects/mips2/src/sys/netipsec/xform_ipip.c#3 integrate
.. //depot/projects/mips2/src/sys/pc98/conf/GENERIC#7 integrate
.. //depot/projects/mips2/src/sys/pc98/include/stack.h#1 branch
.. //depot/projects/mips2/src/sys/pci/if_rl.c#5 integrate
.. //depot/projects/mips2/src/sys/pci/if_rlreg.h#6 integrate
.. //depot/projects/mips2/src/sys/pci/xrpu.c#2 delete
.. //depot/projects/mips2/src/sys/powerpc/conf/GENERIC#7 integrate
.. //depot/projects/mips2/src/sys/powerpc/include/atomic.h#4 integrate
.. //depot/projects/mips2/src/sys/powerpc/include/stack.h#1 branch
.. //depot/projects/mips2/src/sys/powerpc/powerpc/db_trace.c#3 integrate
.. //depot/projects/mips2/src/sys/powerpc/powerpc/stack_machdep.c#1 branch
.. //depot/projects/mips2/src/sys/security/audit/audit.c#6 integrate
.. //depot/projects/mips2/src/sys/sparc64/conf/GENERIC#7 integrate
.. //depot/projects/mips2/src/sys/sparc64/include/stack.h#1 branch
.. //depot/projects/mips2/src/sys/sparc64/pci/ofw_pcibus.c#5 integrate
.. //depot/projects/mips2/src/sys/sparc64/pci/psycho.c#6 integrate
.. //depot/projects/mips2/src/sys/sparc64/pci/psychovar.h#4 integrate
.. //depot/projects/mips2/src/sys/sparc64/sparc64/db_trace.c#3 integrate
.. //depot/projects/mips2/src/sys/sparc64/sparc64/stack_machdep.c#1 branch
.. //depot/projects/mips2/src/sys/sun4v/conf/GENERIC#5 integrate
.. //depot/projects/mips2/src/sys/sun4v/include/pcpu.h#4 integrate
.. //depot/projects/mips2/src/sys/sun4v/include/stack.h#1 branch
.. //depot/projects/mips2/src/sys/sun4v/sun4v/db_trace.c#2 integrate
.. //depot/projects/mips2/src/sys/sun4v/sun4v/stack_machdep.c#1 branch
.. //depot/projects/mips2/src/sys/sys/_elf_solaris.h#2 delete
.. //depot/projects/mips2/src/sys/sys/elf.h#2 integrate
.. //depot/projects/mips2/src/sys/sys/elf_common.h#3 integrate
.. //depot/projects/mips2/src/sys/sys/kernel.h#5 integrate
.. //depot/projects/mips2/src/sys/sys/linker.h#4 integrate
.. //depot/projects/mips2/src/sys/sys/lockmgr.h#3 integrate
.. //depot/projects/mips2/src/sys/sys/param.h#8 integrate
.. //depot/projects/mips2/src/sys/sys/pcpu.h#5 integrate
.. //depot/projects/mips2/src/sys/sys/pmc.h#2 integrate
.. //depot/projects/mips2/src/sys/sys/pmclog.h#2 integrate
.. //depot/projects/mips2/src/sys/sys/proc.h#9 integrate
.. //depot/projects/mips2/src/sys/sys/resource.h#3 integrate
.. //depot/projects/mips2/src/sys/sys/signal.h#2 integrate
.. //depot/projects/mips2/src/sys/sys/stack.h#2 integrate
.. //depot/projects/mips2/src/sys/sys/stat.h#3 integrate
.. //depot/projects/mips2/src/sys/sys/sysctl.h#7 integrate
.. //depot/projects/mips2/src/sys/sys/systm.h#7 integrate
.. //depot/projects/mips2/src/sys/sys/time.h#3 integrate
.. //depot/projects/mips2/src/sys/sys/types.h#3 integrate
.. //depot/projects/mips2/src/sys/sys/user.h#10 integrate
.. //depot/projects/mips2/src/sys/sys/xrpuio.h#2 delete
.. //depot/projects/mips2/src/sys/ufs/ffs/ffs_alloc.c#7 integrate
.. //depot/projects/mips2/src/sys/vm/redzone.c#2 integrate
.. //depot/projects/mips2/src/sys/vm/vm_contig.c#6 integrate
.. //depot/projects/mips2/src/sys/vm/vm_page.c#8 integrate
.. //depot/projects/mips2/src/sys/vm/vm_pageout.c#5 integrate
.. //depot/projects/mips2/src/sys/vm/vm_pageout.h#2 integrate
.. //depot/projects/mips2/src/sys/vm/vnode_pager.c#9 integrate
.. //depot/projects/mips2/src/tools/regression/lib/libc/stdio/test-printfloat.c#2 integrate
.. //depot/projects/mips2/src/tools/regression/lib/libc/stdio/test-scanfloat.c#3 integrate
.. //depot/projects/mips2/src/tools/regression/netinet/tcpconnect/README.tcp-md5#1 branch
.. //depot/projects/mips2/src/tools/regression/netinet/tcpconnect/tcpconnect.c#2 integrate
.. //depot/projects/mips2/src/tools/tools/ath/athdebug/athdebug.c#2 integrate
.. //depot/projects/mips2/src/tools/tools/ath/athstats/athstats.c#3 integrate
.. //depot/projects/mips2/src/tools/tools/ath/athstats/athstats.h#2 integrate
.. //depot/projects/mips2/src/tools/tools/ath/athstats/main.c#2 integrate
.. //depot/projects/mips2/src/tools/tools/ath/athstats/statfoo.c#2 integrate
.. //depot/projects/mips2/src/tools/tools/ath/athstats/statfoo.h#2 integrate
.. //depot/projects/mips2/src/tools/tools/net80211/wlanstats/main.c#3 integrate
.. //depot/projects/mips2/src/tools/tools/net80211/wlanstats/statfoo.c#3 integrate
.. //depot/projects/mips2/src/tools/tools/net80211/wlanstats/statfoo.h#2 integrate
.. //depot/projects/mips2/src/tools/tools/net80211/wlanstats/wlanstats.c#5 integrate
.. //depot/projects/mips2/src/tools/tools/net80211/wlanstats/wlanstats.h#2 integrate
.. //depot/projects/mips2/src/tools/tools/net80211/wlanwatch/wlanwatch.c#2 integrate
.. //depot/projects/mips2/src/usr.bin/Makefile#6 integrate
.. //depot/projects/mips2/src/usr.bin/fstat/zfs/Makefile#3 integrate
.. //depot/projects/mips2/src/usr.bin/login/login.1#3 integrate
.. //depot/projects/mips2/src/usr.bin/make/main.c#6 integrate
.. //depot/projects/mips2/src/usr.bin/procstat/Makefile#1 branch
.. //depot/projects/mips2/src/usr.bin/procstat/procstat.1#1 branch
.. //depot/projects/mips2/src/usr.bin/procstat/procstat.c#1 branch
.. //depot/projects/mips2/src/usr.bin/procstat/procstat.h#1 branch
.. //depot/projects/mips2/src/usr.bin/procstat/procstat_args.c#1 branch
.. //depot/projects/mips2/src/usr.bin/procstat/procstat_basic.c#1 branch
.. //depot/projects/mips2/src/usr.bin/procstat/procstat_bin.c#1 branch
.. //depot/projects/mips2/src/usr.bin/procstat/procstat_cred.c#1 branch
.. //depot/projects/mips2/src/usr.bin/procstat/procstat_files.c#1 branch
.. //depot/projects/mips2/src/usr.bin/procstat/procstat_kstack.c#1 branch
.. //depot/projects/mips2/src/usr.bin/procstat/procstat_threads.c#1 branch
.. //depot/projects/mips2/src/usr.bin/procstat/procstat_vm.c#1 branch
.. //depot/projects/mips2/src/usr.sbin/newsyslog/newsyslog.conf.5#4 integrate
.. //depot/projects/mips2/src/usr.sbin/pmcstat/pmcstat_log.c#2 integrate
.. //depot/projects/mips2/src/usr.sbin/zic/zic.c#2 integrate

Differences ...

==== //depot/projects/mips2/src/Makefile.inc1#7 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.590 2007/10/31 09:26:42 yar Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.591 2007/12/04 12:55:27 yar Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -591,17 +591,25 @@
 #
 distributeworld installworld: installcheck
 	mkdir -p ${INSTALLTMP}
-	for prog in ${ITOOLS}; do \
+	progs=$$(for prog in ${ITOOLS}; do \
 		if progpath=`which $$prog`; then \
-			progs="$$progs $$progpath"; \
+			echo $$progpath; \
 		else \
 			echo "Required tool $$prog not found in PATH." >&2; \
 			exit 1; \
 		fi; \
-	done; \
-	cp $$progs ${INSTALLTMP}; \
-	cp `ldd -f "%p\n" -f "%p\n" $$progs 2>/dev/null | \
-	    sort -u` ${INSTALLTMP}
+	    done); \
+	libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | \
+	    while read line; do \
+		set -- $$line; \
+		if [ "$$2 $$3" != "not found" ]; then \
+			echo $$2; \
+		else \
+			echo "Required library $$1 not found." >&2; \
+			exit 1; \
+		fi; \
+	    done); \
+	cp $$libs $$progs ${INSTALLTMP}
 	cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale
 	${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
 	    ${IMAKEENV} rm -rf ${INSTALLTMP}

==== //depot/projects/mips2/src/ObsoleteFiles.inc#11 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.120 2007/11/21 10:49:33 ru Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.123 2007/11/29 21:49:08 brooks 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,14 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20071129: Disabled static versions of libkse by default
+.if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no"
+OLD_FILES+=usr/lib/libkse.a
+OLD_FILES+=usr/lib/libkse_p.a
+OLD_FILES+=usr/lib/libkse_pic.a
+.endif
+# 20071129: Removed a Solaris compatibility header
+OLD_FILES+=usr/include/sys/_elf_solaris.h
 # 20071108: Removed very crunch OLDCARD support file
 OLD_FILES+=etc/defaults/pccard.conf
 # 20071104: Removed bsdlabel, fdisk and gpt from rescue on ia64.
@@ -3964,9 +3972,10 @@
 #  - usr/share/tmac/mm/se_locale
 #  - var/yp/Makefile
 
-# 20071119: shared library version bump
+# 20071120: shared library version bump
 OLD_LIBS+=usr/lib/libasn1.so.8
 OLD_LIBS+=usr/lib/libgssapi.so.8
+OLD_LIBS+=usr/lib/libgssapi_krb5.so.8
 OLD_LIBS+=usr/lib/libhdb.so.8
 OLD_LIBS+=usr/lib/libkadm5clnt.so.8
 OLD_LIBS+=usr/lib/libkadm5srv.so.8

==== //depot/projects/mips2/src/UPDATING#9 (text+ko) ====

@@ -21,6 +21,10 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20071128:
+	The ADAPTIVE_GIANT kernel option has been retired because its
+	functionality is the default now.
+
 20071118:
 	The AT keyboard emulation of sunkbd(4) has been turned on
 	by default. In order to make the special symbols of the Sun
@@ -945,4 +949,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.512 2007/11/18 18:11:16 marius Exp $
+$FreeBSD: src/UPDATING,v 1.513 2007/11/28 13:04:11 matteo Exp $

==== //depot/projects/mips2/src/cddl/Makefile.inc#2 (text+ko) ====

@@ -1,3 +1,6 @@
-# $FreeBSD: src/cddl/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $
+# $FreeBSD: src/cddl/Makefile.inc,v 1.3 2007/11/28 22:58:09 jb Exp $
+
+OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../contrib/opensolaris
+OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/contrib/opensolaris
 
-CFLAGS+= -D_SOLARIS_C_SOURCE
+IGNORE_PRAGMA=	YES

==== //depot/projects/mips2/src/cddl/lib/libnvpair/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $
+# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.3 2007/11/28 22:58:09 jb Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
 .PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair
@@ -10,8 +10,8 @@
 	nvpair_alloc_fixed.c \
 	nvpair.c
 
+CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
 CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../include		# XXX
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
 
 .include 

==== //depot/projects/mips2/src/contrib/bind9/CHANGES#5 (text+ko) ====

@@ -1,5 +1,117 @@
 
-	--- 9.4.1-P1 released ---
+	--- 9.4.2 released ---
+	--- 9.4.2rc2 released ---
+
+2259.	[bug]		Reverse incorrect LIBINTERFACE bump of libisc
+			in 9.4.2rc1.  Applications built against 9.4.2rc1
+			will need to be rebuilt.
+
+2258.	[bug]		Fallback from IXFR/TSIG to SOA/AXFR/TSIG broken.
+			[RT #17241]
+
+2257.	[bug]		win32: Use the full path to vcredist_x86.exe when
+			calling it. [RT #17222]
+
+2256.	[bug]		win32: Correctly register the installation location of
+			bindevt.dll. [RT #17159]
+
+2255.	[bug]		L.ROOT-SERVERS.NET is now 199.7.83.42.
+
+2254.	[bug]		timer.c:dispatch() failed to lock timer->lock
+			when reading timer->idle allowing it to see
+			intermediate values as timer->idle was reset by
+			isc_timer_touch(). [RT #17243]
+
+	--- 9.4.2rc1 released ---
+
+2251.	[doc]		Update memstatistics-file documentation to reflect
+			reality. Note there is behaviour change for BIND 9.5.
+			[RT #17113]
+
+2249.   [bug]           Only set Authentic Data bit if client requested
+                        DNSSEC, per RFC 3655 [RT #17175]
+
+2248.   [cleanup]       Fix several errors reported by Coverity. [RT #17160]
+
+2245.	[bug]		Validating lack of DS records at trust anchors wasn't
+			working. [RT #17151]
+
+2238.	[bug]		It was possible to trigger a REQUIRE when a
+			validation was cancelled. [RT #17106]
+
+2237.	[bug]		libbind: res_init() was not thread aware. [RT #17123]
+
+2236.	[bug]		dnssec-signzone failed to preserve the case of
+			of wildcard owner names. [RT #17085]
+
+2235.	[bug]		 was not being installed. [RT #17135]
+
+2234.   [port]          Correct some compiler warnings on SCO OSr5 [RT #17134]
+  
+2232.	[bug]		dns_adb_findaddrinfo() could fail and return
+			ISC_R_SUCCESS. [RT #17137]
+
+2231.	[bug]		Building dlzbdb (contrib/dlz/bin/dlzbdb) was broken.
+			[RT #17088]
+
+2230.	[bug]		We could INSIST reading a corrupted journal.
+			[RT #17132]
+
+2228.	[contrib]	contrib: Change 2188 was incomplete.
+
+2227.	[cleanup]	Tidied up the FAQ. [RT #17121]
+
+2225.	[bug]		More support for systems with no IPv4 addresses.
+		        [RT #17111]
+
+2224.	[bug]		Defer journal compaction if a xfrin is in progress.
+			[RT #17119]
+
+2223.	[bug]		Make a new journal when compacting. [RT #17119]
+
+2221.	[bug]		Set the event result code to reflect the actual
+			record returned to caller when a cache update is
+			rejected due to a more credible answer existing.
+			[RT #17017]
+
+2220.	[bug]		win32: Address a race condition in final shutdown of
+			the Windows socket code. [RT #17028]
+			
+2219.	[bug]		Apply zone consistancy checks to additions, not
+			removals, when updating. [RT #17049]
+
+2218.	[bug]		Remove unnecessary REQUIRE from dns_validator_create().
+			[RT #16976]
+
+2216.	[cleanup]	Fix a number of errors reported by Coverity.
+		        [RT #17094]
+
+2215.	[bug]		Bad REQUIRE check isc_hmacsha1_verify(). [RT #17094]
+
+2214.	[bug]		Deregister OpenSSL lock callback when cleaning
+			up.  Reorder OpenSSL cleanup so that RAND_cleanup()
+			is called before the locks are destroyed. [RT #17098]
+
+2213.	[bug]		SIG0 diagnostic failure messages were looking at the
+			wrong status code. [RT #17101]
+
+2212.	[func]		'host -m' now causes memory statistics and active
+			memory to be printed at exit. [RT 17028]
+
+2210.	[bug]		Deleting class specific records via UPDATE could
+			fail.  [RT #17074]
+
+2209.	[port]		osx: linking against user supplied static OpenSSL
+			libraries failed as the system ones were still being
+			found. [RT #17078]
+
+2208.	[port]		win32: make sure both build methods produce the
+			same output. [RT #17058]
+
+2207.	[port]		Some implementations of getaddrinfo() fail to set
+			ai_canonname correctly. [RT #17061]
+
+	--- 9.4.2b1 released ---
 
 2206.	[security]	"allow-query-cache" and "allow-recursion" now
 			cross inherit from each other.
@@ -16,12 +128,32 @@
 
 			[RT #16987]
 	
+2205.	[bug]		libbind: change #2119 broke thread support. [RT #16982]
+
 2203.	[security]	Query id generation was cryptographically weak.
 			[RT # 16915]
 
 2202.	[security]	The default acls for allow-query-cache and 
 			allow-recursion were not being applied. [RT #16960]
 
+2200.	[bug]		The search for cached NSEC records was stopping to
+			early leading to excessive DLV queries. [RT #16930]

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Dec  5 13:34:08 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C5A3516A46B; Wed,  5 Dec 2007 13:34: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 7A90E16A468
	for ; Wed,  5 Dec 2007 13:34:07 +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 6392613C478
	for ; Wed,  5 Dec 2007 13:34:07 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB5DY7BK029194
	for ; Wed, 5 Dec 2007 13:34:07 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB5DY7xx029191
	for perforce@freebsd.org; Wed, 5 Dec 2007 13:34:07 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Wed, 5 Dec 2007 13:34:07 GMT
Message-Id: <200712051334.lB5DY7xx029191@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 130263 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 05 Dec 2007 13:34:08 -0000

http://perforce.freebsd.org/chv.cgi?CH=130263

Change 130263 by gonzo@gonzo_jeeves on 2007/12/05 13:33:39

	o Use __builtin_va_start instead of __builtin_stdarg_start. 
	  GCC4 obsoletes the former and  __builtin_va_start was present in 
	  all GCC version 3.1 and later.

Affected files ...

.. //depot/projects/mips2/src/sys/mips/include/stdarg.h#2 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/include/stdarg.h#2 (text+ko) ====

@@ -42,7 +42,7 @@
 #ifdef __GNUCLIKE_BUILTIN_STDARG
 
 #define	va_start(ap, last) \
-	__builtin_stdarg_start((ap), (last))
+	__builtin_va_start((ap), (last))
 
 #define	va_arg(ap, type) \
 	__builtin_va_arg((ap), type)

From owner-p4-projects@FreeBSD.ORG  Wed Dec  5 14:40:20 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6A29416A46E; Wed,  5 Dec 2007 14:40: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 D4CC916A417
	for ; Wed,  5 Dec 2007 14:40:19 +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 C418F13C465
	for ; Wed,  5 Dec 2007 14:40:19 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB5EeJBL039814
	for ; Wed, 5 Dec 2007 14:40:19 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB5EeJDK039810
	for perforce@freebsd.org; Wed, 5 Dec 2007 14:40:19 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Wed, 5 Dec 2007 14:40:19 GMT
Message-Id: <200712051440.lB5EeJDK039810@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 130265 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 05 Dec 2007 14:40:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=130265

Change 130265 by gonzo@gonzo_jeeves on 2007/12/05 14:40:16

	o Add stack_save/stack_save_td. MIPS stack unwinding is tough,
	   really tough, so let's start with  version from db_trace.c 

Affected files ...

.. //depot/projects/mips2/src/sys/conf/files.mips#20 edit
.. //depot/projects/mips2/src/sys/mips/mips/stack_machdep.c#1 add

Differences ...

==== //depot/projects/mips2/src/sys/conf/files.mips#20 (text+ko) ====

@@ -23,6 +23,7 @@
 mips/mips/mem.c			optional	mem
 mips/mips/nexus.c		standard
 mips/mips/pmap.c		standard
+mips/mips/stack_machdep.c	optional	ddb | stack
 mips/mips/support.S		standard
 mips/mips/swtch.S		standard
 mips/mips/sys_machdep.c		standard

From owner-p4-projects@FreeBSD.ORG  Wed Dec  5 16:38:41 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0ADD916A58C; Wed,  5 Dec 2007 16:38: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 9087716A59E
	for ; Wed,  5 Dec 2007 16:38:39 +0000 (UTC)
	(envelope-from swise@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8270813C45B
	for ; Wed,  5 Dec 2007 16:38:39 +0000 (UTC)
	(envelope-from swise@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB5Gcdha066074
	for ; Wed, 5 Dec 2007 16:38:39 GMT
	(envelope-from swise@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB5GcdfH066071
	for perforce@freebsd.org; Wed, 5 Dec 2007 16:38:39 GMT
	(envelope-from swise@FreeBSD.org)
Date: Wed, 5 Dec 2007 16:38:39 GMT
Message-Id: <200712051638.lB5GcdfH066071@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	swise@FreeBSD.org using -f
From: Steve Wise 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130272 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 05 Dec 2007 16:38:41 -0000

http://perforce.freebsd.org/chv.cgi?CH=130272

Change 130272 by swise@swise:vic10:iwarp on 2007/12/05 16:38:22

	iw_cxgb fixes to enable passive opens
		- refcount variable not initialized
		- added code to deal with passing meta-data in mbuf fields

Affected files ...

.. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.c#2 edit

Differences ...

==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.c#2 (text+ko) ====

@@ -286,6 +286,7 @@
 	epc = malloc(size, M_DEVBUF, flags);
 	if (epc) {
 		memset(epc, 0, size);
+		refcount_init(&epc->refcount, 1);
 		mtx_init(&epc->lock, "iwch_epc lock", NULL, MTX_DEF);
 	}
 	PDBG("%s alloc ep %p\n", __FUNCTION__, epc);
@@ -313,17 +314,16 @@
 static void
 process_task(void *ctx, int pending)
 {
-#ifdef notyet
 	struct mbuf *m = NULL;
 	void *ep;
 	struct t3cdev *tdev;
 	int ret;
 
 	while ((m = mbufq_dequeue(&rxq))) {
-#ifdef notyet 	
-		ep = *((void **) (skb->cb));
-		tdev = *((struct t3cdev **) (skb->cb + sizeof(void *)));
-		ret = work_handlers[G_OPCODE(ntohl((__force __be32)skb->csum))](tdev, skb, ep);
+		ep = m->m_pkthdr.rcvif;
+		tdev = (struct t3cdev *)m->m_pkthdr.header;
+		PDBG("%s dequeued mbuf %p ep %p tdev %p\n", __FUNCTION__, m, ep, tdev);
+		ret = work_handlers[G_OPCODE(ntohl(m->m_pkthdr.csum_data))](tdev, m, ep);
 		if (ret & CPL_RET_BUF_DONE)
 			m_free(m);
 
@@ -331,9 +331,7 @@
 		 * ep was referenced in sched(), and is freed here.
 		 */
 		put_ep((struct iwch_ep_common *)ep);
-#endif		
 	}
-#endif
 }
 
 static int
@@ -2109,21 +2107,14 @@
 
 	get_ep(epc);
 
-#ifdef notyet
-	/*
-	 * XXX :-/
-	 */
-	/*
-	 * Save ctx and tdev in the m->cb area.
-	 */
-	*((void **) skb->cb) = ctx;
-	*((struct t3cdev **) (skb->cb + sizeof(void *))) = tdev;
+	m->m_pkthdr.rcvif = (void *)ctx;
+	m->m_pkthdr.header = tdev;
 
-#endif	
 	/*
 	 * Queue the mbuf and schedule the worker thread.
 	 */
 	mbufq_tail(&rxq, m);
+	PDBG("%s enqueued mbuf %p ep %p tdev %p\n", __FUNCTION__, m, epc, tdev);
 	taskqueue_enqueue(mbuf_taskq, &mbuf_task);
 	return 0;
 }

From owner-p4-projects@FreeBSD.ORG  Wed Dec  5 17:17:25 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F17E816A41B; Wed,  5 Dec 2007 17:17:24 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9F3C516A417
	for ; Wed,  5 Dec 2007 17:17:24 +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 793EE13C448
	for ; Wed,  5 Dec 2007 17:17:24 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB5HHObg082905
	for ; Wed, 5 Dec 2007 17:17:24 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB5HHOqe082902
	for perforce@freebsd.org; Wed, 5 Dec 2007 17:17:24 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 5 Dec 2007 17:17:24 GMT
Message-Id: <200712051717.lB5HHOqe082902@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 130275 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 05 Dec 2007 17:17:25 -0000

http://perforce.freebsd.org/chv.cgi?CH=130275

Change 130275 by sam@sam_ebb on 2007/12/05 17:17:17

	yet another missed file

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_input.h#1 add

Differences ...

From owner-p4-projects@FreeBSD.ORG  Wed Dec  5 17:18:26 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1CD6616A41A; Wed,  5 Dec 2007 17:18:26 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D663F16A417
	for ; Wed,  5 Dec 2007 17:18:25 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C796B13C448
	for ; Wed,  5 Dec 2007 17:18:25 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB5HIPBp082930
	for ; Wed, 5 Dec 2007 17:18:25 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB5HIPoo082927
	for perforce@freebsd.org; Wed, 5 Dec 2007 17:18:25 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 5 Dec 2007 17:18:25 GMT
Message-Id: <200712051718.lB5HIPoo082927@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 130276 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 05 Dec 2007 17:18:26 -0000

http://perforce.freebsd.org/chv.cgi?CH=130276

Change 130276 by hselasky@hselasky_laptop001 on 2007/12/05 17:17:48

	
	Code size reduction. Factor out code. Maybe more factorization and
	simplification can be done? That needs to be checked by a
	FreeBSD IEEE80211 expert.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/if_rum.c#19 edit
.. //depot/projects/usb/src/sys/dev/usb/if_ural.c#43 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/if_rum.c#19 (text+ko) ====

@@ -137,7 +137,7 @@
 static uint8_t rum_cfg_bbp_init(struct rum_softc *sc);
 static uint8_t rum_cfg_bbp_read(struct rum_softc *sc, uint8_t reg);
 static uint8_t rum_plcp_signal(uint16_t rate);
-static void rum_bulk_write_callback_sub(struct usbd_xfer *xfer, struct mbuf *m, struct ieee80211_node *ni, uint32_t flags, uint16_t rate);
+static uint8_t rum_bulk_write_callback_sub(struct usbd_xfer *xfer, struct mbuf *m, struct ieee80211_node *ni, uint32_t flags, uint16_t rate);
 static void rum_cfg_amrr_start(struct rum_softc *sc);
 static void rum_cfg_bbp_write(struct rum_softc *sc, uint8_t reg, uint8_t val);
 static void rum_cfg_do_request(struct rum_softc *sc, usb_device_request_t *req, void *data);
@@ -1310,16 +1310,79 @@
 	return;
 }
 
-static void
+/*------------------------------------------------------------------------*
+ *	rum_bulk_write_callback_sub
+ *
+ * Returns:
+ *    0: Success
+ * Else: Failure
+ *------------------------------------------------------------------------*/
+static uint8_t
 rum_bulk_write_callback_sub(struct usbd_xfer *xfer, struct mbuf *m,
-    struct ieee80211_node *ni, uint32_t flags,
-    uint16_t rate)
+    struct ieee80211_node *ni, uint32_t flags, uint16_t rate)
 {
 	struct rum_softc *sc = xfer->priv_sc;
 	struct ieee80211com *ic = &(sc->sc_ic);
+	struct ieee80211_frame *wh;
+	struct ieee80211_key *k;
 	uint32_t temp_len;
+	uint16_t dur;
 	uint8_t align;
+	uint8_t type;
+	uint8_t sub_type;
+
+	wh = mtod(m, struct ieee80211_frame *);
 
+	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+		k = ieee80211_crypto_encap(ic, ni, m);
+		if (k == NULL) {
+			return (1);
+		}
+		/*
+		 * packet header may have moved, reset our
+		 * local pointer
+		 */
+		wh = mtod(m, struct ieee80211_frame *);
+	}
+	if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) {
+
+		type = (wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK);
+		sub_type = (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK);
+
+		if (type == IEEE80211_FC0_TYPE_DATA) {
+
+			flags |= (RT2573_TX_NEED_ACK |
+			    RT2573_TX_MORE_FRAG);
+
+			dur = rum_txtime(sc, RUM_ACK_SIZE, rum_ack_rate(ic, rate),
+			    ic->ic_flags) + sc->sc_sifs;
+
+			USETW(wh->i_dur, dur);
+
+		} else if ((type == IEEE80211_FC0_TYPE_MGT) &&
+		    (sub_type == IEEE80211_FC0_SUBTYPE_BEACON)) {
+
+			/* do nothing */
+
+		} else {
+
+			flags |= RT2573_TX_NEED_ACK;
+
+			dur = rum_txtime(sc, RUM_ACK_SIZE, rum_ack_rate(ic, rate),
+			    ic->ic_flags) + sc->sc_sifs;
+
+			USETW(wh->i_dur, dur);
+
+			/*
+			 * tell hardware to add timestamp for probe
+			 * responses
+			 */
+			if ((type == IEEE80211_FC0_TYPE_MGT) &&
+			    (sub_type == IEEE80211_FC0_SUBTYPE_PROBE_RESP)) {
+				flags |= RT2573_TX_TIMESTAMP;
+			}
+		}
+	}
 	ic->ic_lastdata = ticks;
 
 	if (m->m_pkthdr.len > MCLBYTES) {
@@ -1375,7 +1438,7 @@
 	}
 	xfer->frlengths[0] = temp_len;
 	usbd_start_hardware(xfer);
-	return;
+	return (0);
 }
 
 static void
@@ -1384,13 +1447,9 @@
 	struct rum_softc *sc = xfer->priv_sc;
 	struct ieee80211com *ic = &(sc->sc_ic);
 	struct ifnet *ifp = sc->sc_ic.ic_ifp;
-	struct ieee80211_frame *wh;
 	struct ieee80211_node *ni = NULL;
-	struct ieee80211_key *k;
 	struct ether_header *eh;
 	struct mbuf *m = NULL;
-	uint32_t flags;
-	uint16_t dur;
 	uint16_t rate;
 
 	switch (USBD_GET_STATE(xfer)) {
@@ -1411,8 +1470,6 @@
 			 */
 			goto done;
 		}
-		flags = 0;
-
 		IF_DEQUEUE(&(ic->ic_mgtq), m);
 
 		if (m) {
@@ -1425,40 +1482,9 @@
 			}
 			rate = (IEEE80211_IS_CHAN_5GHZ(ic->ic_curchan) ? 12 : 2);
 
-			wh = mtod(m, struct ieee80211_frame *);
-
-			if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
-				k = ieee80211_crypto_encap(ic, ni, m);
-				if (k == NULL) {
-					goto error;
-				}
-				/*
-				 * packet header may have moved, reset our
-				 * local pointer
-				 */
-				wh = mtod(m, struct ieee80211_frame *);
+			if (rum_bulk_write_callback_sub(xfer, m, ni, 0, rate)) {
+				goto error;
 			}
-			if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) {
-
-				flags |= RT2573_TX_NEED_ACK;
-
-				dur = rum_txtime(sc, RUM_ACK_SIZE, rum_ack_rate(ic, rate),
-				    ic->ic_flags) + sc->sc_sifs;
-				USETW(wh->i_dur, dur);
-
-				/*
-				 * tell hardware to add timestamp for probe
-				 * responses
-				 */
-				if ((wh->i_fc[0] &
-				    (IEEE80211_FC0_TYPE_MASK |
-				    IEEE80211_FC0_SUBTYPE_MASK)) ==
-				    (IEEE80211_FC0_TYPE_MGT |
-				    IEEE80211_FC0_SUBTYPE_PROBE_RESP)) {
-					flags |= RT2573_TX_TIMESTAMP;
-				}
-			}
-			rum_bulk_write_callback_sub(xfer, m, ni, flags, rate);
 			goto done;
 		}
 		if (ic->ic_state != IEEE80211_S_RUN) {
@@ -1496,8 +1522,6 @@
 			if (bpf_peers_present(ic->ic_rawbpf)) {
 				bpf_mtap(ic->ic_rawbpf, m);
 			}
-			wh = mtod(m, struct ieee80211_frame *);
-
 			if (ic->ic_fixed_rate != IEEE80211_FIXED_RATE_NONE)
 				rate = ic->ic_fixed_rate;
 			else
@@ -1505,27 +1529,9 @@
 
 			rate &= IEEE80211_RATE_VAL;
 
-			if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
-				k = ieee80211_crypto_encap(ic, ni, m);
-				if (k == NULL) {
-					goto error;
-				}
-				/*
-				 * packet header may have moved, reset our
-				 * local pointer
-				 */
-				wh = mtod(m, struct ieee80211_frame *);
+			if (rum_bulk_write_callback_sub(xfer, m, ni, 0, rate)) {
+				goto error;
 			}
-			if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) {
-				flags |= (RT2573_TX_NEED_ACK |
-				    RT2573_TX_MORE_FRAG);
-
-				dur = rum_txtime(sc, RUM_ACK_SIZE, rum_ack_rate(ic, rate),
-				    ic->ic_flags) + sc->sc_sifs;
-
-				USETW(wh->i_dur, dur);
-			}
-			rum_bulk_write_callback_sub(xfer, m, ni, flags, rate);
 			goto done;
 		}
 done:

==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#43 (text+ko) ====

@@ -1394,16 +1394,75 @@
 
 /*------------------------------------------------------------------------*
  * ural_bulk_write_callback - data write "thread"
+ *
+ * Returns:
+ *    0: Success
+ * Else: Error
  *------------------------------------------------------------------------*/
-static void
+static uint8_t
 ural_bulk_write_callback_sub(struct usbd_xfer *xfer, struct mbuf *m,
-    struct ieee80211_node *ni, uint32_t flags,
-    uint16_t rate)
+    struct ieee80211_node *ni, uint32_t flags, uint16_t rate)
 {
 	struct ural_softc *sc = xfer->priv_sc;
 	struct ieee80211com *ic = &(sc->sc_ic);
+	struct ieee80211_frame *wh;
+	struct ieee80211_key *k;
 	uint32_t temp_len;
+	uint16_t dur;
+	uint8_t type;
+	uint8_t sub_type;
 
+	wh = mtod(m, struct ieee80211_frame *);
+
+	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+		k = ieee80211_crypto_encap(ic, ni, m);
+		if (k == NULL) {
+			return (1);
+		}
+		/*
+		 * packet header may have moved, reset our
+		 * local pointer
+		 */
+		wh = mtod(m, struct ieee80211_frame *);
+	}
+	if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) {
+
+		type = (wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK);
+		sub_type = (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK);
+
+		if (type == IEEE80211_FC0_TYPE_DATA) {
+
+			flags |= RAL_TX_ACK;
+			flags |= RAL_TX_RETRY(7);
+
+			dur = ural_txtime(sc, RAL_ACK_SIZE, ural_ack_rate(ic, rate),
+			    ic->ic_flags) + RAL_SIFS;
+			USETW(wh->i_dur, dur);
+
+		} else if ((type == IEEE80211_FC0_TYPE_MGT) &&
+		    (sub_type == IEEE80211_FC0_SUBTYPE_BEACON)) {
+
+			/* do nothing */
+
+		} else {
+
+			flags |= RAL_TX_ACK;
+
+			dur = ural_txtime
+			    (sc, RAL_ACK_SIZE, rate, ic->ic_flags) + RAL_SIFS;
+
+			USETW(wh->i_dur, dur);
+
+			/*
+			 * tell hardware to add timestamp for probe
+			 * responses
+			 */
+			if ((type == IEEE80211_FC0_TYPE_MGT) &&
+			    (sub_type == IEEE80211_FC0_SUBTYPE_PROBE_RESP)) {
+				flags |= RAL_TX_TIMESTAMP;
+			}
+		}
+	}
 	ic->ic_lastdata = ticks;
 
 	if (m->m_pkthdr.len > RAL_FRAME_SIZE) {
@@ -1459,7 +1518,7 @@
 		ieee80211_free_node(ni);
 	}
 	usbd_start_hardware(xfer);
-	return;
+	return (0);
 }
 
 static void
@@ -1468,13 +1527,9 @@
 	struct ural_softc *sc = xfer->priv_sc;
 	struct ieee80211com *ic = &(sc->sc_ic);
 	struct ifnet *ifp = sc->sc_ic.ic_ifp;
-	struct ieee80211_frame *wh;
 	struct ieee80211_node *ni = NULL;
-	struct ieee80211_key *k;
 	struct ether_header *eh;
 	struct mbuf *m = NULL;
-	uint32_t flags;
-	uint16_t dur;
 	uint16_t rate;
 
 	switch (USBD_GET_STATE(xfer)) {
@@ -1511,12 +1566,12 @@
 			m = sc->sc_bcn_mbuf;
 			sc->sc_bcn_mbuf = NULL;
 
-			ural_bulk_write_callback_sub
-			    (xfer, m, NULL, sc->sc_bcn_flags, sc->sc_bcn_rate);
+			if (ural_bulk_write_callback_sub
+			    (xfer, m, NULL, sc->sc_bcn_flags, sc->sc_bcn_rate)) {
+				goto error;
+			}
 			goto done;
 		}
-		flags = 0;
-
 		IF_DEQUEUE(&(ic->ic_mgtq), m);
 
 		if (m) {
@@ -1529,41 +1584,9 @@
 			}
 			rate = (IEEE80211_IS_CHAN_5GHZ(ic->ic_curchan) ? 12 : 2);
 
-			wh = mtod(m, struct ieee80211_frame *);
-
-			if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
-				k = ieee80211_crypto_encap(ic, ni, m);
-				if (k == NULL) {
-					goto error;
-				}
-				/*
-				 * packet header may have moved, reset our
-				 * local pointer
-				 */
-				wh = mtod(m, struct ieee80211_frame *);
+			if (ural_bulk_write_callback_sub(xfer, m, ni, 0, rate)) {
+				goto error;
 			}
-			if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) {
-
-				flags |= RAL_TX_ACK;
-
-				dur = ural_txtime
-				    (sc, RAL_ACK_SIZE, rate, ic->ic_flags) + RAL_SIFS;
-
-				USETW(wh->i_dur, dur);
-
-				/*
-				 * tell hardware to add timestamp for probe
-				 * responses
-				 */
-				if ((wh->i_fc[0] &
-				    (IEEE80211_FC0_TYPE_MASK |
-				    IEEE80211_FC0_SUBTYPE_MASK)) ==
-				    (IEEE80211_FC0_TYPE_MGT |
-				    IEEE80211_FC0_SUBTYPE_PROBE_RESP)) {
-					flags |= RAL_TX_TIMESTAMP;
-				}
-			}
-			ural_bulk_write_callback_sub(xfer, m, ni, flags, rate);
 			goto done;
 		}
 		if (ic->ic_state != IEEE80211_S_RUN) {
@@ -1601,8 +1624,6 @@
 			if (bpf_peers_present(ic->ic_rawbpf)) {
 				bpf_mtap(ic->ic_rawbpf, m);
 			}
-			wh = mtod(m, struct ieee80211_frame *);
-
 			if (ic->ic_fixed_rate != IEEE80211_FIXED_RATE_NONE)
 				rate = ic->ic_fixed_rate;
 			else
@@ -1610,26 +1631,9 @@
 
 			rate &= IEEE80211_RATE_VAL;
 
-			if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
-				k = ieee80211_crypto_encap(ic, ni, m);
-				if (k == NULL) {
-					goto error;
-				}
-				/*
-				 * packet header may have moved, reset our
-				 * local pointer
-				 */
-				wh = mtod(m, struct ieee80211_frame *);
+			if (ural_bulk_write_callback_sub(xfer, m, ni, 0, rate)) {
+				goto error;
 			}
-			if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) {
-				flags |= RAL_TX_ACK;
-				flags |= RAL_TX_RETRY(7);
-
-				dur = ural_txtime(sc, RAL_ACK_SIZE, ural_ack_rate(ic, rate),
-				    ic->ic_flags) + RAL_SIFS;
-				USETW(wh->i_dur, dur);
-			}
-			ural_bulk_write_callback_sub(xfer, m, ni, flags, rate);
 			goto done;
 		}
 done:

From owner-p4-projects@FreeBSD.ORG  Wed Dec  5 17:23:31 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B529716A469; Wed,  5 Dec 2007 17:23: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 47E9F16A421
	for ; Wed,  5 Dec 2007 17:23:31 +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 3982A13C459
	for ; Wed,  5 Dec 2007 17:23:31 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB5HNV9j084313
	for ; Wed, 5 Dec 2007 17:23:31 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB5HNVuk084310
	for perforce@freebsd.org; Wed, 5 Dec 2007 17:23:31 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 5 Dec 2007 17:23:31 GMT
Message-Id: <200712051723.lB5HNVuk084310@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 130277 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 05 Dec 2007 17:23:32 -0000

http://perforce.freebsd.org/chv.cgi?CH=130277

Change 130277 by sam@sam_ebb on 2007/12/05 17:23:26

	sync vap code; missed first time 'round

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_power.h#3 edit
.. //depot/projects/vap/sys/net80211/ieee80211_regdomain.c#2 edit
.. //depot/projects/vap/sys/net80211/ieee80211_regdomain.h#2 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_power.h#3 (text+ko) ====

@@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2001 Atsushi Onoe
- * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
+ * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,8 +38,8 @@
 void	ieee80211_power_attach(struct ieee80211com *);
 void	ieee80211_power_detach(struct ieee80211com *);
 void	ieee80211_power_vattach(struct ieee80211vap *);
+void	ieee80211_power_vdetach(struct ieee80211vap *);
 void	ieee80211_power_latevattach(struct ieee80211vap *);
-void	ieee80211_power_vdetach(struct ieee80211vap *);
 
 int	ieee80211_node_saveq_drain(struct ieee80211_node *);
 int	ieee80211_node_saveq_age(struct ieee80211_node *);

==== //depot/projects/vap/sys/net80211/ieee80211_regdomain.c#2 (text+ko) ====

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2005 Sam Leffler, Errno Consulting
+ * Copyright (c) 2005-2007 Sam Leffler, Errno Consulting
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,7 +30,9 @@
  */
 
 #include 
+#ifdef __FreeBSD__
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.19 2005/01/27 17:39:17 sam Exp $");
+#endif
 
 /*
  * IEEE 802.11 regdomain support.
@@ -43,240 +45,234 @@
 #include 
 
 #include 
-#include 
-#include 
 #include 
-#include 
-#include 
 
 #include 
 #include 
 
+static int
+null_setregdomain(struct ieee80211com *ic,
+	struct ieee80211_regdomain *rd,
+	int nchans, struct ieee80211_channel chans[])
+{
+	return 0;		/* accept anything */
+}
+
+void
+ieee80211_regdomain_attach(struct ieee80211com *ic)
+{
+	if (ic->ic_regdomain.regdomain == 0 &&
+	    ic->ic_regdomain.country == CTRY_DEFAULT) {
+		ic->ic_regdomain.country = CTRY_UNITED_STATES;	/* XXX */
+		ic->ic_regdomain.location = ' ';		/* both */
+		ic->ic_regdomain.isocc[0] = 'U';		/* XXX */
+		ic->ic_regdomain.isocc[1] = 'S';		/* XXX */
+		/* XXX? too late to setup default channel list */
+	}
+	ic->ic_setregdomain = null_setregdomain;
+}
+
+void
+ieee80211_regdomain_detach(struct ieee80211com *ic)
+{
+}
+
+void
+ieee80211_regdomain_vattach(struct ieee80211vap *vap)
+{
+}
+
+void
+ieee80211_regdomain_vdetach(struct ieee80211vap *vap)
+{
+}
+
+static void
+addchan(struct ieee80211com *ic, int ieee, int flags)
+{
+	struct ieee80211_channel *c;
+
+	c = &ic->ic_channels[ic->ic_nchans++];
+	c->ic_freq = ieee80211_ieee2mhz(ieee, flags);
+	c->ic_ieee = ieee;
+	c->ic_flags = flags;
+	c->ic_extieee = 0;
+}
+
 /*
- * Country Code Table for code-to-string conversion.
+ * Setup the channel list for the specified regulatory domain,
+ * country code, and operating modes.  This interface is used
+ * when a driver does not obtain the channel list from another
+ * source (such as firmware).
  */
+int
+ieee80211_init_channels(struct ieee80211com *ic,
+	const struct ieee80211_regdomain *rd, const uint8_t bands[])
+{
+	int i;
+
+	/* XXX just do something for now */
+	ic->ic_nchans = 0;
+	if (isset(bands, IEEE80211_MODE_11B) ||
+	    isset(bands, IEEE80211_MODE_11G)) {
+		for (i = 1; i <= (rd->ecm ? 14 : 11); i++) {
+			if (isset(bands, IEEE80211_MODE_11B))
+				addchan(ic, i, IEEE80211_CHAN_B);
+			if (isset(bands, IEEE80211_MODE_11G))
+				addchan(ic, i, IEEE80211_CHAN_G);
+		}
+	}
+	if (isset(bands, IEEE80211_MODE_11A)) {
+		for (i = 36; i <= 64; i += 4)
+			addchan(ic, i, IEEE80211_CHAN_A);
+		for (i = 100; i <= 140; i += 4)
+			addchan(ic, i, IEEE80211_CHAN_A);
+		for (i = 149; i <= 161; i += 4)
+			addchan(ic, i, IEEE80211_CHAN_A);
+	}
+	ic->ic_regdomain = *rd;
+
+	return 0;
+}
 
-struct country_code_to_string{
-	u_int16_t	iso_code;	   
-	const char*	iso_name;
-};
+static __inline int
+chancompar(const void *a, const void *b)
+{
+	const struct ieee80211_channel *ca = a;
+	const struct ieee80211_channel *cb = b;
+
+	return (ca->ic_freq == cb->ic_freq) ?
+		(ca->ic_flags & IEEE80211_CHAN_ALL) -
+		    (cb->ic_flags & IEEE80211_CHAN_ALL) :
+		ca->ic_freq - cb->ic_freq;
+}
 
 /*
- * XXX: ugly, since must match define in other modules.
+ * Insertion sort.
  */
-#define CTRY_DEBUG                0x1ff   /* debug */
-#define CTRY_DEFAULT              0       /* default */
+#define swap(_a, _b, _size) {			\
+	uint8_t *s = _b;			\
+	int i = _size;				\
+	do {					\
+		uint8_t tmp = *_a;		\
+		*_a++ = *s;			\
+		*s++ = tmp;			\
+	} while (--i);				\
+	_a -= _size;				\
+}
+
+static void
+sort_channels(void *a, size_t n, size_t size)
+{
+	uint8_t *aa = a;
+	uint8_t *ai, *t;
 
-static const  struct country_code_to_string country_strings[] = {
-    {CTRY_DEBUG,	 	"DB" },
-    {CTRY_DEFAULT,	 	"NA" },
-    {CTRY_ALBANIA,		"AL" },
-    {CTRY_ALGERIA,		"DZ" },
-    {CTRY_ARGENTINA,		"AR" },
-    {CTRY_ARMENIA,		"AM" },
-    {CTRY_AUSTRALIA,		"AU" },
-    {CTRY_AUSTRIA,		"AT" },
-    {CTRY_AZERBAIJAN,		"AZ" },
-    {CTRY_BAHRAIN,		"BH" },
-    {CTRY_BELARUS,		"BY" },
-    {CTRY_BELGIUM,		"BE" },
-    {CTRY_BELIZE,		"BZ" },
-    {CTRY_BOLIVIA,		"BO" },
-    {CTRY_BRAZIL,		"BR" },
-    {CTRY_BRUNEI_DARUSSALAM,	"BN" },
-    {CTRY_BULGARIA,		"BG" },
-    {CTRY_CANADA,		"CA" },
-    {CTRY_CHILE,		"CL" },
-    {CTRY_CHINA,		"CN" },
-    {CTRY_COLOMBIA,		"CO" },
-    {CTRY_COSTA_RICA,		"CR" },
-    {CTRY_CROATIA,		"HR" },
-    {CTRY_CYPRUS,		"CY" },
-    {CTRY_CZECH,		"CZ" },
-    {CTRY_DENMARK,		"DK" },
-    {CTRY_DOMINICAN_REPUBLIC,	"DO" },
-    {CTRY_ECUADOR,		"EC" },
-    {CTRY_EGYPT,		"EG" },
-    {CTRY_EL_SALVADOR,		"SV" },    
-    {CTRY_ESTONIA,		"EE" },
-    {CTRY_FINLAND,		"FI" },
-    {CTRY_FRANCE,		"FR" },
-    {CTRY_FRANCE2,		"F2" },
-    {CTRY_GEORGIA,		"GE" },
-    {CTRY_GERMANY,		"DE" },
-    {CTRY_GREECE,		"GR" },
-    {CTRY_GUATEMALA,		"GT" },
-    {CTRY_HONDURAS,		"HN" },
-    {CTRY_HONG_KONG,		"HK" },
-    {CTRY_HUNGARY,		"HU" },
-    {CTRY_ICELAND,		"IS" },
-    {CTRY_INDIA,		"IN" },
-    {CTRY_INDONESIA,		"ID" },
-    {CTRY_IRAN,			"IR" },
-    {CTRY_IRELAND,		"IE" },
-    {CTRY_ISRAEL,		"IL" },
-    {CTRY_ITALY,		"IT" },
-    {CTRY_JAPAN,		"JP" },
-    {CTRY_JAPAN1,		"J1" },
-    {CTRY_JAPAN2,		"J2" },    
-    {CTRY_JAPAN3,		"J3" },
-    {CTRY_JAPAN4,		"J4" },
-    {CTRY_JAPAN5,		"J5" },    
-    {CTRY_JORDAN,		"JO" },
-    {CTRY_KAZAKHSTAN,		"KZ" },
-    {CTRY_KOREA_NORTH,		"KP" },
-    {CTRY_KOREA_ROC,		"KR" },
-    {CTRY_KOREA_ROC2,		"K2" },
-    {CTRY_KUWAIT,		"KW" },
-    {CTRY_LATVIA,		"LV" },
-    {CTRY_LEBANON,		"LB" },
-    {CTRY_LIECHTENSTEIN,	"LI" },
-    {CTRY_LITHUANIA,		"LT" },
-    {CTRY_LUXEMBOURG,		"LU" },
-    {CTRY_MACAU,		"MO" },
-    {CTRY_MACEDONIA,		"MK" },
-    {CTRY_MALAYSIA,		"MY" },
-    {CTRY_MEXICO,		"MX" },
-    {CTRY_MONACO,		"MC" },
-    {CTRY_MOROCCO,		"MA" },
-    {CTRY_NETHERLANDS,		"NL" },
-    {CTRY_NEW_ZEALAND,		"NZ" },
-    {CTRY_NORWAY,		"NO" },
-    {CTRY_OMAN,			"OM" },
-    {CTRY_PAKISTAN,		"PK" },
-    {CTRY_PANAMA,		"PA" },
-    {CTRY_PERU,			"PE" },
-    {CTRY_PHILIPPINES,		"PH" },
-    {CTRY_POLAND,		"PL" },
-    {CTRY_PORTUGAL,		"PT" },
-    {CTRY_PUERTO_RICO,		"PR" },
-    {CTRY_QATAR,		"QA" },
-    {CTRY_ROMANIA,		"RO" },
-    {CTRY_RUSSIA,		"RU" },
-    {CTRY_SAUDI_ARABIA,		"SA" },
-    {CTRY_SINGAPORE,		"SG" },
-    {CTRY_SLOVAKIA,		"SK" },
-    {CTRY_SLOVENIA,		"SI" },
-    {CTRY_SOUTH_AFRICA,		"ZA" },
-    {CTRY_SPAIN,		"ES" },
-    {CTRY_SWEDEN,		"SE" },
-    {CTRY_SWITZERLAND,		"CH" },
-    {CTRY_SYRIA,		"SY" },
-    {CTRY_TAIWAN,		"TW" },
-    {CTRY_THAILAND,		"TH" },
-    {CTRY_TRINIDAD_Y_TOBAGO,	"TT" },
-    {CTRY_TUNISIA,		"TN" },
-    {CTRY_TURKEY,		"TR" },
-    {CTRY_UKRAINE,		"UA" },
-    {CTRY_UAE,			"AE" },
-    {CTRY_UNITED_KINGDOM,	"GB" },
-    {CTRY_UNITED_STATES,	"US" },
-    {CTRY_URUGUAY,		"UY" },
-    {CTRY_UZBEKISTAN,		"UZ" },    
-    {CTRY_VENEZUELA,		"VE" },
-    {CTRY_VIET_NAM,		"VN" },
-    {CTRY_YEMEN,		"YE" },
-    {CTRY_ZIMBABWE,		"ZW" }    
-};
+	for (ai = aa+size; --n >= 1; ai += size)
+		for (t = ai; t > aa; t -= size) {
+			uint8_t *u = t - size;
+			if (chancompar(u, t) <= 0)
+				break;
+			swap(u, t, size);
+		}
+}
+#undef swap
 
+/*
+ * Order channels w/ the same frequency so that
+ * b < g < htg and a < hta.  This is used to optimize
+ * channel table lookups and some user applications
+ * may also depend on it (though they should not).
+ */
 void
-ieee80211_regdomain_attach(struct ieee80211com *ic)
+ieee80211_sort_channels(struct ieee80211_channel chans[], int nchans)
+{
+	sort_channels(chans, nchans, sizeof(struct ieee80211_channel));
+}
+
+/*
+ * Add Country Information IE.
+ */
+uint8_t *
+ieee80211_add_countryie(uint8_t *frm, struct ieee80211com *ic)
 {
-#define	N(a)	(sizeof(a)/sizeof(a[0]))
-	int i;
+#define	CHAN_UNINTERESTING \
+    (IEEE80211_CHAN_TURBO | IEEE80211_CHAN_STURBO | \
+     IEEE80211_CHAN_HALF | IEEE80211_CHAN_QUARTER)
+	/* XXX what about auto? */
+	/* flag set of channels to be excluded */
+	static const int skipflags[IEEE80211_MODE_MAX] = {
+	    CHAN_UNINTERESTING,				/* MODE_AUTO */
+	    CHAN_UNINTERESTING | IEEE80211_CHAN_2GHZ,	/* MODE_11A */
+	    CHAN_UNINTERESTING | IEEE80211_CHAN_5GHZ,	/* MODE_11B */
+	    CHAN_UNINTERESTING | IEEE80211_CHAN_5GHZ,	/* MODE_11G */
+	    CHAN_UNINTERESTING | IEEE80211_CHAN_OFDM |	/* MODE_FH */
+	        IEEE80211_CHAN_CCK | IEEE80211_CHAN_DYN,
+	    CHAN_UNINTERESTING | IEEE80211_CHAN_2GHZ,	/* MODE_TURBO_A */
+	    CHAN_UNINTERESTING | IEEE80211_CHAN_5GHZ,	/* MODE_TURBO_G */
+	    CHAN_UNINTERESTING | IEEE80211_CHAN_2GHZ,	/* MODE_STURBO_A */
+	    CHAN_UNINTERESTING | IEEE80211_CHAN_2GHZ,	/* MODE_11NA */
+	    CHAN_UNINTERESTING | IEEE80211_CHAN_5GHZ,	/* MODE_11NG */
+	};
+	struct ieee80211_country_ie *ie = (struct ieee80211_country_ie *)frm;
+	const struct ieee80211_regdomain *rd = &ic->ic_regdomain;
+	uint8_t nextchan, chans[IEEE80211_CHAN_BYTES];
+	int i, skip, nruns;
 
-	/*
-	 * Fill in country IE.
-	 */
-	memset(&ic->ic_country_ie, 0, sizeof(ic->ic_country_ie));  
-	ic->ic_country_ie.country_id = IEEE80211_ELEMID_COUNTRY;
-	ic->ic_country_ie.country_len = 0; /* init needed by following code */
-	{
-		int found = 0;
-		for (i=0; i < N(country_strings); i++) {
-			if (country_strings[i].iso_code == ic->ic_country_code) {
-				ic->ic_country_ie.country_str[0] = country_strings[i].iso_name[0];
-				ic->ic_country_ie.country_str[1] = country_strings[i].iso_name[1];
-				found = 1;
-				break;
-			}
-		}
-		if (!found) {
-			if_printf(ic->ic_ifp, "bad country string ignored: %d\n",
-					  ic->ic_country_code);
-				ic->ic_country_ie.country_str[0] = ' ';
-				ic->ic_country_ie.country_str[1] = ' ';			
-		}
+	ie->ie = IEEE80211_ELEMID_COUNTRY;
+	if (rd->isocc[0] == '\0') {
+		if_printf(ic->ic_ifp, "no ISO country string for cc %d; "
+			"using blanks\n", rd->country);
+		ie->cc[0] = ie->cc[1] = ' ';
+	} else {
+		ie->cc[0] = rd->isocc[0];
+		ie->cc[1] = rd->isocc[1];
 	}
 	/* 
-	 * indoor/outdoor portion if country string.
-	 * NB: this is not quite right, since we should have one of:
+	 * Indoor/Outdoor portion of country string:
 	 *     'I' indoor only
 	 *     'O' outdoor only
 	 *     ' ' all enviroments
-	 *  we currently can only provide 'I' or ' '.
 	 */
-	ic->ic_country_ie.country_str[2] = 'I';
-	if (ic->ic_country_outdoor)
-		ic->ic_country_ie.country_str[2] = ' ';
+	ie->cc[2] = (rd->location == 'I' ? 'I' :
+		     rd->location == 'O' ? 'O' : ' ');
 	/* 
-	 * runlength encoded channel max tx power info.
+	 * Run-length encoded channel+max tx power info.
 	 */
-	{
-		u_int8_t *cur_runlen = &ic->ic_country_ie.country_triplet[1];
-		u_int8_t *cur_chan = &ic->ic_country_ie.country_triplet[0];
-		u_int8_t *cur_pow = &ic->ic_country_ie.country_triplet[2];
-		u_int8_t prevchan = 0;
-		ic->ic_country_ie.country_len = 3; /* invalid, but just initialize */
-		/* XXX not right 'cuz of duplicate entries */
-		for (i = 0; i < ic->ic_nchans; i++) {
-			struct ieee80211_channel *c = &ic->ic_channels[i];
-			if (*cur_runlen == 0) {
-				(*cur_runlen)++;
-				*cur_pow = c->ic_maxregpower;
-				*cur_chan = c->ic_ieee;
-				prevchan = c->ic_ieee;
-				ic->ic_country_ie.country_len += 3;
-			} else if (*cur_pow == c->ic_maxregpower &&
-			    c->ic_ieee == prevchan + 1) {
-				(*cur_runlen)++;
-				prevchan = c->ic_ieee;
-			} else {
-				cur_runlen +=3;
-				cur_chan += 3;
-				cur_pow += 3;
-				(*cur_runlen)++;
-				*cur_pow = c->ic_maxregpower;
-				*cur_chan = c->ic_ieee;
-				prevchan = c->ic_ieee;
-				ic->ic_country_ie.country_len += 3;
+	frm = (uint8_t *)&ie->band[0];
+	nextchan = 0;			/* NB: impossible channel # */
+	nruns = 0;
+	memset(chans, 0, sizeof(chans));
+	skip = skipflags[ieee80211_chan2mode(ic->ic_bsschan)];
+	for (i = 0; i < ic->ic_nchans; i++) {
+		const struct ieee80211_channel *c = &ic->ic_channels[i];
+
+		if (isset(chans, c->ic_ieee))		/* suppress dup's */
+			continue;
+		if (c->ic_flags & skip)			/* skip band, etc. */
+			continue;
+		setbit(chans, c->ic_ieee);
+		if (c->ic_ieee != nextchan ||
+		    c->ic_maxregpower != frm[-1]) {	/* new run */
+			if (nruns == 10) {		/* XXX max runs */
+				/* XXX add msg but can't now 'cuz we're called too often */
+				break;
 			}
+			frm[0] = c->ic_ieee;		/* starting channel # */
+			frm[1] = 1;			/* # channels in run */
+			frm[2] = c->ic_maxregpower;	/* tx power cap */
+			frm += 3;
+			nextchan = c->ic_ieee + 1;	/* overflow? */
+			nruns++;
+		} else {				/* extend run */
+			frm[-2]++;
+			nextchan++;
 		}
-		/* pad */
-		if (ic->ic_country_ie.country_len & 1)
-			ic->ic_country_ie.country_len++;
+	}
+	ie->len = frm - ie->cc;
+	if (ie->len & 1) {		/* pad to multiple of 2 */
+		ie->len++;
+		*frm++ = 0;
 	}
-
-#if 0
-	ic->ic_country_ie.country_len=8;
-	ic->ic_country_ie.country_triplet[0] = 10;
-	ic->ic_country_ie.country_triplet[1] = 11;
-	ic->ic_country_ie.country_triplet[2] = 12;
-#endif
-#undef N
-}
-
-void
-ieee80211_regdomain_detach(struct ieee80211com *ic)
-{
-}
-
-void
-ieee80211_regdomain_vattach(struct ieee80211vap *vap)
-{
-}
-
-void
-ieee80211_regdomain_vdetach(struct ieee80211vap *vap)
-{
+	return frm;
+#undef CHAN_UNINTERESTING
 }

==== //depot/projects/vap/sys/net80211/ieee80211_regdomain.h#2 (text+ko) ====

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2005 Sam Leffler, Errno Consulting
+ * Copyright (c) 2005-2007 Sam Leffler, Errno Consulting
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
  * ISO 3166 Country/Region Codes
  * http://ftp.ics.uci.edu/pub/ietf/http/related/iso3166.txt
  */
-enum CountryCode {
+enum ISOCountryCode {
 	CTRY_AFGHANISTAN	= 4,
 	CTRY_ALBANIA		= 8,	/* Albania */
 	CTRY_ALGERIA		= 12,	/* Algeria */
@@ -49,42 +49,92 @@
 	CTRY_ANDORRA		= 20,
 	CTRY_ANGOLA		= 24,
 	CTRY_ANGUILLA		= 660,
-	/* XXX correct remainder */
+	CTRY_ANTARTICA		= 10,
+	CTRY_ANTIGUA		= 28,	/* Antigua and Barbuda */
 	CTRY_ARGENTINA		= 32,	/* Argentina */
 	CTRY_ARMENIA		= 51,	/* Armenia */
+	CTRY_ARUBA		= 533,	/* Aruba */
 	CTRY_AUSTRALIA		= 36,	/* Australia */
 	CTRY_AUSTRIA		= 40,	/* Austria */
 	CTRY_AZERBAIJAN		= 31,	/* Azerbaijan */
+	CTRY_BAHAMAS		= 44,	/* Bahamas */
 	CTRY_BAHRAIN		= 48,	/* Bahrain */
+	CTRY_BANGLADESH		= 50,	/* Bangladesh */
+	CTRY_BARBADOS		= 52,
 	CTRY_BELARUS		= 112,	/* Belarus */
 	CTRY_BELGIUM		= 56,	/* Belgium */
-	CTRY_BELIZE		= 84,	/* Belize */
+	CTRY_BELIZE		= 84,
+	CTRY_BENIN		= 204,
+	CTRY_BERMUDA		= 60,
+	CTRY_BHUTAN		= 64,
 	CTRY_BOLIVIA		= 68,	/* Bolivia */
+	CTRY_BOSNIA_AND_HERZEGOWINA = 70,
+	CTRY_BOTSWANA		= 72,
+	CTRY_BOUVET_ISLAND	= 74,
 	CTRY_BRAZIL		= 76,	/* Brazil */
+	CTRY_BRITISH_INDIAN_OCEAN_TERRITORY = 86,
 	CTRY_BRUNEI_DARUSSALAM	= 96,	/* Brunei Darussalam */
 	CTRY_BULGARIA		= 100,	/* Bulgaria */
+	CTRY_BURKINA_FASO	= 854,
+	CTRY_BURUNDI		= 108,
+	CTRY_CAMBODIA		= 116,
+	CTRY_CAMEROON		= 120,
 	CTRY_CANADA		= 124,	/* Canada */
+	CTRY_CAPE_VERDE		= 132,
+	CTRY_CAYMAN_ISLANDS	= 136,
+	CTRY_CENTRAL_AFRICAN_REPUBLIC = 140,
+	CTRY_CHAD		= 148,
 	CTRY_CHILE		= 152,	/* Chile */
 	CTRY_CHINA		= 156,	/* People's Republic of China */
+	CTRY_CHRISTMAS_ISLAND	= 162,
+	CTRY_COCOS_ISLANDS	= 166,
 	CTRY_COLOMBIA		= 170,	/* Colombia */
+	CTRY_COMOROS		= 174,
+	CTRY_CONGO		= 178,
+	CTRY_COOK_ISLANDS	= 184,
 	CTRY_COSTA_RICA		= 188,	/* Costa Rica */
-	CTRY_CROATIA		= 191,	/* Croatia */
+	CTRY_COTE_DIVOIRE	= 384,
+	CTRY_CROATIA		= 191,	/* Croatia (local name: Hrvatska) */
 	CTRY_CYPRUS		= 196,	/* Cyprus */
 	CTRY_CZECH		= 203,	/* Czech Republic */
 	CTRY_DENMARK		= 208,	/* Denmark */
+	CTRY_DJIBOUTI		= 262,
+	CTRY_DOMINICA		= 212,
 	CTRY_DOMINICAN_REPUBLIC	= 214,	/* Dominican Republic */
+	CTRY_EAST_TIMOR		= 626,
 	CTRY_ECUADOR		= 218,	/* Ecuador */
 	CTRY_EGYPT		= 818,	/* Egypt */
 	CTRY_EL_SALVADOR	= 222,	/* El Salvador */
+	CTRY_EQUATORIAL_GUINEA	= 226,
+	CTRY_ERITREA		= 232,
 	CTRY_ESTONIA		= 233,	/* Estonia */
+	CTRY_ETHIOPIA		= 210,
+	CTRY_FALKLAND_ISLANDS	= 238,	/* (Malvinas) */
 	CTRY_FAEROE_ISLANDS	= 234,	/* Faeroe Islands */
+	CTRY_FIJI		= 242,
 	CTRY_FINLAND		= 246,	/* Finland */
 	CTRY_FRANCE		= 250,	/* France */
-	CTRY_FRANCE2		= 255,	/* France2 */
+	CTRY_FRANCE2		= 255,	/* France (Metropolitan) */
+	CTRY_FRENCH_GUIANA	= 254,
+	CTRY_FRENCH_POLYNESIA	= 258,
+	CTRY_FRENCH_SOUTHERN_TERRITORIES	= 260,
+	CTRY_GABON		= 266,
+	CTRY_GAMBIA		= 270,
 	CTRY_GEORGIA		= 268,	/* Georgia */
 	CTRY_GERMANY		= 276,	/* Germany */
+	CTRY_GHANA		= 288,
+	CTRY_GIBRALTAR		= 292,
 	CTRY_GREECE		= 300,	/* Greece */
+	CTRY_GREENLAND		= 304,
+	CTRY_GRENADA		= 308,
+	CTRY_GUADELOUPE		= 312,
+	CTRY_GUAM		= 316,
 	CTRY_GUATEMALA		= 320,	/* Guatemala */
+	CTRY_GUINEA		= 324,
+	CTRY_GUINEA_BISSAU	= 624,
+	CTRY_GUYANA		= 328,
+	/* XXX correct remainder */
+	CTRY_HAITI		= 332,
 	CTRY_HONDURAS		= 340,	/* Honduras */
 	CTRY_HONG_KONG		= 344,	/* Hong Kong S.A.R., P.R.C. */
 	CTRY_HUNGARY		= 348,	/* Hungary */
@@ -119,9 +169,11 @@
 	CTRY_MACAU		= 446,	/* Macau */
 	CTRY_MACEDONIA		= 807,	/* the Former Yugoslav Republic of Macedonia */
 	CTRY_MALAYSIA		= 458,	/* Malaysia */
+	CTRY_MALTA		= 470,	/* Malta */
 	CTRY_MEXICO		= 484,	/* Mexico */
 	CTRY_MONACO		= 492,	/* Principality of Monaco */
 	CTRY_MOROCCO		= 504,	/* Morocco */
+	CTRY_NEPAL		= 524,	/* Nepal */
 	CTRY_NETHERLANDS	= 528,	/* Netherlands */
 	CTRY_NEW_ZEALAND	= 554,	/* New Zealand */
 	CTRY_NICARAGUA		= 558,	/* Nicaragua */
@@ -144,6 +196,7 @@
 	CTRY_SLOVENIA		= 705,	/* Slovenia */
 	CTRY_SOUTH_AFRICA	= 710,	/* South Africa */
 	CTRY_SPAIN		= 724,	/* Spain */
+	CTRY_SRILANKA		= 144,	/* Sri Lanka */
 	CTRY_SWEDEN		= 752,	/* Sweden */
 	CTRY_SWITZERLAND	= 756,	/* Switzerland */
 	CTRY_SYRIA		= 760,	/* Syria */
@@ -164,10 +217,35 @@
 	CTRY_ZIMBABWE		= 716,	/* Zimbabwe */
 };
 
+enum RegdomainCode {
+	SKU_FCC			= 0x10,	/* FCC, aka United States */
+	SKU_CA			= 0x20,	/* North America, aka Canada */
+	SKU_ETSI		= 0x30,	/* Europe */
+	SKU_ETSI2		= 0x32,	/* Europe w/o HT40 in 5GHz */
+	SKU_ETSI3		= 0x33,	/* Europe - channel 36 */
+	SKU_FCC3		= 0x3a,	/* FCC w/5470 band, 11h, DFS */
+	SKU_JAPAN		= 0x40,
+	SKU_KOREA		= 0x45,
+	SKU_APAC		= 0x50,	/* Asia Pacific */
+	SKU_APAC2		= 0x51,	/* Asia Pacific w/ DFS on mid-band */
+	SKU_APAC3		= 0x5d,	/* Asia Pacific w/o ISM band */
+	SKU_ROW			= 0x81,	/* China/Taiwan/Rest of World */
+	SKU_NONE		= 0xf0,	/* "Region Free" */
+	SKU_DEBUG		= 0x1ff
+};
+
 #if defined(__KERNEL__) || defined(_KERNEL)
-void ieee80211_regdomain_attach(struct ieee80211com *);
-void ieee80211_regdomain_detach(struct ieee80211com *);
-void ieee80211_regdomain_vattach(struct ieee80211vap *);
-void ieee80211_regdomain_vdetach(struct ieee80211vap *);
+#define CTRY_DEBUG                0x1ff   /* debug */
+#define CTRY_DEFAULT              0       /* default */
+
+void	ieee80211_regdomain_attach(struct ieee80211com *);
+void	ieee80211_regdomain_detach(struct ieee80211com *);
+void	ieee80211_regdomain_vattach(struct ieee80211vap *);
+void	ieee80211_regdomain_vdetach(struct ieee80211vap *);
+
+int	ieee80211_init_channels(struct ieee80211com *,
+	    const struct ieee80211_regdomain *, const uint8_t bands[]);
+void	ieee80211_sort_channels(struct ieee80211_channel chans[], int nchans);
+uint8_t *ieee80211_add_countryie(uint8_t *, struct ieee80211com *);
 #endif /* defined(__KERNEL__) || defined(_KERNEL) */
 #endif /* _NET80211_IEEE80211_REGDOMAIN_H_ */

From owner-p4-projects@FreeBSD.ORG  Wed Dec  5 17:25:34 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2153C16A41B; Wed,  5 Dec 2007 17:25: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 DB64A16A418
	for ; Wed,  5 Dec 2007 17:25:33 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CD90F13C4E5
	for ; Wed,  5 Dec 2007 17:25:33 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB5HPXGV084404
	for ; Wed, 5 Dec 2007 17:25:33 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB5HPXGS084401
	for perforce@freebsd.org; Wed, 5 Dec 2007 17:25:33 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 5 Dec 2007 17:25:33 GMT
Message-Id: <200712051725.lB5HPXGS084401@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 130278 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 05 Dec 2007 17:25:34 -0000

http://perforce.freebsd.org/chv.cgi?CH=130278

Change 130278 by hselasky@hselasky_laptop001 on 2007/12/05 17:25:18

	
	Bug fix.
	
	The XXX_WAIT_COMMAND flag is not always cleared when
	set in "{ural,rum}_newstate_cb". This causes all IEEE80211
	frames to be halted until a new command is issued in some
	cases. This causes the IEEE80211 layer to not complete
	association among other things.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/if_rum.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/if_ural.c#44 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/if_rum.c#20 (text+ko) ====

@@ -1761,9 +1761,6 @@
 
 	DPRINTF(sc, 0, "setting new state: %d\n", nstate);
 
-	/* force data to wait */
-	sc->sc_flags |= RUM_FLAG_WAIT_COMMAND;
-
 	/* set new state first! */
 	(sc->sc_newstate) (ic, nstate, arg);
 

==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#44 (text+ko) ====

@@ -1867,9 +1867,6 @@
 
 	DPRINTF(sc, 0, "setting new state: %d\n", nstate);
 
-	/* force data to wait */
-	sc->sc_flags |= URAL_FLAG_WAIT_COMMAND;
-
 	/* set new state first! */
 	(sc->sc_newstate) (ic, nstate, arg);
 

From owner-p4-projects@FreeBSD.ORG  Wed Dec  5 17:36:46 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5C98616A46C; Wed,  5 Dec 2007 17:36: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 DC9AF16A468
	for ; Wed,  5 Dec 2007 17:36:45 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B674E13C478
	for ; Wed,  5 Dec 2007 17:36:45 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB5HajLS085924
	for ; Wed, 5 Dec 2007 17:36:45 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB5HajcR085921
	for perforce@freebsd.org; Wed, 5 Dec 2007 17:36:45 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 5 Dec 2007 17:36:45 GMT
Message-Id: <200712051736.lB5HajcR085921@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 130279 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 05 Dec 2007 17:36:46 -0000

http://perforce.freebsd.org/chv.cgi?CH=130279

Change 130279 by sam@sam_ebb on 2007/12/05 17:36:31

	allow regdomain state block to be unspecified so we use the default
	settings made at attach time; simplifies legacy driver setup

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_regdomain.c#3 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_regdomain.c#3 (text+ko) ====

@@ -130,7 +130,8 @@
 		for (i = 149; i <= 161; i += 4)
 			addchan(ic, i, IEEE80211_CHAN_A);
 	}
-	ic->ic_regdomain = *rd;
+	if (rd != NULL)
+		ic->ic_regdomain = *rd;
 
 	return 0;
 }

From owner-p4-projects@FreeBSD.ORG  Wed Dec  5 17:37:47 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 93FB116A468; Wed,  5 Dec 2007 17:37: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 57B9D16A421
	for ; Wed,  5 Dec 2007 17:37:47 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 491D413C46E
	for ; Wed,  5 Dec 2007 17:37:47 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB5HbloC085962
	for ; Wed, 5 Dec 2007 17:37:47 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB5Hblxh085959
	for perforce@freebsd.org; Wed, 5 Dec 2007 17:37:47 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 5 Dec 2007 17:37:47 GMT
Message-Id: <200712051737.lB5Hblxh085959@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 130280 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 05 Dec 2007 17:37:47 -0000

http://perforce.freebsd.org/chv.cgi?CH=130280

Change 130280 by sam@sam_ebb on 2007/12/05 17:37:29

	move opt_wlan.h include into code; can't do it in ieee80211_freebsd.h
	because code outside net80211 uses it (e.g. drivers)

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211.c#17 edit
.. //depot/projects/vap/sys/net80211/ieee80211_acl.c#7 edit
.. //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#2 edit
.. //depot/projects/vap/sys/net80211/ieee80211_amrr.c#5 edit
.. //depot/projects/vap/sys/net80211/ieee80211_crypto.c#9 edit
.. //depot/projects/vap/sys/net80211/ieee80211_crypto_ccmp.c#9 edit
.. //depot/projects/vap/sys/net80211/ieee80211_crypto_none.c#9 edit
.. //depot/projects/vap/sys/net80211/ieee80211_crypto_tkip.c#9 edit
.. //depot/projects/vap/sys/net80211/ieee80211_crypto_wep.c#9 edit
.. //depot/projects/vap/sys/net80211/ieee80211_dfs.c#2 edit
.. //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#14 edit
.. //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#13 edit
.. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#2 edit
.. //depot/projects/vap/sys/net80211/ieee80211_ht.c#5 edit
.. //depot/projects/vap/sys/net80211/ieee80211_input.c#23 edit
.. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#19 edit
.. //depot/projects/vap/sys/net80211/ieee80211_monitor.c#2 edit
.. //depot/projects/vap/sys/net80211/ieee80211_node.c#17 edit
.. //depot/projects/vap/sys/net80211/ieee80211_output.c#20 edit
.. //depot/projects/vap/sys/net80211/ieee80211_power.c#7 edit
.. //depot/projects/vap/sys/net80211/ieee80211_proto.c#17 edit
.. //depot/projects/vap/sys/net80211/ieee80211_regdomain.c#4 edit
.. //depot/projects/vap/sys/net80211/ieee80211_scan.c#12 edit
.. //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#14 edit
.. //depot/projects/vap/sys/net80211/ieee80211_sta.c#2 edit
.. //depot/projects/vap/sys/net80211/ieee80211_wds.c#2 edit
.. //depot/projects/vap/sys/net80211/ieee80211_xauth.c#7 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211.c#17 (text+ko) ====

@@ -30,6 +30,7 @@
 /*
  * IEEE 802.11 generic handler
  */
+#include "opt_wlan.h"
 
 #include 
 #include  

==== //depot/projects/vap/sys/net80211/ieee80211_acl.c#7 (text+ko) ====

@@ -37,6 +37,8 @@
  * and if found the frame is either accepted (ACL_POLICY_ALLOW)
  * or rejected (ACL_POLICY_DENT).
  */
+#include "opt_wlan.h"
+
 #include 
 #include 
 #include  

==== //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#2 (text+ko) ====

@@ -32,6 +32,7 @@
  * IEEE 802.11 IBSS mode support.
  */
 #include "opt_inet.h"
+#include "opt_wlan.h"
 
 #include 
 #include  

==== //depot/projects/vap/sys/net80211/ieee80211_amrr.c#5 (text+ko) ====

@@ -28,6 +28,8 @@
  *  INRIA Sophia - Projet Planete
  *  http://www-sop.inria.fr/rapports/sophia/RR-5208.html
  */
+#include "opt_wlan.h"
+
 #include 
 #include 
 #include 

==== //depot/projects/vap/sys/net80211/ieee80211_crypto.c#9 (text+ko) ====

@@ -30,6 +30,8 @@
 /*
  * IEEE 802.11 generic crypto support.
  */
+#include "opt_wlan.h"
+
 #include 
 #include 
 #include 

==== //depot/projects/vap/sys/net80211/ieee80211_crypto_ccmp.c#9 (text+ko) ====

@@ -33,6 +33,8 @@
  * AP driver. The code is used with the consent of the author and
  * it's license is included below.
  */
+#include "opt_wlan.h"
+
 #include 
 #include  
 #include    

==== //depot/projects/vap/sys/net80211/ieee80211_crypto_none.c#9 (text+ko) ====

@@ -29,6 +29,8 @@
 /*
  * IEEE 802.11 NULL crypto support.
  */
+#include "opt_wlan.h"
+
 #include 
 #include  
 #include    

==== //depot/projects/vap/sys/net80211/ieee80211_crypto_tkip.c#9 (text+ko) ====

@@ -33,6 +33,8 @@
  * AP driver. The code is used with the consent of the author and
  * it's license is included below.
  */
+#include "opt_wlan.h"
+
 #include 
 #include  
 #include    

==== //depot/projects/vap/sys/net80211/ieee80211_crypto_wep.c#9 (text+ko) ====

@@ -29,6 +29,8 @@
 /*
  * IEEE 802.11 WEP crypto support.
  */
+#include "opt_wlan.h"
+
 #include 
 #include  
 #include    

==== //depot/projects/vap/sys/net80211/ieee80211_dfs.c#2 (text+ko) ====

@@ -32,6 +32,7 @@
  * IEEE 802.11 DFS/Radar support.
  */
 #include "opt_inet.h"
+#include "opt_wlan.h"
 
 #include 
 #include  

==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#14 (text+ko) ====

@@ -29,6 +29,8 @@
 /*
  * IEEE 802.11 support (FreeBSD-specific code)
  */
+#include "opt_wlan.h"
+
 #include 
 #include 
 #include  

==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#13 (text+ko) ====

@@ -28,8 +28,6 @@
 #define _NET80211_IEEE80211_FREEBSD_H_
 
 #ifdef _KERNEL
-#include "opt_wlan.h"
-
 /*
  * Common state locking definitions.
  */

==== //depot/projects/vap/sys/net80211/ieee80211_hostap.c#2 (text+ko) ====

@@ -32,6 +32,7 @@
  * IEEE 802.11 HOSTAP mode support.
  */
 #include "opt_inet.h"
+#include "opt_wlan.h"
 
 #include 
 #include  

==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#5 (text+ko) ====

@@ -33,6 +33,7 @@
  */
 
 #include "opt_inet.h"
+#include "opt_wlan.h"
 
 #include 
 #include 

==== //depot/projects/vap/sys/net80211/ieee80211_input.c#23 (text+ko) ====

@@ -27,6 +27,8 @@
 #include 
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.114 2007/11/02 05:22:24 sam Exp $");
 
+#include "opt_wlan.h"
+
 #include 
 #include 
 #include    

==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#19 (text+ko) ====

@@ -33,6 +33,7 @@
 
 #include "opt_inet.h"
 #include "opt_ipx.h"
+#include "opt_wlan.h"
 
 #include 
 #include 

==== //depot/projects/vap/sys/net80211/ieee80211_monitor.c#2 (text+ko) ====

@@ -32,6 +32,7 @@
  * IEEE 802.11 Monitor mode support.
  */
 #include "opt_inet.h"
+#include "opt_wlan.h"
 
 #include 
 #include  

==== //depot/projects/vap/sys/net80211/ieee80211_node.c#17 (text+ko) ====

@@ -27,6 +27,8 @@
 #include 
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.91 2007/11/23 06:23:12 sam Exp $");
 
+#include "opt_wlan.h"
+
 #include 
 #include  
 #include    

==== //depot/projects/vap/sys/net80211/ieee80211_output.c#20 (text+ko) ====

@@ -28,6 +28,7 @@
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.56 2007/11/23 06:24:57 sam Exp $");
 
 #include "opt_inet.h"
+#include "opt_wlan.h"
 
 #include 
 #include  

==== //depot/projects/vap/sys/net80211/ieee80211_power.c#7 (text+ko) ====

@@ -29,6 +29,8 @@
 /*
  * IEEE 802.11 power save support.
  */
+#include "opt_wlan.h"
+
 #include 
 #include  
 #include 

==== //depot/projects/vap/sys/net80211/ieee80211_proto.c#17 (text+ko) ====

@@ -32,6 +32,7 @@
  */
 
 #include "opt_inet.h"
+#include "opt_wlan.h"
 
 #include 
 #include 

==== //depot/projects/vap/sys/net80211/ieee80211_regdomain.c#4 (text+ko) ====

@@ -37,6 +37,7 @@
 /*
  * IEEE 802.11 regdomain support.
  */
+#include "opt_wlan.h"
 
 #include 
 #include  

==== //depot/projects/vap/sys/net80211/ieee80211_scan.c#12 (text+ko) ====

@@ -29,6 +29,8 @@
 /*
  * IEEE 802.11 scanning support.
  */
+#include "opt_wlan.h"
+
 #include 
 #include  
 #include 

==== //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#14 (text+ko) ====

@@ -29,6 +29,8 @@
 /*
  * IEEE 802.11 station scanning support.
  */
+#include "opt_wlan.h"
+
 #include 
 #include  
 #include 

==== //depot/projects/vap/sys/net80211/ieee80211_sta.c#2 (text+ko) ====

@@ -32,6 +32,7 @@
  * IEEE 802.11 Station mode support.
  */
 #include "opt_inet.h"
+#include "opt_wlan.h"
 
 #include 
 #include  

==== //depot/projects/vap/sys/net80211/ieee80211_wds.c#2 (text+ko) ====

@@ -32,6 +32,7 @@
  * IEEE 802.11 WDS mode support.
  */
 #include "opt_inet.h"
+#include "opt_wlan.h"
 
 #include 
 #include  

==== //depot/projects/vap/sys/net80211/ieee80211_xauth.c#7 (text+ko) ====

@@ -39,6 +39,8 @@
  * of the available callbacks--the user mode authenticator process works
  * entirely from messages about stations joining and leaving.
  */
+#include "opt_wlan.h"
+
 #include 
 #include 
 #include  

From owner-p4-projects@FreeBSD.ORG  Wed Dec  5 18:41:13 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A6DC216A41B; Wed,  5 Dec 2007 18:41: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 1E86516A417
	for ; Wed,  5 Dec 2007 18:41:12 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0F0F313C467
	for ; Wed,  5 Dec 2007 18:41:12 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB5IfCaf096770
	for ; Wed, 5 Dec 2007 18:41:12 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB5IeulZ096749
	for perforce@freebsd.org; Wed, 5 Dec 2007 18:40:56 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 5 Dec 2007 18:40:56 GMT
Message-Id: <200712051840.lB5IeulZ096749@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130282 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 05 Dec 2007 18:41:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=130282

Change 130282 by kmacy@freefall_kmacy_iwarp on 2007/12/05 18:40:06

	IFtoestack 130114

Affected files ...

.. //depot/projects/iwarp/ObsoleteFiles.inc#5 integrate
.. //depot/projects/iwarp/UPDATING#4 integrate
.. //depot/projects/iwarp/cddl/Makefile.inc#2 integrate
.. //depot/projects/iwarp/cddl/lib/libnvpair/Makefile#2 integrate
.. //depot/projects/iwarp/compat/opensolaris/include/alloca.h#1 branch
.. //depot/projects/iwarp/compat/opensolaris/include/fcntl.h#1 branch
.. //depot/projects/iwarp/compat/opensolaris/include/stdio.h#1 branch
.. //depot/projects/iwarp/compat/opensolaris/include/stdlib.h#1 branch
.. //depot/projects/iwarp/compat/opensolaris/include/strings.h#1 branch
.. //depot/projects/iwarp/compat/opensolaris/include/unistd.h#1 branch
.. //depot/projects/iwarp/contrib/bind9/CHANGES#2 integrate
.. //depot/projects/iwarp/contrib/bind9/COPYRIGHT#2 integrate
.. //depot/projects/iwarp/contrib/bind9/FAQ#2 integrate
.. //depot/projects/iwarp/contrib/bind9/FAQ.xml#2 integrate
.. //depot/projects/iwarp/contrib/bind9/Makefile.in#2 integrate
.. //depot/projects/iwarp/contrib/bind9/README#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/check/check-tool.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/check/named-checkconf.8#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/check/named-checkconf.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/check/named-checkzone.8#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/check/named-checkzone.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/check/named-checkzone.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/dig/dig.1#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/dig/dig.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/dig/dig.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/dig/dig.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/dig/dighost.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/dig/host.1#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/dig/host.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/dig/host.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/dig/host.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/dig/nslookup.1#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/dig/nslookup.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/dig/nslookup.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/dig/nslookup.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/named/client.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/named/config.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/named/control.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/named/lwresd.8#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/named/lwresd.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/named/lwresd.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/named/named.8#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/named/named.conf.5#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/named/named.conf.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/named/named.conf.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/named/named.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/named/named.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/named/query.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/named/server.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/named/update.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/rndc/Makefile.in#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/rndc/rndc.8#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/rndc/rndc.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/bin/rndc/rndc.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/configure.in#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/arm/Makefile.in#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/arm/man.dig.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/arm/man.host.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/arm/man.named.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/arm/man.rndc.html#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#2 delete
.. //depot/projects/iwarp/contrib/bind9/doc/misc/Makefile.in#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/misc/migration#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/rfc/index#2 integrate
.. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc4398.txt#1 branch
.. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc4408.txt#1 branch
.. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc4470.txt#1 branch
.. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc4634.txt#1 branch
.. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc4641.txt#1 branch
.. //depot/projects/iwarp/contrib/bind9/lib/bind/api#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/bind/config.h.in#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/bind/configure#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/bind/configure.in#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/bind/irs/gai_strerror.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/bind/irs/irs_data.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/bind/make/rules.in#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/bind/port_before.h.in#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/bind/resolv/res_data.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/bind9/api#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/bind9/check.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/adb.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/api#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/dispatch.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/dnssec.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/include/dns/db.h#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/include/dns/dispatch.h#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/journal.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/lookup.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/master.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/message.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/openssl_link.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/openssldh_link.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/rbtdb.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/rdataslab.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/resolver.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/rootns.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/sdb.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/sdlz.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/tsig.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/validator.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/view.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/xfrin.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/dns/zone.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/isc/Makefile.in#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/isc/alpha/Makefile.in#1 branch
.. //depot/projects/iwarp/contrib/bind9/lib/isc/alpha/include/Makefile.in#1 branch
.. //depot/projects/iwarp/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#1 branch
.. //depot/projects/iwarp/contrib/bind9/lib/isc/api#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/isc/arm/include/isc/atomic.h#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/isc/hmacsha.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/isc/ia64/Makefile.in#1 branch
.. //depot/projects/iwarp/contrib/bind9/lib/isc/ia64/include/Makefile.in#1 branch
.. //depot/projects/iwarp/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#1 branch
.. //depot/projects/iwarp/contrib/bind9/lib/isc/include/isc/platform.h.in#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/isc/include/isc/string.h#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/isc/mem.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/isc/mips/Makefile.in#1 branch
.. //depot/projects/iwarp/contrib/bind9/lib/isc/mips/include/Makefile.in#1 branch
.. //depot/projects/iwarp/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#1 branch
.. //depot/projects/iwarp/contrib/bind9/lib/isc/noatomic/Makefile.in#1 branch
.. //depot/projects/iwarp/contrib/bind9/lib/isc/noatomic/include/Makefile.in#1 branch
.. //depot/projects/iwarp/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#1 branch
.. //depot/projects/iwarp/contrib/bind9/lib/isc/powerpc/Makefile.in#1 branch
.. //depot/projects/iwarp/contrib/bind9/lib/isc/powerpc/include/Makefile.in#1 branch
.. //depot/projects/iwarp/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in#1 branch
.. //depot/projects/iwarp/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/isc/sparc64/Makefile.in#1 branch
.. //depot/projects/iwarp/contrib/bind9/lib/isc/sparc64/include/Makefile.in#1 branch
.. //depot/projects/iwarp/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in#1 branch
.. //depot/projects/iwarp/contrib/bind9/lib/isc/timer.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/isc/unix/net.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/isc/unix/socket.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/isc/unix/syslog.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/isc/x86_32/Makefile.in#1 branch
.. //depot/projects/iwarp/contrib/bind9/lib/isc/x86_32/include/Makefile.in#1 branch
.. //depot/projects/iwarp/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in#1 branch
.. //depot/projects/iwarp/contrib/bind9/lib/isc/x86_64/Makefile.in#1 branch
.. //depot/projects/iwarp/contrib/bind9/lib/isc/x86_64/include/Makefile.in#1 branch
.. //depot/projects/iwarp/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in#1 branch
.. //depot/projects/iwarp/contrib/bind9/lib/isccc/symtab.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/isccfg/api#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/lwres/api#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/lwres/context.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/lwres/getipnode.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/lwres/lwres_gnba.c#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate
.. //depot/projects/iwarp/contrib/bind9/make/rules.in#2 integrate
.. //depot/projects/iwarp/contrib/bind9/version#2 integrate
.. //depot/projects/iwarp/contrib/binutils/opcodes/ppc-dis.c#2 integrate
.. //depot/projects/iwarp/contrib/less/NEWS#3 integrate
.. //depot/projects/iwarp/contrib/less/README#3 integrate
.. //depot/projects/iwarp/contrib/less/less.man#3 integrate
.. //depot/projects/iwarp/contrib/less/less.nro#3 integrate
.. //depot/projects/iwarp/contrib/less/lessecho.man#3 integrate
.. //depot/projects/iwarp/contrib/less/lessecho.nro#3 integrate
.. //depot/projects/iwarp/contrib/less/lesskey.man#3 integrate
.. //depot/projects/iwarp/contrib/less/lesskey.nro#3 integrate
.. //depot/projects/iwarp/contrib/less/search.c#3 integrate
.. //depot/projects/iwarp/contrib/less/version.c#3 integrate
.. //depot/projects/iwarp/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate
.. //depot/projects/iwarp/contrib/tcpdump/tcpdump.c#3 integrate
.. //depot/projects/iwarp/etc/defaults/periodic.conf#2 integrate
.. //depot/projects/iwarp/etc/etc.amd64/ttys#3 integrate
.. //depot/projects/iwarp/etc/etc.arm/ttys#3 integrate
.. //depot/projects/iwarp/etc/etc.i386/ttys#3 integrate
.. //depot/projects/iwarp/etc/etc.ia64/ttys#3 integrate
.. //depot/projects/iwarp/etc/etc.powerpc/ttys#3 integrate
.. //depot/projects/iwarp/etc/etc.sparc64/ttys#3 integrate
.. //depot/projects/iwarp/etc/freebsd-update.conf#3 integrate
.. //depot/projects/iwarp/etc/gss/mech#2 integrate
.. //depot/projects/iwarp/etc/periodic/security/100.chksetuid#2 integrate
.. //depot/projects/iwarp/gnu/lib/libobjc/Makefile#2 integrate
.. //depot/projects/iwarp/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate
.. //depot/projects/iwarp/include/assert.h#2 integrate
.. //depot/projects/iwarp/include/dirent.h#2 integrate
.. //depot/projects/iwarp/include/elf.h#2 integrate
.. //depot/projects/iwarp/kerberos5/lib/Makefile.inc#2 integrate
.. //depot/projects/iwarp/lib/bind/bind/Makefile#2 integrate
.. //depot/projects/iwarp/lib/bind/bind/config.h#2 integrate
.. //depot/projects/iwarp/lib/bind/bind/port_before.h#2 integrate
.. //depot/projects/iwarp/lib/bind/config.h#2 integrate
.. //depot/projects/iwarp/lib/bind/config.mk#2 integrate
.. //depot/projects/iwarp/lib/bind/isc/isc/platform.h#2 integrate
.. //depot/projects/iwarp/lib/bind/lwres/Makefile#2 integrate
.. //depot/projects/iwarp/lib/csu/common/crtbrand.c#2 integrate
.. //depot/projects/iwarp/lib/libc/amd64/Makefile.inc#2 integrate
.. //depot/projects/iwarp/lib/libc/gdtoa/_ldtoa.c#2 integrate
.. //depot/projects/iwarp/lib/libc/gdtoa/machdep_ldisQ.c#2 integrate
.. //depot/projects/iwarp/lib/libc/gdtoa/machdep_ldisx.c#2 integrate
.. //depot/projects/iwarp/lib/libc/gen/Symbol.map#2 integrate
.. //depot/projects/iwarp/lib/libc/gen/closedir.c#2 integrate
.. //depot/projects/iwarp/lib/libc/gen/readdir.c#2 integrate
.. //depot/projects/iwarp/lib/libc/gen/seekdir.c#2 integrate
.. //depot/projects/iwarp/lib/libc/gen/telldir.c#2 integrate
.. //depot/projects/iwarp/lib/libc/i386/Makefile.inc#2 integrate
.. //depot/projects/iwarp/lib/libc/ia64/Makefile.inc#2 integrate
.. //depot/projects/iwarp/lib/libc/nameser/ns_parse.c#2 integrate
.. //depot/projects/iwarp/lib/libc/resolv/res_data.c#2 integrate
.. //depot/projects/iwarp/lib/libc/resolv/res_init.c#2 integrate
.. //depot/projects/iwarp/lib/libc/rpc/authdes_prot.c#2 integrate
.. //depot/projects/iwarp/lib/libc/rpc/authunix_prot.c#2 integrate
.. //depot/projects/iwarp/lib/libc/rpc/key_prot_xdr.c#2 integrate
.. //depot/projects/iwarp/lib/libc/rpc/rpc_callmsg.c#2 integrate
.. //depot/projects/iwarp/lib/libc/rpc/rpc_prot.c#2 integrate
.. //depot/projects/iwarp/lib/libc/rpc/rpcb_prot.c#2 integrate
.. //depot/projects/iwarp/lib/libc/rpc/rpcb_st_xdr.c#2 integrate
.. //depot/projects/iwarp/lib/libc/sparc64/Makefile.inc#2 integrate
.. //depot/projects/iwarp/lib/libc/sparc64/fpu/fpu_explode.c#2 integrate
.. //depot/projects/iwarp/lib/libc/stdlib/malloc.3#2 integrate
.. //depot/projects/iwarp/lib/libc/stdlib/malloc.c#2 integrate
.. //depot/projects/iwarp/lib/libdisk/libdisk.3#3 integrate
.. //depot/projects/iwarp/lib/libdisk/libdisk.h#2 integrate
.. //depot/projects/iwarp/lib/libelf/elf.3#3 integrate
.. //depot/projects/iwarp/lib/libelf/gelf_xlatetof.3#2 integrate
.. //depot/projects/iwarp/lib/libelf/libelf_data.c#2 integrate
.. //depot/projects/iwarp/lib/libelf/libelf_xlate.c#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/Makefile#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_acquire_cred.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/Makefile#2 integrate
.. //depot/projects/iwarp/lib/libkse/arch/amd64/include/atomic_ops.h#2 integrate
.. //depot/projects/iwarp/lib/libkse/arch/amd64/include/pthread_md.h#2 integrate
.. //depot/projects/iwarp/lib/libkse/arch/arm/include/atomic_ops.h#2 integrate
.. //depot/projects/iwarp/lib/libkse/arch/i386/include/atomic_ops.h#2 integrate
.. //depot/projects/iwarp/lib/libkse/arch/i386/include/pthread_md.h#2 integrate
.. //depot/projects/iwarp/lib/libkse/arch/ia64/include/atomic_ops.h#2 integrate
.. //depot/projects/iwarp/lib/libkse/arch/ia64/include/pthread_md.h#2 integrate
.. //depot/projects/iwarp/lib/libkse/arch/powerpc/include/atomic_ops.h#2 integrate
.. //depot/projects/iwarp/lib/libkse/arch/powerpc/include/pthread_md.h#2 integrate
.. //depot/projects/iwarp/lib/libkse/arch/sparc64/include/atomic_ops.h#2 integrate
.. //depot/projects/iwarp/lib/libkse/arch/sparc64/include/pthread_md.h#2 integrate
.. //depot/projects/iwarp/lib/libkse/kse.map#2 integrate
.. //depot/projects/iwarp/lib/libkse/sys/lock.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/sys/lock.h#2 integrate
.. //depot/projects/iwarp/lib/libkse/sys/thr_error.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_accept.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_aio_suspend.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_atfork.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_attr_destroy.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_attr_get_np.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_attr_getdetachstate.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_attr_getguardsize.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_attr_getinheritsched.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_attr_getschedparam.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_attr_getschedpolicy.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_attr_getscope.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_attr_getstack.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_attr_getstackaddr.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_attr_getstacksize.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_attr_init.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_attr_setdetachstate.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_attr_setguardsize.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_attr_setinheritsched.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_attr_setschedparam.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_attr_setschedpolicy.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_attr_setscope.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_attr_setstack.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_attr_setstackaddr.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_attr_setstacksize.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_barrier.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_barrierattr.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_cancel.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_clean.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_close.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_concurrency.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_cond.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_condattr_destroy.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_condattr_init.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_condattr_pshared.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_connect.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_creat.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_create.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_detach.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_equal.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_execve.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_exit.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_fcntl.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_find_thread.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_fork.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_fsync.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_getschedparam.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_info.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_init.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_join.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_kern.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_kill.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_main_np.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_mattr_init.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_mattr_kind_np.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_mattr_pshared.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_msync.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_multi_np.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_mutex.c#3 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_mutex_prioceiling.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_mutex_protocol.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_mutexattr_destroy.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_nanosleep.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_once.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_open.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_pause.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_poll.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_priority_queue.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_private.h#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_pselect.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_pspinlock.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_raise.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_read.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_readv.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_resume_np.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_rtld.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_rwlock.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_rwlockattr.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_select.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_self.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_seterrno.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_setprio.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_setschedparam.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_sig.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_sigaction.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_sigaltstack.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_sigmask.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_sigpending.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_sigprocmask.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_sigsuspend.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_sigwait.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_single_np.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_sleep.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_spec.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_spinlock.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_stack.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_suspend_np.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_switch_np.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_symbols.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_system.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_tcdrain.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_vfork.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_wait.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_wait4.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_waitpid.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_write.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_writev.c#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_yield.c#2 integrate
.. //depot/projects/iwarp/lib/libpmc/Makefile#2 integrate
.. //depot/projects/iwarp/lib/libpmc/pmc.3#2 integrate
.. //depot/projects/iwarp/lib/libpmc/pmc_allocate.3#1 branch
.. //depot/projects/iwarp/lib/libpmc/pmc_attach.3#1 branch
.. //depot/projects/iwarp/lib/libpmc/pmc_capabilities.3#1 branch
.. //depot/projects/iwarp/lib/libpmc/pmc_configure_logfile.3#1 branch
.. //depot/projects/iwarp/lib/libpmc/pmc_disable.3#1 branch
.. //depot/projects/iwarp/lib/libpmc/pmc_event_names_of_class.3#1 branch
.. //depot/projects/iwarp/lib/libpmc/pmc_get_driver_stats.3#1 branch
.. //depot/projects/iwarp/lib/libpmc/pmc_get_msr.3#1 branch
.. //depot/projects/iwarp/lib/libpmc/pmc_init.3#1 branch
.. //depot/projects/iwarp/lib/libpmc/pmc_name_of_capability.3#1 branch
.. //depot/projects/iwarp/lib/libpmc/pmc_read.3#1 branch
.. //depot/projects/iwarp/lib/libpmc/pmc_set.3#1 branch
.. //depot/projects/iwarp/lib/libpmc/pmc_start.3#1 branch
.. //depot/projects/iwarp/lib/libpmc/pmclog.c#2 integrate
.. //depot/projects/iwarp/lib/libpmc/pmclog.h#2 integrate
.. //depot/projects/iwarp/lib/libthr/Makefile#2 integrate
.. //depot/projects/iwarp/lib/libthr/pthread.map#2 integrate
.. //depot/projects/iwarp/lib/libthr/thread/thr_mutex.c#3 integrate
.. //depot/projects/iwarp/lib/libthr/thread/thr_private.h#3 integrate
.. //depot/projects/iwarp/lib/libthr/thread/thr_rtld.c#2 integrate
.. //depot/projects/iwarp/lib/libthr/thread/thr_sem.c#2 integrate
.. //depot/projects/iwarp/lib/libthr/thread/thr_sig.c#2 integrate
.. //depot/projects/iwarp/lib/libthr/thread/thr_suspend_np.c#2 integrate
.. //depot/projects/iwarp/lib/libthr/thread/thr_umtx.c#2 integrate
.. //depot/projects/iwarp/lib/libthr/thread/thr_umtx.h#2 integrate
.. //depot/projects/iwarp/lib/libutil/pty.c#2 integrate
.. //depot/projects/iwarp/libexec/rtld-elf/powerpc/reloc.c#2 integrate
.. //depot/projects/iwarp/libexec/rtld-elf/sparc64/rtld_machdep.h#2 integrate
.. //depot/projects/iwarp/libexec/tftpd/Makefile#2 integrate
.. //depot/projects/iwarp/libexec/tftpd/tftpd.8#2 integrate
.. //depot/projects/iwarp/libexec/tftpd/tftpd.c#2 integrate
.. //depot/projects/iwarp/release/Makefile#4 integrate
.. //depot/projects/iwarp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#5 integrate
.. //depot/projects/iwarp/release/doc/share/sgml/release.ent#2 integrate
.. //depot/projects/iwarp/release/picobsd/tinyware/msg/msg.c#2 integrate
.. //depot/projects/iwarp/sbin/atacontrol/atacontrol.8#2 integrate
.. //depot/projects/iwarp/sbin/clri/clri.c#2 integrate
.. //depot/projects/iwarp/sbin/devd/Makefile#2 integrate
.. //depot/projects/iwarp/sbin/geom/class/nop/gnop.8#2 integrate
.. //depot/projects/iwarp/sbin/init/init.c#2 integrate
.. //depot/projects/iwarp/sbin/ipfw/ipfw.8#4 integrate
.. //depot/projects/iwarp/sbin/mdconfig/mdconfig.8#4 integrate
.. //depot/projects/iwarp/sbin/mount/mount.8#3 integrate
.. //depot/projects/iwarp/sbin/newfs/newfs.8#2 integrate
.. //depot/projects/iwarp/sbin/newfs/newfs.c#2 integrate
.. //depot/projects/iwarp/sbin/newfs/newfs.h#2 integrate
.. //depot/projects/iwarp/sbin/ping6/ping6.8#2 integrate
.. //depot/projects/iwarp/sbin/ping6/ping6.c#2 integrate
.. //depot/projects/iwarp/sbin/sysctl/sysctl.8#3 integrate
.. //depot/projects/iwarp/share/colldef/sv_SE.ISO8859-1.src#2 integrate
.. //depot/projects/iwarp/share/colldef/sv_SE.ISO8859-15.src#2 integrate
.. //depot/projects/iwarp/share/man/man4/aac.4#2 integrate
.. //depot/projects/iwarp/share/man/man4/agp.4#2 integrate
.. //depot/projects/iwarp/share/man/man4/enc.4#2 integrate
.. //depot/projects/iwarp/share/man/man4/hwpmc.4#2 integrate
.. //depot/projects/iwarp/share/man/man4/ichsmb.4#2 integrate
.. //depot/projects/iwarp/share/man/man4/msk.4#2 integrate
.. //depot/projects/iwarp/share/man/man4/nfe.4#2 integrate
.. //depot/projects/iwarp/share/man/man4/rl.4#2 integrate
.. //depot/projects/iwarp/share/man/man9/Makefile#5 integrate
.. //depot/projects/iwarp/share/man/man9/rwlock.9#2 integrate
.. //depot/projects/iwarp/share/man/man9/stack.9#1 branch
.. //depot/projects/iwarp/share/man/man9/sx.9#2 integrate
.. //depot/projects/iwarp/share/man/man9/timeout.9#2 integrate
.. //depot/projects/iwarp/share/misc/iso3166#2 integrate
.. //depot/projects/iwarp/share/mk/bsd.sys.mk#2 integrate
.. //depot/projects/iwarp/share/mk/sys.mk#4 integrate
.. //depot/projects/iwarp/sys/amd64/amd64/busdma_machdep.c#2 integrate
.. //depot/projects/iwarp/sys/amd64/amd64/db_trace.c#3 integrate
.. //depot/projects/iwarp/sys/amd64/amd64/genassym.c#2 integrate
.. //depot/projects/iwarp/sys/amd64/amd64/intr_machdep.c#2 integrate
.. //depot/projects/iwarp/sys/amd64/amd64/pmap.c#4 integrate
.. //depot/projects/iwarp/sys/amd64/amd64/prof_machdep.c#2 integrate
.. //depot/projects/iwarp/sys/amd64/amd64/stack_machdep.c#1 branch
.. //depot/projects/iwarp/sys/amd64/amd64/vm_machdep.c#3 integrate
.. //depot/projects/iwarp/sys/amd64/conf/GENERIC#3 integrate
.. //depot/projects/iwarp/sys/amd64/conf/NOTES#3 integrate
.. //depot/projects/iwarp/sys/amd64/include/pci_cfgreg.h#2 integrate
.. //depot/projects/iwarp/sys/amd64/include/stack.h#1 branch
.. //depot/projects/iwarp/sys/amd64/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/iwarp/sys/arm/arm/busdma_machdep.c#2 integrate
.. //depot/projects/iwarp/sys/arm/arm/cpufunc.c#4 integrate
.. //depot/projects/iwarp/sys/arm/arm/db_trace.c#2 integrate
.. //depot/projects/iwarp/sys/arm/arm/nexus_io.c#2 delete
.. //depot/projects/iwarp/sys/arm/arm/nexus_io_asm.S#2 delete
.. //depot/projects/iwarp/sys/arm/arm/pmap.c#5 integrate
.. //depot/projects/iwarp/sys/arm/arm/stack_machdep.c#1 branch
.. //depot/projects/iwarp/sys/arm/conf/AVILA#2 integrate
.. //depot/projects/iwarp/sys/arm/conf/BWCT#2 integrate
.. //depot/projects/iwarp/sys/arm/conf/CRB#2 integrate
.. //depot/projects/iwarp/sys/arm/conf/EP80219#2 integrate
.. //depot/projects/iwarp/sys/arm/conf/HL200#2 integrate
.. //depot/projects/iwarp/sys/arm/conf/IQ31244#2 integrate
.. //depot/projects/iwarp/sys/arm/conf/KB920X#2 integrate
.. //depot/projects/iwarp/sys/arm/conf/SIMICS#2 integrate
.. //depot/projects/iwarp/sys/arm/conf/SKYEYE#2 integrate
.. //depot/projects/iwarp/sys/arm/include/asmacros.h#2 integrate
.. //depot/projects/iwarp/sys/arm/include/atomic.h#2 integrate
.. //depot/projects/iwarp/sys/arm/include/stack.h#1 branch
.. //depot/projects/iwarp/sys/arm/sa11x0/files.sa11x0#2 integrate
.. //depot/projects/iwarp/sys/boot/i386/gptboot/gptldr.S#2 integrate
.. //depot/projects/iwarp/sys/boot/i386/pmbr/pmbr.s#2 integrate
.. //depot/projects/iwarp/sys/compat/linprocfs/linprocfs.c#2 integrate
.. //depot/projects/iwarp/sys/compat/ndis/ndis_var.h#2 integrate
.. //depot/projects/iwarp/sys/compat/ndis/ntoskrnl_var.h#2 integrate
.. //depot/projects/iwarp/sys/compat/ndis/subr_ndis.c#2 integrate
.. //depot/projects/iwarp/sys/compat/ndis/subr_ntoskrnl.c#3 integrate
.. //depot/projects/iwarp/sys/compat/opensolaris/rpc/xdr.h#2 integrate
.. //depot/projects/iwarp/sys/compat/opensolaris/sys/atomic.h#2 integrate
.. //depot/projects/iwarp/sys/compat/opensolaris/sys/bitmap.h#1 branch
.. //depot/projects/iwarp/sys/compat/opensolaris/sys/cpupart.h#1 branch
.. //depot/projects/iwarp/sys/compat/opensolaris/sys/cpuvar.h#1 branch
.. //depot/projects/iwarp/sys/compat/opensolaris/sys/cyclic.h#1 branch
.. //depot/projects/iwarp/sys/compat/opensolaris/sys/elf.h#1 branch
.. //depot/projects/iwarp/sys/compat/opensolaris/sys/kmem.h#2 integrate
.. //depot/projects/iwarp/sys/compat/opensolaris/sys/mman.h#1 branch
.. //depot/projects/iwarp/sys/compat/opensolaris/sys/modctl.h#1 branch
.. //depot/projects/iwarp/sys/compat/opensolaris/sys/objfs.h#1 branch
.. //depot/projects/iwarp/sys/compat/opensolaris/sys/param.h#1 branch
.. //depot/projects/iwarp/sys/compat/opensolaris/sys/pcpu.h#1 branch
.. //depot/projects/iwarp/sys/compat/opensolaris/sys/proc.h#3 integrate
.. //depot/projects/iwarp/sys/compat/opensolaris/sys/stat.h#1 branch
.. //depot/projects/iwarp/sys/compat/opensolaris/sys/time.h#2 integrate
.. //depot/projects/iwarp/sys/compat/opensolaris/sys/types.h#2 integrate
.. //depot/projects/iwarp/sys/conf/NOTES#3 integrate
.. //depot/projects/iwarp/sys/conf/files.amd64#5 integrate
.. //depot/projects/iwarp/sys/conf/files.arm#3 integrate
.. //depot/projects/iwarp/sys/conf/files.i386#5 integrate
.. //depot/projects/iwarp/sys/conf/files.ia64#3 integrate
.. //depot/projects/iwarp/sys/conf/files.pc98#4 integrate
.. //depot/projects/iwarp/sys/conf/files.powerpc#3 integrate
.. //depot/projects/iwarp/sys/conf/files.sparc64#2 integrate
.. //depot/projects/iwarp/sys/conf/files.sun4v#3 integrate
.. //depot/projects/iwarp/sys/conf/kmod.mk#3 integrate
.. //depot/projects/iwarp/sys/conf/options#2 integrate
.. //depot/projects/iwarp/sys/conf/options.amd64#2 integrate
.. //depot/projects/iwarp/sys/conf/options.i386#2 integrate
.. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/fil.c#4 integrate
.. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_auth.c#4 integrate
.. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate
.. //depot/projects/iwarp/sys/contrib/opensolaris/common/avl/avl.c#2 integrate
.. //depot/projects/iwarp/sys/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate
.. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate
.. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate
.. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate
.. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate
.. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate
.. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate
.. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate
.. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate
.. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate
.. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate
.. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/sys/procset.h#2 integrate
.. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate
.. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/sys/vmem.h#2 integrate
.. //depot/projects/iwarp/sys/contrib/pf/net/pf.c#4 integrate
.. //depot/projects/iwarp/sys/contrib/pf/net/pf_if.c#3 integrate
.. //depot/projects/iwarp/sys/contrib/pf/net/pf_ioctl.c#3 integrate
.. //depot/projects/iwarp/sys/dev/aac/aac_debug.c#2 integrate
.. //depot/projects/iwarp/sys/dev/acpica/acpi_battery.c#2 integrate
.. //depot/projects/iwarp/sys/dev/agp/agp_i810.c#2 integrate
.. //depot/projects/iwarp/sys/dev/amr/amr.c#2 integrate
.. //depot/projects/iwarp/sys/dev/amr/amr_cam.c#2 integrate
.. //depot/projects/iwarp/sys/dev/amr/amr_pci.c#2 integrate
.. //depot/projects/iwarp/sys/dev/an/if_an.c#3 integrate
.. //depot/projects/iwarp/sys/dev/asmc/asmc.c#2 integrate
.. //depot/projects/iwarp/sys/dev/ata/ata-chipset.c#4 integrate
.. //depot/projects/iwarp/sys/dev/ata/ata-disk.c#2 integrate
.. //depot/projects/iwarp/sys/dev/ata/ata-dma.c#2 integrate
.. //depot/projects/iwarp/sys/dev/ata/atapi-cd.c#3 integrate
.. //depot/projects/iwarp/sys/dev/ata/atapi-fd.c#2 integrate
.. //depot/projects/iwarp/sys/dev/ata/atapi-tape.c#2 integrate
.. //depot/projects/iwarp/sys/dev/bce/if_bce.c#2 integrate
.. //depot/projects/iwarp/sys/dev/bfe/if_bfe.c#2 integrate
.. //depot/projects/iwarp/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate
.. //depot/projects/iwarp/sys/dev/cxgb/cxgb_adapter.h#4 integrate
.. //depot/projects/iwarp/sys/dev/cxgb/cxgb_include.h#2 integrate
.. //depot/projects/iwarp/sys/dev/cxgb/cxgb_l2t.h#4 integrate
.. //depot/projects/iwarp/sys/dev/cxgb/cxgb_main.c#4 integrate
.. //depot/projects/iwarp/sys/dev/cxgb/cxgb_offload.c#5 integrate
.. //depot/projects/iwarp/sys/dev/cxgb/cxgb_offload.h#4 integrate
.. //depot/projects/iwarp/sys/dev/cxgb/cxgb_osdep.h#4 integrate
.. //depot/projects/iwarp/sys/dev/cxgb/cxgb_sge.c#4 integrate
.. //depot/projects/iwarp/sys/dev/cxgb/sys/cxgb_support.c#4 integrate
.. //depot/projects/iwarp/sys/dev/cxgb/sys/mvec.h#3 integrate
.. //depot/projects/iwarp/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate
.. //depot/projects/iwarp/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#1 branch
.. //depot/projects/iwarp/sys/dev/cxgb/ulp/toecore/toedev.h#3 delete
.. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate
.. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#2 integrate
.. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_defs.h#2 integrate
.. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_listen.c#2 integrate
.. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#2 integrate
.. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#1 branch
.. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_tom.c#2 integrate
.. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate
.. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 integrate
.. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/notes#1 branch
.. //depot/projects/iwarp/sys/dev/dc/if_dc.c#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_80003es2lan.c#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_80003es2lan.h#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_82540.c#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_82541.c#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_82541.h#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_82542.c#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_82543.c#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_82543.h#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_82571.c#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_82571.h#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_82575.c#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_82575.h#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_api.c#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_api.h#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_defines.h#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_hw.h#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_ich8lan.c#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_ich8lan.h#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_mac.c#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_mac.h#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_manage.c#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_manage.h#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_nvm.c#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_nvm.h#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_osdep.h#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_phy.c#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_phy.h#2 integrate
.. //depot/projects/iwarp/sys/dev/em/e1000_regs.h#2 integrate
.. //depot/projects/iwarp/sys/dev/em/if_em.c#2 integrate
.. //depot/projects/iwarp/sys/dev/em/if_em.h#2 integrate
.. //depot/projects/iwarp/sys/dev/hwpmc/hwpmc_x86.c#2 integrate
.. //depot/projects/iwarp/sys/dev/ichsmb/ichsmb_pci.c#2 integrate
.. //depot/projects/iwarp/sys/dev/if_ndis/if_ndis.c#3 integrate
.. //depot/projects/iwarp/sys/dev/lge/if_lge.c#2 integrate
.. //depot/projects/iwarp/sys/dev/msk/if_msk.c#2 integrate
.. //depot/projects/iwarp/sys/dev/msk/if_mskreg.h#2 integrate
.. //depot/projects/iwarp/sys/dev/nfe/if_nfe.c#4 integrate
.. //depot/projects/iwarp/sys/dev/nge/if_nge.c#2 integrate
.. //depot/projects/iwarp/sys/dev/nve/if_nve.c#2 integrate
.. //depot/projects/iwarp/sys/dev/random/yarrow.c#2 integrate
.. //depot/projects/iwarp/sys/dev/re/if_re.c#3 integrate
.. //depot/projects/iwarp/sys/dev/si/si_pci.c#2 integrate
.. //depot/projects/iwarp/sys/dev/sio/sio_isa.c#2 integrate
.. //depot/projects/iwarp/sys/dev/sio/sio_puc.c#2 integrate
.. //depot/projects/iwarp/sys/dev/sk/if_sk.c#2 integrate
.. //depot/projects/iwarp/sys/dev/snp/snp.c#2 integrate
.. //depot/projects/iwarp/sys/dev/sound/pci/hda/hdac.c#3 integrate
.. //depot/projects/iwarp/sys/dev/sound/pcm/channel.c#2 integrate
.. //depot/projects/iwarp/sys/dev/stge/if_stge.c#2 integrate
.. //depot/projects/iwarp/sys/dev/ti/if_ti.c#2 integrate
.. //depot/projects/iwarp/sys/dev/usb/if_rum.c#3 integrate
.. //depot/projects/iwarp/sys/dev/usb/if_zyd.c#4 integrate
.. //depot/projects/iwarp/sys/dev/usb/usbdevs#5 integrate
.. //depot/projects/iwarp/sys/dev/vge/if_vge.c#2 integrate
.. //depot/projects/iwarp/sys/dev/vx/if_vx_pci.c#2 integrate
.. //depot/projects/iwarp/sys/dev/wpi/if_wpi.c#3 integrate
.. //depot/projects/iwarp/sys/dev/wpi/if_wpireg.h#2 integrate
.. //depot/projects/iwarp/sys/geom/eli/g_eli_crypto.c#2 integrate
.. //depot/projects/iwarp/sys/i386/conf/GENERIC#3 integrate
.. //depot/projects/iwarp/sys/i386/conf/NOTES#3 integrate
.. //depot/projects/iwarp/sys/i386/conf/XBOX#2 integrate
.. //depot/projects/iwarp/sys/i386/i386/busdma_machdep.c#2 integrate
.. //depot/projects/iwarp/sys/i386/i386/db_trace.c#2 integrate
.. //depot/projects/iwarp/sys/i386/i386/genassym.c#2 integrate
.. //depot/projects/iwarp/sys/i386/i386/intr_machdep.c#2 integrate
.. //depot/projects/iwarp/sys/i386/i386/pmap.c#4 integrate
.. //depot/projects/iwarp/sys/i386/i386/stack_machdep.c#1 branch
.. //depot/projects/iwarp/sys/i386/include/stack.h#1 branch
.. //depot/projects/iwarp/sys/i386/isa/prof_machdep.c#2 integrate
.. //depot/projects/iwarp/sys/i386/linux/linux_machdep.c#2 integrate
.. //depot/projects/iwarp/sys/i386/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/iwarp/sys/ia64/conf/GENERIC#2 integrate
.. //depot/projects/iwarp/sys/ia64/ia64/busdma_machdep.c#2 integrate
.. //depot/projects/iwarp/sys/ia64/ia64/db_machdep.c#3 integrate
.. //depot/projects/iwarp/sys/ia64/ia64/interrupt.c#2 integrate
.. //depot/projects/iwarp/sys/ia64/ia64/stack_machdep.c#1 branch
.. //depot/projects/iwarp/sys/ia64/include/atomic.h#2 integrate
.. //depot/projects/iwarp/sys/kern/kern_clock.c#3 integrate
.. //depot/projects/iwarp/sys/kern/kern_descrip.c#2 integrate
.. //depot/projects/iwarp/sys/kern/kern_linker.c#4 integrate
.. //depot/projects/iwarp/sys/kern/kern_lock.c#3 integrate
.. //depot/projects/iwarp/sys/kern/kern_mutex.c#3 integrate
.. //depot/projects/iwarp/sys/kern/kern_proc.c#4 integrate
.. //depot/projects/iwarp/sys/kern/kern_rwlock.c#3 integrate
.. //depot/projects/iwarp/sys/kern/kern_sysctl.c#3 integrate
.. //depot/projects/iwarp/sys/kern/kern_timeout.c#2 integrate
.. //depot/projects/iwarp/sys/kern/kern_umtx.c#2 integrate
.. //depot/projects/iwarp/sys/kern/subr_bus.c#2 integrate
.. //depot/projects/iwarp/sys/kern/subr_stack.c#2 integrate
.. //depot/projects/iwarp/sys/kern/subr_witness.c#3 integrate
.. //depot/projects/iwarp/sys/kern/sys_pipe.c#3 integrate
.. //depot/projects/iwarp/sys/kern/tty_pty.c#3 integrate
.. //depot/projects/iwarp/sys/kern/uipc_sockbuf.c#2 integrate
.. //depot/projects/iwarp/sys/kern/vfs_bio.c#3 integrate
.. //depot/projects/iwarp/sys/kern/vfs_cache.c#2 integrate
.. //depot/projects/iwarp/sys/modules/amr/Makefile#2 integrate
.. //depot/projects/iwarp/sys/modules/zfs/Makefile#2 integrate
.. //depot/projects/iwarp/sys/net/ieee8023ad_lacp.c#2 integrate
.. //depot/projects/iwarp/sys/net/if.c#4 integrate
.. //depot/projects/iwarp/sys/net/if_enc.c#2 integrate
.. //depot/projects/iwarp/sys/net/if_ethersubr.c#4 integrate
.. //depot/projects/iwarp/sys/net/if_lagg.c#3 integrate
.. //depot/projects/iwarp/sys/net/pfil.c#2 integrate
.. //depot/projects/iwarp/sys/net/pfil.h#2 integrate
.. //depot/projects/iwarp/sys/net80211/ieee80211.c#2 integrate
.. //depot/projects/iwarp/sys/net80211/ieee80211.h#4 integrate
.. //depot/projects/iwarp/sys/net80211/ieee80211_ht.c#3 integrate
.. //depot/projects/iwarp/sys/net80211/ieee80211_node.c#3 integrate
.. //depot/projects/iwarp/sys/net80211/ieee80211_output.c#3 integrate
.. //depot/projects/iwarp/sys/net80211/ieee80211_proto.c#3 integrate
.. //depot/projects/iwarp/sys/net80211/ieee80211_scan_sta.c#3 integrate
.. //depot/projects/iwarp/sys/net80211/ieee80211_var.h#3 integrate
.. //depot/projects/iwarp/sys/netatalk/aarp.c#4 integrate
.. //depot/projects/iwarp/sys/netatalk/ddp_output.c#3 integrate
.. //depot/projects/iwarp/sys/netgraph/ng_cisco.c#2 integrate
.. //depot/projects/iwarp/sys/netinet/if_ether.c#5 integrate
.. //depot/projects/iwarp/sys/netinet/in_pcb.h#2 integrate
.. //depot/projects/iwarp/sys/netinet/ip_input.c#3 integrate
.. //depot/projects/iwarp/sys/netinet/ip_options.c#3 integrate
.. //depot/projects/iwarp/sys/netinet/libalias/alias_util.c#2 integrate
.. //depot/projects/iwarp/sys/netinet/tcp.h#2 integrate
.. //depot/projects/iwarp/sys/netinet/tcp_ofld.c#2 integrate
.. //depot/projects/iwarp/sys/netinet/tcp_ofld.h#2 integrate
.. //depot/projects/iwarp/sys/netinet/tcp_output.c#3 integrate
.. //depot/projects/iwarp/sys/netinet/tcp_subr.c#4 integrate
.. //depot/projects/iwarp/sys/netinet/tcp_syncache.c#3 integrate
.. //depot/projects/iwarp/sys/netinet/tcp_usrreq.c#4 integrate
.. //depot/projects/iwarp/sys/netinet/tcp_var.h#3 integrate
.. //depot/projects/iwarp/sys/netinet/toedev.h#1 branch
.. //depot/projects/iwarp/sys/netinet6/ip6_output.c#2 integrate
.. //depot/projects/iwarp/sys/netipsec/ipsec.c#2 integrate
.. //depot/projects/iwarp/sys/netipsec/ipsec.h#2 integrate
.. //depot/projects/iwarp/sys/netipsec/ipsec_input.c#2 integrate
.. //depot/projects/iwarp/sys/netipsec/ipsec_output.c#2 integrate
.. //depot/projects/iwarp/sys/netipsec/xform.h#2 integrate
.. //depot/projects/iwarp/sys/netipsec/xform_ipip.c#2 integrate
.. //depot/projects/iwarp/sys/nfsclient/nfs_vnops.c#2 integrate
.. //depot/projects/iwarp/sys/pc98/conf/GENERIC#3 integrate
.. //depot/projects/iwarp/sys/pc98/include/stack.h#1 branch
.. //depot/projects/iwarp/sys/pci/if_rl.c#2 integrate
.. //depot/projects/iwarp/sys/pci/if_rlreg.h#2 integrate
.. //depot/projects/iwarp/sys/pci/if_sf.c#2 integrate
.. //depot/projects/iwarp/sys/pci/if_ste.c#2 integrate
.. //depot/projects/iwarp/sys/pci/if_vr.c#2 integrate
.. //depot/projects/iwarp/sys/pci/if_xl.c#2 integrate
.. //depot/projects/iwarp/sys/pci/xrpu.c#2 delete
.. //depot/projects/iwarp/sys/powerpc/conf/GENERIC#3 integrate
.. //depot/projects/iwarp/sys/powerpc/include/atomic.h#2 integrate
.. //depot/projects/iwarp/sys/powerpc/include/stack.h#1 branch
.. //depot/projects/iwarp/sys/powerpc/powerpc/db_trace.c#2 integrate
.. //depot/projects/iwarp/sys/powerpc/powerpc/intr_machdep.c#2 integrate
.. //depot/projects/iwarp/sys/powerpc/powerpc/stack_machdep.c#1 branch
.. //depot/projects/iwarp/sys/sparc64/conf/GENERIC#2 integrate
.. //depot/projects/iwarp/sys/sparc64/include/stack.h#1 branch
.. //depot/projects/iwarp/sys/sparc64/pci/ofw_pcibus.c#2 integrate
.. //depot/projects/iwarp/sys/sparc64/pci/psycho.c#2 integrate
.. //depot/projects/iwarp/sys/sparc64/pci/psychovar.h#2 integrate
.. //depot/projects/iwarp/sys/sparc64/sparc64/db_trace.c#2 integrate
.. //depot/projects/iwarp/sys/sparc64/sparc64/intr_machdep.c#2 integrate
.. //depot/projects/iwarp/sys/sparc64/sparc64/stack_machdep.c#1 branch
.. //depot/projects/iwarp/sys/sun4v/conf/GENERIC#2 integrate
.. //depot/projects/iwarp/sys/sun4v/include/pcpu.h#3 integrate
.. //depot/projects/iwarp/sys/sun4v/include/stack.h#1 branch
.. //depot/projects/iwarp/sys/sun4v/include/stdarg.h#2 integrate
.. //depot/projects/iwarp/sys/sun4v/sun4v/db_trace.c#2 integrate
.. //depot/projects/iwarp/sys/sun4v/sun4v/stack_machdep.c#1 branch
.. //depot/projects/iwarp/sys/sys/_elf_solaris.h#2 delete
.. //depot/projects/iwarp/sys/sys/callout.h#2 integrate
.. //depot/projects/iwarp/sys/sys/elf.h#2 integrate
.. //depot/projects/iwarp/sys/sys/elf_common.h#2 integrate
.. //depot/projects/iwarp/sys/sys/kernel.h#2 integrate
.. //depot/projects/iwarp/sys/sys/linker.h#4 integrate
.. //depot/projects/iwarp/sys/sys/lockmgr.h#2 integrate
.. //depot/projects/iwarp/sys/sys/mutex.h#2 integrate
.. //depot/projects/iwarp/sys/sys/param.h#5 integrate
.. //depot/projects/iwarp/sys/sys/pcpu.h#3 integrate
.. //depot/projects/iwarp/sys/sys/pmc.h#2 integrate
.. //depot/projects/iwarp/sys/sys/pmclog.h#2 integrate
.. //depot/projects/iwarp/sys/sys/resource.h#2 integrate
.. //depot/projects/iwarp/sys/sys/signal.h#2 integrate
.. //depot/projects/iwarp/sys/sys/socketvar.h#2 integrate
.. //depot/projects/iwarp/sys/sys/stack.h#2 integrate
.. //depot/projects/iwarp/sys/sys/stat.h#2 integrate
.. //depot/projects/iwarp/sys/sys/sysctl.h#3 integrate
.. //depot/projects/iwarp/sys/sys/time.h#2 integrate
.. //depot/projects/iwarp/sys/sys/types.h#2 integrate
.. //depot/projects/iwarp/sys/sys/umtx.h#2 integrate
.. //depot/projects/iwarp/sys/sys/user.h#2 integrate
.. //depot/projects/iwarp/sys/sys/xrpuio.h#2 delete
.. //depot/projects/iwarp/sys/ufs/ffs/ffs_alloc.c#3 integrate
.. //depot/projects/iwarp/sys/vm/redzone.c#2 integrate
.. //depot/projects/iwarp/sys/vm/vm_contig.c#2 integrate
.. //depot/projects/iwarp/sys/vm/vm_extern.h#3 integrate
.. //depot/projects/iwarp/sys/vm/vm_fault.c#2 integrate
.. //depot/projects/iwarp/sys/vm/vm_page.c#4 integrate
.. //depot/projects/iwarp/sys/vm/vm_pageout.c#2 integrate
.. //depot/projects/iwarp/sys/vm/vm_pageout.h#2 integrate
.. //depot/projects/iwarp/sys/vm/vnode_pager.c#3 integrate
.. //depot/projects/iwarp/tools/regression/lib/libc/stdio/test-printfloat.c#2 integrate
.. //depot/projects/iwarp/tools/regression/lib/libc/stdio/test-scanfloat.c#2 integrate
.. //depot/projects/iwarp/tools/regression/netinet/tcpconnect/README.tcp-md5#1 branch
.. //depot/projects/iwarp/tools/regression/netinet/tcpconnect/tcpconnect.c#2 integrate
.. //depot/projects/iwarp/tools/sched/schedgraph.py#3 integrate
.. //depot/projects/iwarp/usr.bin/Makefile#2 integrate
.. //depot/projects/iwarp/usr.bin/fstat/zfs/Makefile#2 integrate
.. //depot/projects/iwarp/usr.bin/login/login.1#2 integrate
.. //depot/projects/iwarp/usr.bin/make/main.c#2 integrate
.. //depot/projects/iwarp/usr.bin/netstat/Makefile#2 integrate
.. //depot/projects/iwarp/usr.bin/procstat/Makefile#1 branch
.. //depot/projects/iwarp/usr.bin/procstat/procstat.1#1 branch
.. //depot/projects/iwarp/usr.bin/procstat/procstat.c#1 branch
.. //depot/projects/iwarp/usr.bin/procstat/procstat.h#1 branch
.. //depot/projects/iwarp/usr.bin/procstat/procstat_args.c#1 branch
.. //depot/projects/iwarp/usr.bin/procstat/procstat_basic.c#1 branch
.. //depot/projects/iwarp/usr.bin/procstat/procstat_bin.c#1 branch
.. //depot/projects/iwarp/usr.bin/procstat/procstat_cred.c#1 branch
.. //depot/projects/iwarp/usr.bin/procstat/procstat_files.c#1 branch
.. //depot/projects/iwarp/usr.bin/procstat/procstat_kstack.c#1 branch
.. //depot/projects/iwarp/usr.bin/procstat/procstat_threads.c#1 branch
.. //depot/projects/iwarp/usr.bin/procstat/procstat_vm.c#1 branch
.. //depot/projects/iwarp/usr.bin/rpcgen/rpc_cout.c#2 integrate
.. //depot/projects/iwarp/usr.bin/tail/read.c#4 integrate
.. //depot/projects/iwarp/usr.sbin/acpi/acpidb/Makefile#2 integrate
.. //depot/projects/iwarp/usr.sbin/cxgbtool/cxgbtool.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/kldxref/Makefile#2 integrate
.. //depot/projects/iwarp/usr.sbin/newsyslog/newsyslog.conf.5#2 integrate
.. //depot/projects/iwarp/usr.sbin/nscd/Makefile#2 integrate
.. //depot/projects/iwarp/usr.sbin/pmcstat/pmcstat_log.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/rpc.yppasswdd/Makefile#2 integrate
.. //depot/projects/iwarp/usr.sbin/zic/zic.c#2 integrate

Differences ...

==== //depot/projects/iwarp/ObsoleteFiles.inc#5 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.118 2007/11/16 04:03:08 marcel Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.123 2007/11/29 21:49:08 brooks 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,14 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20071129: Disabled static versions of libkse by default
+.if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no"
+OLD_FILES+=usr/lib/libkse.a
+OLD_FILES+=usr/lib/libkse_p.a
+OLD_FILES+=usr/lib/libkse_pic.a
+.endif
+# 20071129: Removed a Solaris compatibility header
+OLD_FILES+=usr/include/sys/_elf_solaris.h
 # 20071108: Removed very crunch OLDCARD support file
 OLD_FILES+=etc/defaults/pccard.conf
 # 20071104: Removed bsdlabel, fdisk and gpt from rescue on ia64.
@@ -204,7 +212,7 @@
 # 20070605: sched_core removal
 OLD_FILES+=usr/share/man/man4/sched_core.4.gz
 # 20070603: BIND 9.4.1 import
-OLD_LIBS+=lib/liblwres.so.10
+OLD_LIBS+=usr/lib/liblwres.so.10
 # 20070521: shared library version bump
 OLD_LIBS+=lib/libatm.so.4
 OLD_LIBS+=lib/libbegemot.so.2
@@ -3963,6 +3971,21 @@
 #  - usr/share/tmac/mm/locale
 #  - usr/share/tmac/mm/se_locale
 #  - var/yp/Makefile
+
+# 20071120: shared library version bump
+OLD_LIBS+=usr/lib/libasn1.so.8
+OLD_LIBS+=usr/lib/libgssapi.so.8
+OLD_LIBS+=usr/lib/libgssapi_krb5.so.8
+OLD_LIBS+=usr/lib/libhdb.so.8
+OLD_LIBS+=usr/lib/libkadm5clnt.so.8
+OLD_LIBS+=usr/lib/libkadm5srv.so.8
+OLD_LIBS+=usr/lib/libkafs5.so.8
+OLD_LIBS+=usr/lib/libkrb5.so.8
+OLD_LIBS+=usr/lib/libobjc.so.2
+.if ${TARGET_ARCH} == "amd64"
+OLD_LIBS+=usr/lib32/libgssapi.so.8
+OLD_LIBS+=usr/lib32/libobjc.so.2
+.endif
 # 20070519: GCC 4.2
 OLD_LIBS+=usr/lib/libg2c.a
 OLD_LIBS+=usr/lib/libg2c.so

==== //depot/projects/iwarp/UPDATING#4 (text+ko) ====

@@ -21,6 +21,10 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20071128:
+	The ADAPTIVE_GIANT kernel option has been retired because its
+	functionality is the default now.
+
 20071118:
 	The AT keyboard emulation of sunkbd(4) has been turned on
 	by default. In order to make the special symbols of the Sun
@@ -945,4 +949,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.512 2007/11/18 18:11:16 marius Exp $
+$FreeBSD: src/UPDATING,v 1.513 2007/11/28 13:04:11 matteo Exp $

==== //depot/projects/iwarp/cddl/Makefile.inc#2 (text+ko) ====

@@ -1,3 +1,6 @@
-# $FreeBSD: src/cddl/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $
+# $FreeBSD: src/cddl/Makefile.inc,v 1.3 2007/11/28 22:58:09 jb Exp $
+
+OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../contrib/opensolaris
+OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/contrib/opensolaris
 
-CFLAGS+= -D_SOLARIS_C_SOURCE
+IGNORE_PRAGMA=	YES

==== //depot/projects/iwarp/cddl/lib/libnvpair/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $
+# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.3 2007/11/28 22:58:09 jb Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
 .PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair
@@ -10,8 +10,8 @@
 	nvpair_alloc_fixed.c \
 	nvpair.c
 
+CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
 CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../include		# XXX
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
 
 .include 

==== //depot/projects/iwarp/contrib/bind9/CHANGES#2 (text+ko) ====

@@ -1,5 +1,117 @@
 
-	--- 9.4.1-P1 released ---
+	--- 9.4.2 released ---
+	--- 9.4.2rc2 released ---
+
+2259.	[bug]		Reverse incorrect LIBINTERFACE bump of libisc
+			in 9.4.2rc1.  Applications built against 9.4.2rc1
+			will need to be rebuilt.
+
+2258.	[bug]		Fallback from IXFR/TSIG to SOA/AXFR/TSIG broken.
+			[RT #17241]
+
+2257.	[bug]		win32: Use the full path to vcredist_x86.exe when
+			calling it. [RT #17222]
+
+2256.	[bug]		win32: Correctly register the installation location of
+			bindevt.dll. [RT #17159]
+
+2255.	[bug]		L.ROOT-SERVERS.NET is now 199.7.83.42.
+
+2254.	[bug]		timer.c:dispatch() failed to lock timer->lock
+			when reading timer->idle allowing it to see
+			intermediate values as timer->idle was reset by
+			isc_timer_touch(). [RT #17243]
+
+	--- 9.4.2rc1 released ---
+
+2251.	[doc]		Update memstatistics-file documentation to reflect
+			reality. Note there is behaviour change for BIND 9.5.
+			[RT #17113]
+
+2249.   [bug]           Only set Authentic Data bit if client requested
+                        DNSSEC, per RFC 3655 [RT #17175]
+
+2248.   [cleanup]       Fix several errors reported by Coverity. [RT #17160]
+
+2245.	[bug]		Validating lack of DS records at trust anchors wasn't
+			working. [RT #17151]
+
+2238.	[bug]		It was possible to trigger a REQUIRE when a
+			validation was cancelled. [RT #17106]
+

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Dec  5 19:10:44 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0355516A41B; Wed,  5 Dec 2007 19:10:44 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A2E4216A417
	for ; Wed,  5 Dec 2007 19:10:43 +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 954B213C45D
	for ; Wed,  5 Dec 2007 19:10:43 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB5JAhDQ007240
	for ; Wed, 5 Dec 2007 19:10:43 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB5JAhsB007237
	for perforce@freebsd.org; Wed, 5 Dec 2007 19:10:43 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 5 Dec 2007 19:10:43 GMT
Message-Id: <200712051910.lB5JAhsB007237@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 130284 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 05 Dec 2007 19:10:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=130284

Change 130284 by hselasky@hselasky_laptop001 on 2007/12/05 19:10:08

	
	Workaround for buggy USB devices that have no strings.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#66 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#66 (text+ko) ====

@@ -1471,9 +1471,29 @@
 		udev->no_strings = 1;
 	}
 #endif
+
+	/*
+	 * Workaround for buggy USB devices.
+	 *
+	 * It appears that some string-less USB chips will crash and
+	 * disappear if any attempts are made to read any string
+	 * descriptors.
+	 *
+	 * Try to detect such chips by checking the strings in the USB
+	 * device descriptor. If no strings are present there we
+	 * simply disable all USB strings.
+	 */
+
+	if (udev->ddesc.iManufacturer ||
+	    udev->ddesc.iProduct ||
+	    udev->ddesc.iSerialNumber) {
 	/* setup language ID */
 	err = usbreq_get_string_desc(udev, &usb_global_lock, buf, 4,
 	    0, USB_LANGUAGE_TABLE);
+	} else {
+	  err = USBD_INVAL;
+	}
+
 	if (err || (buf[0] < 4)) {
 		udev->no_strings = 1;
 	} else {

From owner-p4-projects@FreeBSD.ORG  Wed Dec  5 19:11:45 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2D26116A41B; Wed,  5 Dec 2007 19: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 E719516A419
	for ; Wed,  5 Dec 2007 19:11:44 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D99DC13C458
	for ; Wed,  5 Dec 2007 19:11:44 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB5JBi9P007581
	for ; Wed, 5 Dec 2007 19:11:44 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB5JBiiZ007578
	for perforce@freebsd.org; Wed, 5 Dec 2007 19:11:44 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 5 Dec 2007 19:11:44 GMT
Message-Id: <200712051911.lB5JBiiZ007578@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 130285 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 05 Dec 2007 19:11:45 -0000

http://perforce.freebsd.org/chv.cgi?CH=130285

Change 130285 by hselasky@hselasky_laptop001 on 2007/12/05 19:11:23

	
	Style change resulting from running
	"usb_style.sh" on "usb_subr.c".

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#67 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#67 (text+ko) ====

@@ -1487,11 +1487,11 @@
 	if (udev->ddesc.iManufacturer ||
 	    udev->ddesc.iProduct ||
 	    udev->ddesc.iSerialNumber) {
-	/* setup language ID */
-	err = usbreq_get_string_desc(udev, &usb_global_lock, buf, 4,
-	    0, USB_LANGUAGE_TABLE);
+		/* setup language ID */
+		err = usbreq_get_string_desc(udev, &usb_global_lock, buf, 4,
+		    0, USB_LANGUAGE_TABLE);
 	} else {
-	  err = USBD_INVAL;
+		err = USBD_INVAL;
 	}
 
 	if (err || (buf[0] < 4)) {

From owner-p4-projects@FreeBSD.ORG  Wed Dec  5 21:03:50 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8652D16A468; Wed,  5 Dec 2007 21:03:50 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DAB1C16A417
	for ; Wed,  5 Dec 2007 21:03:49 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CACC413C46E
	for ; Wed,  5 Dec 2007 21:03:49 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB5L3nLS038991
	for ; Wed, 5 Dec 2007 21:03:49 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB5L3iXs038961
	for perforce@freebsd.org; Wed, 5 Dec 2007 21:03:44 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 5 Dec 2007 21:03:44 GMT
Message-Id: <200712052103.lB5L3iXs038961@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130290 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 05 Dec 2007 21:03:51 -0000

http://perforce.freebsd.org/chv.cgi?CH=130290

Change 130290 by kmacy@kmacy_home:ethng on 2007/12/05 21:03:31

	IFC #130287

Affected files ...

.. //depot/projects/ethng/src/Makefile.inc1#6 integrate
.. //depot/projects/ethng/src/bin/sh/sh.1#3 integrate
.. //depot/projects/ethng/src/contrib/amd/AUTHORS#2 integrate
.. //depot/projects/ethng/src/contrib/amd/BUGS#2 integrate
.. //depot/projects/ethng/src/contrib/amd/COPYING#2 integrate
.. //depot/projects/ethng/src/contrib/amd/ChangeLog#2 integrate
.. //depot/projects/ethng/src/contrib/amd/FAQ#1 branch
.. //depot/projects/ethng/src/contrib/amd/INSTALL#2 integrate
.. //depot/projects/ethng/src/contrib/amd/NEWS#2 integrate
.. //depot/projects/ethng/src/contrib/amd/README.attrcache#1 branch
.. //depot/projects/ethng/src/contrib/amd/README.ldap#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/am_ops.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/amd.8#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/amd.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/amd.h#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/amfs_auto.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/amfs_direct.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/amfs_error.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/amfs_generic.c#1 branch
.. //depot/projects/ethng/src/contrib/amd/amd/amfs_host.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/amfs_inherit.c#2 delete
.. //depot/projects/ethng/src/contrib/amd/amd/amfs_link.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/amfs_linkx.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/amfs_nfsl.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/amfs_nfsx.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/amfs_program.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/amfs_root.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/amfs_toplvl.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/amfs_union.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/amq_subr.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/amq_svc.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/autil.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/clock.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/conf.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/conf_parse.y#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/conf_tok.l#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/get_args.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/info_exec.c#1 branch
.. //depot/projects/ethng/src/contrib/amd/amd/info_file.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/info_hesiod.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/info_ldap.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/info_ndbm.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/info_nis.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/info_nisplus.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/info_passwd.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/info_union.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/map.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/mapc.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/mntfs.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/nfs_prot_svc.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/nfs_start.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/nfs_subr.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/ops_TEMPLATE.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/ops_cachefs.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/ops_cdfs.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/ops_efs.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/ops_lofs.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/ops_mfs.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/ops_nfs.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/ops_nfs3.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/ops_nullfs.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/ops_pcfs.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/ops_tfs.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/ops_tmpfs.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/ops_ufs.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/ops_umapfs.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/ops_unionfs.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/ops_xfs.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/opts.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/readdir.c#1 branch
.. //depot/projects/ethng/src/contrib/amd/amd/restart.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/rpc_fwd.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/sched.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/srvr_amfs_auto.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amd/srvr_nfs.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amq/amq.8#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amq/amq.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amq/amq.h#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amq/amq_clnt.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amq/amq_xdr.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amq/pawd.1#2 integrate
.. //depot/projects/ethng/src/contrib/amd/amq/pawd.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/aux_conf.h.in#2 integrate
.. //depot/projects/ethng/src/contrib/amd/bootstrap#2 integrate
.. //depot/projects/ethng/src/contrib/amd/conf/checkmount/checkmount_bsd44.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/conf/mtab/mtab_bsd.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#2 integrate
.. //depot/projects/ethng/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#2 integrate
.. //depot/projects/ethng/src/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#2 integrate
.. //depot/projects/ethng/src/contrib/amd/conf/transp/transp_sockets.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/conf/trap/trap_default.h#2 integrate
.. //depot/projects/ethng/src/contrib/amd/conf/umount/umount_bsd44.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/doc/am-utils.texi#2 integrate
.. //depot/projects/ethng/src/contrib/amd/doc/stamp-vti#1 branch
.. //depot/projects/ethng/src/contrib/amd/doc/texinfo.tex#2 integrate
.. //depot/projects/ethng/src/contrib/amd/doc/version.texi#2 integrate
.. //depot/projects/ethng/src/contrib/amd/fixmount/fixmount.8#2 integrate
.. //depot/projects/ethng/src/contrib/amd/fixmount/fixmount.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/fsinfo/fsi_analyze.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/fsinfo/fsi_data.h#2 integrate
.. //depot/projects/ethng/src/contrib/amd/fsinfo/fsi_dict.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/fsinfo/fsi_gram.y#2 integrate
.. //depot/projects/ethng/src/contrib/amd/fsinfo/fsi_lex.l#2 integrate
.. //depot/projects/ethng/src/contrib/amd/fsinfo/fsi_util.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/fsinfo/fsinfo.8#2 integrate
.. //depot/projects/ethng/src/contrib/amd/fsinfo/fsinfo.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/fsinfo/fsinfo.h#2 integrate
.. //depot/projects/ethng/src/contrib/amd/fsinfo/wr_atab.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/fsinfo/wr_bparam.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/fsinfo/wr_dumpset.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/fsinfo/wr_exportfs.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/fsinfo/wr_fstab.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/hlfsd/hlfsd.8#2 integrate
.. //depot/projects/ethng/src/contrib/amd/hlfsd/hlfsd.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/hlfsd/hlfsd.h#2 integrate
.. //depot/projects/ethng/src/contrib/amd/hlfsd/homedir.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/hlfsd/nfs_prot_svc.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/hlfsd/stubs.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/include/am_compat.h#2 integrate
.. //depot/projects/ethng/src/contrib/amd/include/am_defs.h#2 integrate
.. //depot/projects/ethng/src/contrib/amd/include/am_utils.h#2 integrate
.. //depot/projects/ethng/src/contrib/amd/include/am_xdr_func.h#2 integrate
.. //depot/projects/ethng/src/contrib/amd/include/amq_defs.h#2 integrate
.. //depot/projects/ethng/src/contrib/amd/include/mount_headers1.h#2 integrate
.. //depot/projects/ethng/src/contrib/amd/include/mount_headers2.h#2 integrate
.. //depot/projects/ethng/src/contrib/amd/ldap-id.ms#2 integrate
.. //depot/projects/ethng/src/contrib/amd/ldap.schema#1 branch
.. //depot/projects/ethng/src/contrib/amd/libamu/alloca.c#2 delete
.. //depot/projects/ethng/src/contrib/amd/libamu/amu.h#2 integrate
.. //depot/projects/ethng/src/contrib/amd/libamu/hasmntopt.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/libamu/misc_rpc.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/libamu/mount_fs.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/libamu/mtab.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/libamu/nfs_prot_xdr.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/libamu/strerror.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/libamu/strutil.c#1 branch
.. //depot/projects/ethng/src/contrib/amd/libamu/util.c#2 delete
.. //depot/projects/ethng/src/contrib/amd/libamu/wire.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/libamu/xdr_func.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/libamu/xutil.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/m4/GNUmakefile#2 delete
.. //depot/projects/ethng/src/contrib/amd/m4/amdgrep#2 delete
.. //depot/projects/ethng/src/contrib/amd/m4/amindent#2 delete
.. //depot/projects/ethng/src/contrib/amd/m4/autopat#2 delete
.. //depot/projects/ethng/src/contrib/amd/m4/chop-aclocal.pl#2 delete
.. //depot/projects/ethng/src/contrib/amd/m4/copy-if-newbig#2 delete
.. //depot/projects/ethng/src/contrib/amd/m4/macros/HEADER#2 delete
.. //depot/projects/ethng/src/contrib/amd/m4/macros/TRAILER#2 delete
.. //depot/projects/ethng/src/contrib/amd/m4/mk-aclocal#2 delete
.. //depot/projects/ethng/src/contrib/amd/m4/mkconf#2 delete
.. //depot/projects/ethng/src/contrib/amd/m4/rmtspc#2 delete
.. //depot/projects/ethng/src/contrib/amd/m4/update_build_version#2 delete
.. //depot/projects/ethng/src/contrib/amd/mk-amd-map/mk-amd-map.8#2 integrate
.. //depot/projects/ethng/src/contrib/amd/mk-amd-map/mk-amd-map.c#2 integrate
.. //depot/projects/ethng/src/contrib/amd/scripts/am-eject.in#2 integrate
.. //depot/projects/ethng/src/contrib/amd/scripts/amd.conf-sample#2 integrate
.. //depot/projects/ethng/src/contrib/amd/scripts/amd.conf.5#2 integrate
.. //depot/projects/ethng/src/contrib/amd/scripts/amd2ldif.in#2 integrate
.. //depot/projects/ethng/src/contrib/amd/scripts/amd2sun.in#2 integrate
.. //depot/projects/ethng/src/contrib/amd/scripts/automount2amd.8#2 integrate
.. //depot/projects/ethng/src/contrib/amd/scripts/automount2amd.in#2 integrate
.. //depot/projects/ethng/src/contrib/amd/scripts/ctl-amd.in#2 integrate
.. //depot/projects/ethng/src/contrib/amd/scripts/ctl-hlfsd.in#2 integrate
.. //depot/projects/ethng/src/contrib/amd/scripts/expn.1#2 integrate
.. //depot/projects/ethng/src/contrib/amd/scripts/expn.in#2 integrate
.. //depot/projects/ethng/src/contrib/amd/scripts/fix-amd-map.in#2 integrate
.. //depot/projects/ethng/src/contrib/amd/scripts/fixrmtab.in#2 integrate
.. //depot/projects/ethng/src/contrib/amd/scripts/redhat-ctl-amd.in#2 integrate
.. //depot/projects/ethng/src/contrib/amd/scripts/test-attrcache.in#1 branch
.. //depot/projects/ethng/src/contrib/amd/scripts/wait4amd.in#2 integrate
.. //depot/projects/ethng/src/contrib/amd/scripts/wait4amd2die.in#2 integrate
.. //depot/projects/ethng/src/contrib/amd/tasks#2 integrate
.. //depot/projects/ethng/src/contrib/amd/vers.m4#1 branch
.. //depot/projects/ethng/src/contrib/amd/wire-test/wire-test.8#2 integrate
.. //depot/projects/ethng/src/contrib/amd/wire-test/wire-test.c#2 integrate
.. //depot/projects/ethng/src/lib/csu/common/crtbrand.c#3 integrate
.. //depot/projects/ethng/src/lib/libarchive/archive_read_support_format_zip.c#3 integrate
.. //depot/projects/ethng/src/release/Makefile#7 integrate
.. //depot/projects/ethng/src/sbin/dhclient/dispatch.c#2 integrate
.. //depot/projects/ethng/src/share/man/man4/msk.4#3 integrate
.. //depot/projects/ethng/src/share/misc/iso3166#3 integrate
.. //depot/projects/ethng/src/share/zoneinfo/asia#4 integrate
.. //depot/projects/ethng/src/share/zoneinfo/northamerica#4 integrate
.. //depot/projects/ethng/src/share/zoneinfo/southamerica#3 integrate
.. //depot/projects/ethng/src/share/zoneinfo/zone.tab#3 integrate
.. //depot/projects/ethng/src/sys/amd64/amd64/pmap.c#6 integrate
.. //depot/projects/ethng/src/sys/amd64/amd64/trap.c#3 integrate
.. //depot/projects/ethng/src/sys/compat/freebsd32/freebsd32_misc.c#3 integrate
.. //depot/projects/ethng/src/sys/compat/ndis/subr_ndis.c#3 integrate
.. //depot/projects/ethng/src/sys/compat/ndis/subr_ntoskrnl.c#4 integrate
.. //depot/projects/ethng/src/sys/conf/NOTES#6 integrate
.. //depot/projects/ethng/src/sys/dev/if_ndis/if_ndis.c#4 integrate
.. //depot/projects/ethng/src/sys/dev/if_ndis/if_ndis_pci.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/if_ndis/if_ndisvar.h#2 integrate
.. //depot/projects/ethng/src/sys/dev/ipw/if_ipw.c#4 integrate
.. //depot/projects/ethng/src/sys/dev/iwi/if_iwi.c#5 integrate
.. //depot/projects/ethng/src/sys/dev/msk/if_msk.c#3 integrate
.. //depot/projects/ethng/src/sys/dev/msk/if_mskreg.h#3 integrate
.. //depot/projects/ethng/src/sys/dev/sio/sio.c#3 integrate
.. //depot/projects/ethng/src/sys/dev/utopia/utopia.c#3 integrate
.. //depot/projects/ethng/src/sys/fs/tmpfs/tmpfs_vnops.c#5 integrate
.. //depot/projects/ethng/src/sys/i386/i386/pmap.c#7 integrate
.. //depot/projects/ethng/src/sys/i386/i386/trap.c#3 integrate
.. //depot/projects/ethng/src/sys/kern/imgact_elf.c#4 integrate
.. //depot/projects/ethng/src/sys/kern/init_main.c#7 integrate
.. //depot/projects/ethng/src/sys/kern/kern_conf.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/kern_exec.c#6 integrate
.. //depot/projects/ethng/src/sys/kern/kern_mbuf.c#10 integrate
.. //depot/projects/ethng/src/sys/kern/kern_mib.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/vfs_mount.c#5 integrate
.. //depot/projects/ethng/src/sys/kern/vfs_subr.c#6 integrate
.. //depot/projects/ethng/src/sys/net/if_lagg.c#6 integrate
.. //depot/projects/ethng/src/sys/netinet/if_ether.c#9 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp.h#6 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_output.c#11 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_structs.h#6 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_usrreq.c#10 integrate
.. //depot/projects/ethng/src/sys/netinet/sctputil.c#12 integrate
.. //depot/projects/ethng/src/sys/netinet/tcp_syncache.c#6 integrate
.. //depot/projects/ethng/src/sys/security/audit/audit.c#4 integrate
.. //depot/projects/ethng/src/sys/sys/param.h#10 integrate
.. //depot/projects/ethng/src/sys/sys/proc.h#7 integrate
.. //depot/projects/ethng/src/sys/sys/systm.h#4 integrate
.. //depot/projects/ethng/src/tools/tools/ath/athdebug/athdebug.c#2 integrate
.. //depot/projects/ethng/src/tools/tools/ath/athstats/athstats.c#2 integrate
.. //depot/projects/ethng/src/tools/tools/ath/athstats/athstats.h#2 integrate
.. //depot/projects/ethng/src/tools/tools/ath/athstats/main.c#2 integrate
.. //depot/projects/ethng/src/tools/tools/ath/athstats/statfoo.c#2 integrate
.. //depot/projects/ethng/src/tools/tools/ath/athstats/statfoo.h#2 integrate
.. //depot/projects/ethng/src/tools/tools/net80211/wlanstats/main.c#3 integrate
.. //depot/projects/ethng/src/tools/tools/net80211/wlanstats/statfoo.c#3 integrate
.. //depot/projects/ethng/src/tools/tools/net80211/wlanstats/statfoo.h#2 integrate
.. //depot/projects/ethng/src/tools/tools/net80211/wlanstats/wlanstats.c#3 integrate
.. //depot/projects/ethng/src/tools/tools/net80211/wlanstats/wlanstats.h#2 integrate
.. //depot/projects/ethng/src/tools/tools/net80211/wlanwatch/wlanwatch.c#2 integrate
.. //depot/projects/ethng/src/usr.bin/procstat/procstat_kstack.c#2 integrate
.. //depot/projects/ethng/src/usr.bin/procstat/procstat_threads.c#2 integrate
.. //depot/projects/ethng/src/usr.sbin/Makefile#7 integrate
.. //depot/projects/ethng/src/usr.sbin/amd/amd/Makefile#2 integrate
.. //depot/projects/ethng/src/usr.sbin/amd/fsinfo/Makefile#2 integrate
.. //depot/projects/ethng/src/usr.sbin/amd/include/amu_autofs_prot.h#1 branch
.. //depot/projects/ethng/src/usr.sbin/amd/include/aux_conf.h#2 integrate
.. //depot/projects/ethng/src/usr.sbin/amd/include/build_version.h#2 integrate
.. //depot/projects/ethng/src/usr.sbin/amd/include/config.h#2 integrate
.. //depot/projects/ethng/src/usr.sbin/amd/include/newvers.sh#2 integrate
.. //depot/projects/ethng/src/usr.sbin/amd/libamu/Makefile#2 integrate
.. //depot/projects/ethng/src/usr.sbin/amd/mk-amd-map/Makefile#2 integrate
.. //depot/projects/ethng/src/usr.sbin/syslogd/syslogd.c#2 integrate

Differences ...

==== //depot/projects/ethng/src/Makefile.inc1#6 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.590 2007/10/31 09:26:42 yar Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.591 2007/12/04 12:55:27 yar Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -591,17 +591,25 @@
 #
 distributeworld installworld: installcheck
 	mkdir -p ${INSTALLTMP}
-	for prog in ${ITOOLS}; do \
+	progs=$$(for prog in ${ITOOLS}; do \
 		if progpath=`which $$prog`; then \
-			progs="$$progs $$progpath"; \
+			echo $$progpath; \
 		else \
 			echo "Required tool $$prog not found in PATH." >&2; \
 			exit 1; \
 		fi; \
-	done; \
-	cp $$progs ${INSTALLTMP}; \
-	cp `ldd -f "%p\n" -f "%p\n" $$progs 2>/dev/null | \
-	    sort -u` ${INSTALLTMP}
+	    done); \
+	libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | \
+	    while read line; do \
+		set -- $$line; \
+		if [ "$$2 $$3" != "not found" ]; then \
+			echo $$2; \
+		else \
+			echo "Required library $$1 not found." >&2; \
+			exit 1; \
+		fi; \
+	    done); \
+	cp $$libs $$progs ${INSTALLTMP}
 	cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale
 	${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
 	    ${IMAKEENV} rm -rf ${INSTALLTMP}

==== //depot/projects/ethng/src/bin/sh/sh.1#3 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.125 2007/10/04 16:14:48 stefanf Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.126 2007/12/05 12:29:26 ru Exp $
 .\"
 .Dd October 7, 2006
 .Dt SH 1
@@ -57,9 +57,12 @@
 This version has many features which make
 it appear
 similar in some respects to the Korn shell, but it is not a Korn
-shell clone like pdksh.
+shell clone like
+.Nm pdksh .
 Only features
-designated by POSIX, plus a few Berkeley extensions, are being
+designated by
+.Tn POSIX ,
+plus a few Berkeley extensions, are being
 incorporated into this shell.
 This man page is not intended to be a tutorial nor a complete
 specification of the shell.
@@ -107,6 +110,7 @@
 .Pa /etc/profile
 and then
 .Pa .profile
+in a user's home directory,
 if they exist.
 If the environment variable
 .Ev ENV
@@ -129,13 +133,15 @@
 .Pa .shinit
 the filename desired:
 .Pp
-.Dl ENV=$HOME/.shinit; export ENV
+.Dl "ENV=$HOME/.shinit; export ENV"
 .Pp
 The first non-option argument specified on the command line
 will be treated as the
 name of a file from which to read commands (a shell script), and
 the remaining arguments are set as the positional parameters
-of the shell ($1, $2, etc).
+of the shell
+.Li ( $1 , $2 ,
+etc.).
 Otherwise, the shell reads commands
 from its standard input.
 .Pp
@@ -180,7 +186,7 @@
 A
 .Dq Li --
 or plain
-.Dq Ql -
+.Ql -
 will stop option processing and will force the remaining
 words on the command line to be treated as arguments.
 The
@@ -198,7 +204,7 @@
 (UNIMPLEMENTED)
 .It Fl C Li noclobber
 Do not overwrite existing files with
-.Dq Li > .
+.Ql > .
 .It Fl E Li emacs
 Enable the built-in
 .Xr emacs 1
@@ -228,7 +234,7 @@
 Disable pathname expansion.
 .It Fl I Li ignoreeof
 Ignore
-.Dv EOF Ns ' Ns s
+.Dv EOF Ap s
 from input when in interactive mode.
 .It Fl i Li interactive
 Force the shell to behave interactively.
@@ -253,10 +259,10 @@
 .It Fl p Li privileged
 Turn on privileged mode.
 This mode is enabled on startup
-if either the effective user or group id is not equal to the
-real user or group id.
+if either the effective user or group ID is not equal to the
+real user or group ID.
 Turning this mode off sets the
-effective user and group ids to the real user and group ids.
+effective user and group IDs to the real user and group IDs.
 When this mode is enabled for interactive shells, the file
 .Pa /etc/suid_profile
 is sourced instead of
@@ -288,7 +294,6 @@
 .Bd -literal -offset indent
 sh -T -c "trap 'exit 1' 2 ; some-blocking-program"
 .Ed
-.Pp
 .It Fl u Li nounset
 Write a message to standard error when attempting
 to expand a variable that is not set, and if the
@@ -306,7 +311,7 @@
 .It Fl x Li xtrace
 Write each command
 (preceded by the value of the
-.Ev PS4
+.Va PS4
 variable)
 to standard error before it is executed.
 Useful for debugging.
@@ -384,7 +389,7 @@
 it impossible to put single-quotes in a single-quoted string).
 .It Double Quotes
 Enclosing characters within double quotes preserves the literal
-meaning of all characters except dollarsign
+meaning of all characters except dollar sign
 .Pq Ql $ ,
 backquote
 .Pq Ql ` ,
@@ -423,16 +428,14 @@
 For example, if there is an alias called
 .Dq Li lf
 with the value
-.Dq Li ls -F ,
+.Dq Li "ls -F" ,
 then the input
-.Bd -literal -offset indent
-lf foobar
-.Ed
+.Pp
+.Dl "lf foobar"
 .Pp
 would become
-.Bd -literal -offset indent
-ls -F foobar
-.Ed
+.Pp
+.Dl "ls -F foobar"
 .Pp
 Aliases provide a convenient way for naive users to
 create shorthands for commands without having to learn how
@@ -498,10 +501,10 @@
 The overall format
 used for redirection is:
 .Pp
-.Dl [n] redir-op file
+.D1 Oo Ar n Oc Ar redir-op file
 .Pp
 The
-.Ql redir-op
+.Ar redir-op
 is one of the redirection operators mentioned
 previously.
 The following gives some examples of how these
@@ -509,42 +512,66 @@
 Note that stdin and stdout are commonly used abbreviations
 for standard input and standard output respectively.
 .Bl -tag -width "1234567890XX" -offset indent
-.It Li [n]> file
-redirect stdout (or file descriptor n) to file
-.It Li [n]>| file
+.It Oo Ar n Oc Ns Li > Ar file
+redirect stdout (or file descriptor
+.Ar n )
+to
+.Ar file
+.It Oo Ar n Oc Ns Li >| Ar file
 same as above, but override the
 .Fl C
 option
-.It Li [n]>> file
-append stdout (or file descriptor n) to file
-.It Li [n]< file
-redirect stdin (or file descriptor n) from file
-.It Li [n]<> file
-redirect stdin (or file descriptor n) to and from file
-.It Li [n1]<&n2
-duplicate stdin (or file descriptor n1) from file descriptor n2
-.It Li [n]<&-
-close stdin (or file descriptor n)
-.It Li [n1]>&n2
-duplicate stdout (or file descriptor n1) to file descriptor n2
-.It Li [n]>&-
-close stdout (or file descriptor n)
+.It Oo Ar n Oc Ns Li >> Ar file
+append stdout (or file descriptor
+.Ar n )
+to
+.Ar file
+.It Oo Ar n Oc Ns Li < Ar file
+redirect stdin (or file descriptor
+.Ar n )
+from
+.Ar file
+.It Oo Ar n Oc Ns Li <> Ar file
+redirect stdin (or file descriptor
+.Ar n )
+to and from
+.Ar file
+.It Oo Ar n1 Oc Ns Li <& Ns Ar n2
+duplicate stdin (or file descriptor
+.Ar n1 )
+from file descriptor
+.Ar n2
+.It Oo Ar n Oc Ns Li <&-
+close stdin (or file descriptor
+.Ar n )
+.It Oo Ar n1 Oc Ns Li >& Ns Ar n2
+duplicate stdout (or file descriptor
+.Ar n1 )
+to file descriptor
+.Ar n2
+.It Oo Ar n Oc Ns Li >&-
+close stdout (or file descriptor
+.Ar n )
 .El
 .Pp
 The following redirection is often called a
 .Dq here-document .
-.Bd -literal -offset indent
-[n]<< delimiter
-	here-doc-text
-	...
-delimiter
+.Bd -unfilled -offset indent
+.Oo Ar n Oc Ns Li << Ar delimiter
+.D1 Ar here-doc-text
+.D1 ...
+.Ar delimiter
 .Ed
 .Pp
 All the text on successive lines up to the delimiter is
 saved away and made available to the command on standard
-input, or file descriptor n if it is specified.
-If the delimiter
-as specified on the initial line is quoted, then the here-doc-text
+input, or file descriptor
+.Ar n
+if it is specified.
+If the
+.Ar delimiter
+as specified on the initial line is quoted, then the
+.Ar here-doc-text
 is treated literally, otherwise the text is subjected to
 parameter expansion, command substitution, and arithmetic
 expansion (as described in the section on
@@ -554,7 +581,9 @@
 instead of
 .Dq Li << ,
 then leading tabs
-in the here-doc-text are stripped.
+in the
+.Ar here-doc-text
+are stripped.
 .Ss Search and Execution
 There are three types of commands: shell functions,
 built-in commands, and normal programs.
@@ -562,7 +591,9 @@
 The three types of commands are all executed in a different way.
 .Pp
 When a shell function is executed, all of the shell positional
-parameters (except $0, which remains unchanged) are
+parameters (except
+.Li $0 ,
+which remains unchanged) are
 set to the arguments of the shell function.
 The variables which are explicitly placed in the environment of
 the command (by placing assignments to them before the
@@ -583,11 +614,11 @@
 passing the arguments and the environment to the program.
 If the program is not a normal executable file
 (i.e., if it does not begin with the
-.Qq magic number
+.Dq "magic number"
 whose
 .Tn ASCII
 representation is
-.Qq #! ,
+.Dq Li #! ,
 resulting in an
 .Er ENOEXEC
 return value from
@@ -597,13 +628,16 @@
 so that the effect will be
 as if a new shell had been invoked to handle the ad-hoc shell script,
 except that the location of hashed commands located in
-the parent shell will be remembered by the child.
+the parent shell will be remembered by the child
+(see the description of the
+.Ic hash
+built-in command below).
 .Pp
 Note that previous versions of this document
 and the source code itself misleadingly and sporadically
 refer to a shell script without a magic number
 as a
-.Qq shell procedure .
+.Dq "shell procedure" .
 .Ss Path Search
 When locating a command, the shell first looks to see if
 it has a shell function by that name.
@@ -616,8 +650,9 @@
 Command names containing a slash are simply executed without
 performing any searches.
 .It
-The shell searches each entry in
+The shell searches each entry in the
 .Ev PATH
+environment variable
 in turn for the command.
 The value of the
 .Ev PATH
@@ -666,7 +701,8 @@
 that of the last simple command executed by the command.
 .Ss Pipelines
 A pipeline is a sequence of one or more commands separated
-by the control operator |.
+by the control operator
+.Ql \&| .
 The standard output of all but
 the last command is connected to the standard input
 of the next command.
@@ -675,10 +711,12 @@
 .Pp
 The format for a pipeline is:
 .Pp
-.Dl [!] command1 [ | command2 ...]
+.D1 Oo Li \&! Oc Ar command1 Op Li \&| Ar command2 ...
 .Pp
-The standard output of command1 is connected to the standard
-input of command2.
+The standard output of
+.Ar command1
+is connected to the standard input of
+.Ar command2 .
 The standard input, standard output, or
 both of a command is considered to be assigned by the
 pipeline before any redirection specified by redirection
@@ -704,22 +742,22 @@
 modified by redirection.
 For example:
 .Pp
-.Dl $ command1 2>&1 | command2
+.Dl "command1 2>&1 | command2"
 .Pp
 sends both the standard output and standard error of
-.Ql command1
+.Ar command1
 to the standard input of
-.Ql command2 .
+.Ar command2 .
 .Pp
 A
-.Dq Li \&;
+.Ql \&;
 or newline terminator causes the preceding
 AND-OR-list
 (described below in the section called
 .Sx Short-Circuit List Operators )
 to be executed sequentially;
 an
-.Dq Li &
+.Ql &
 causes asynchronous execution of the preceding AND-OR-list.
 .Pp
 Note that unlike some other shells,
@@ -738,12 +776,12 @@
 before executing the next command.
 .Pp
 The format for running a command in background is:
-.Bd -literal -offset indent
-command1 & [command2 & ...]
-.Ed
+.Pp
+.D1 Ar command1 Li & Op Ar command2 Li & Ar ...
 .Pp
 If the shell is not interactive, the standard input of an
-asynchronous command is set to /dev/null.
+asynchronous command is set to
+.Pa /dev/null .
 .Ss Lists (Generally Speaking)
 A list is a sequence of zero or more commands separated by
 newlines, semicolons, or ampersands,
@@ -773,22 +811,23 @@
 The syntax of the
 .Ic if
 command is:
-.\"
-.\" XXX Use .Dl to work around broken handling of .Ic inside .Bd and .Ed .
-.\"
-.Dl Ic if Ar list
-.Dl Ic then Ar list
-.Dl [ Ic elif Ar list
-.Dl Ic then Ar list ] ...
-.Dl [ Ic else Ar list ]
-.Dl Ic fi
+.Bd -unfilled -offset indent -compact
+.Ic if Ar list
+.Ic then Ar list
+.Oo Ic elif Ar list
+.Ic then Ar list Oc Ar ...
+.Op Ic else Ar list
+.Ic fi
+.Ed
 .Pp
 The syntax of the
 .Ic while
 command is:
-.Dl Ic while Ar list
-.Dl Ic do Ar list
-.Dl Ic done
+.Bd -unfilled -offset indent -compact
+.Ic while Ar list
+.Ic do Ar list
+.Ic done
+.Ed
 .Pp
 The two lists are executed repeatedly while the exit status of the
 first list is zero.
@@ -804,9 +843,11 @@
 The syntax of the
 .Ic for
 command is:
-.Dl Ic for Ar variable Op Ic in Ar word ...
-.Dl Ic do Ar list
-.Dl Ic done
+.Bd -unfilled -offset indent -compact
+.Ic for Ar variable Op Ic in Ar word ...
+.Ic do Ar list
+.Ic done
+.Ed
 .Pp
 If
 .Ic in
@@ -820,17 +861,17 @@
 and
 .Ic done
 commands may be replaced with
-.Dq Li {
+.Ql {
 and
-.Dq Li } .
+.Ql } .
 .Pp
 The syntax of the
 .Ic break
 and
 .Ic continue
 commands is:
-.Dl Ic break Op Ar num
-.Dl Ic continue Op Ar num
+.D1 Ic break Op Ar num
+.D1 Ic continue Op Ar num
 .Pp
 The
 .Ic break
@@ -848,18 +889,20 @@
 .Pp
 The syntax of the
 .Ic case
-command is
-.Dl Ic case Ar word Ic in
-.Dl pattern) list ;;
-.Dl ...
-.Dl Ic esac
+command is:
+.Bd -unfilled -offset indent -compact
+.Ic case Ar word Ic in
+.Ar pattern Ns Li ) Ar list Li ;;
+.Ar ...
+.Ic esac
+.Ed
 .Pp
 The pattern can actually be one or more patterns
 (see
 .Sx Shell Patterns
 described later),
 separated by
-.Dq Li \&|
+.Ql \&|
 characters.
 The exit code of the
 .Ic case
@@ -867,14 +910,12 @@
 zero if no patterns were matched.
 .Ss Grouping Commands Together
 Commands may be grouped by writing either
-.Bd -literal -offset indent
-(list)
-.Ed
+.Pp
+.D1 Li \&( Ns Ar list Ns Li \%)
 .Pp
 or
-.Bd -literal -offset indent
-{ list; }
-.Ed
+.Pp
+.D1 Li { Ar list Ns Li \&; }
 .Pp
 The first form executes the commands in a subshell.
 Note that built-in commands thus executed do not affect the current shell.
@@ -887,18 +928,21 @@
 .Ed
 .Ss Functions
 The syntax of a function definition is
-.Bd -literal -offset indent
-name ( ) command
-.Ed
+.Pp
+.D1 Ar name Li \&( \&) Ar command
 .Pp
 A function definition is an executable statement; when
-executed it installs a function named name and returns an
+executed it installs a function named
+.Ar name
+and returns an
 exit status of zero.
-The command is normally a list
+The
+.Ar command
+is normally a list
 enclosed between
-.Dq Li {
+.Ql {
 and
-.Dq Li } .
+.Ql } .
 .Pp
 Variables may be declared to be local to a function by
 using the
@@ -906,11 +950,8 @@
 command.
 This should appear as the first statement of a function,
 and the syntax is:
-.Bd -ragged -offset indent
-.Ic local
-.Op Ar variable ...
-.Op Fl
-.Ed
+.Pp
+.D1 Ic local Oo Ar variable ... Oc Op Fl
 .Pp
 The
 .Ic local
@@ -923,38 +964,38 @@
 Otherwise, the variable is initially unset.
 The shell
 uses dynamic scoping, so that if the variable
-.Em x
+.Va x
 is made local to function
 .Em f ,
 which then calls function
 .Em g ,
 references to the variable
-.Em x
+.Va x
 made inside
 .Em g
 will refer to the variable
-.Em x
+.Va x
 declared inside
 .Em f ,
 not to the global variable named
-.Em x .
+.Va x .
 .Pp
 The only special parameter that can be made local is
-.Dq Li - .
+.Ql - .
 Making
-.Dq Li -
+.Ql -
 local causes any shell options that are
-changed via the set command inside the function to be
+changed via the
+.Ic set
+command inside the function to be
 restored to their original values when the function
 returns.
 .Pp
 The syntax of the
 .Ic return
 command is
-.Bd -ragged -offset indent
-.Ic return
-.Op Ar exitstatus
-.Ed
+.Pp
+.D1 Ic return Op Ar exitstatus
 .Pp
 It terminates the current executional scope, returning from the previous
 nested function, sourced script, or shell instance, in that order.
@@ -969,9 +1010,8 @@
 the shell turns all the environment variables into shell
 variables.
 New variables can be set using the form
-.Bd -literal -offset indent
-name=value
-.Ed
+.Pp
+.D1 Ar name Ns = Ns Ar value
 .Pp
 Variables set by the user must have a name consisting solely
 of alphabetics, numerics, and underscores.
@@ -1001,12 +1041,10 @@
 the expansion occurs within a double-quoted string
 it expands to a single field with the value of each parameter
 separated by the first character of the
-.Ev IFS
+.Va IFS
 variable,
-or by a
-.Aq space
-if
-.Ev IFS
+or by a space if
+.Va IFS
 is unset.
 .It Li $@
 Expands to the positional parameters, starting from one.
@@ -1020,12 +1058,16 @@
 .Li @
 is double-quoted.
 What this basically means, for example, is
-if $1 is
-.Dq abc
-and $2 is
-.Dq def ghi ,
+if
+.Li $1
+is
+.Dq Li abc
+and
+.Li $2
+is
+.Dq Li "def ghi" ,
 then
-.Qq Li $@
+.Dq Li $@
 expands to
 the two arguments:
 .Bd -literal -offset indent
@@ -1033,18 +1075,22 @@
 .Ed
 .It Li $#
 Expands to the number of positional parameters.
-.It Li $\&?
+.It Li $?
 Expands to the exit status of the most recent pipeline.
 .It Li $-
 (hyphen) Expands to the current option flags (the single-letter
 option names concatenated into a string) as specified on
-invocation, by the set built-in command, or implicitly
+invocation, by the
+.Ic set
+built-in command, or implicitly
 by the shell.
 .It Li $$
 Expands to the process ID of the invoked shell.
 A subshell
-retains the same value of $ as its parent.
-.It Li $\&!
+retains the same value of
+.Va $
+as its parent.
+.It Li $!
 Expands to the process ID of the most recent background
 command executed from the current shell.
 For a
@@ -1067,7 +1113,7 @@
 fields from a single word.
 The single exception to this rule is
 the expansion of the special parameter
-.Li @
+.Va @
 within double-quotes,
 as was described above.
 .Pp
@@ -1079,7 +1125,7 @@
 .It
 Field Splitting is performed on fields generated by step (1)
 unless the
-.Ev IFS
+.Va IFS
 variable is null.
 .It
 Pathname Expansion (unless the
@@ -1090,7 +1136,7 @@
 .El
 .Pp
 The
-.Dq Li $
+.Ql $
 character is used to introduce parameter expansion, command
 substitution, or arithmetic evaluation.
 .Ss Tilde Expansion (substituting a user's home directory)
@@ -1103,30 +1149,34 @@
 or the end of the word are treated as a username

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Dec  5 21:07:59 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6E1D116A421; Wed,  5 Dec 2007 21:07:59 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E3CEF16A419
	for ; Wed,  5 Dec 2007 21:07:58 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D3EE613C44B
	for ; Wed,  5 Dec 2007 21:07:58 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB5L7wfE041523
	for ; Wed, 5 Dec 2007 21:07:58 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB5L7spZ041520
	for perforce@freebsd.org; Wed, 5 Dec 2007 21:07:54 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 5 Dec 2007 21:07:54 GMT
Message-Id: <200712052107.lB5L7spZ041520@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130291 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 05 Dec 2007 21:07:59 -0000

http://perforce.freebsd.org/chv.cgi?CH=130291

Change 130291 by kmacy@kmacy:storage:toestack on 2007/12/05 21:07:16

	IFethng #130290

Affected files ...

.. //depot/projects/toestack/Makefile.inc1#6 integrate
.. //depot/projects/toestack/bin/sh/sh.1#3 integrate
.. //depot/projects/toestack/contrib/amd/AUTHORS#2 integrate
.. //depot/projects/toestack/contrib/amd/BUGS#2 integrate
.. //depot/projects/toestack/contrib/amd/COPYING#2 integrate
.. //depot/projects/toestack/contrib/amd/ChangeLog#2 integrate
.. //depot/projects/toestack/contrib/amd/FAQ#1 branch
.. //depot/projects/toestack/contrib/amd/INSTALL#2 integrate
.. //depot/projects/toestack/contrib/amd/NEWS#2 integrate
.. //depot/projects/toestack/contrib/amd/README.attrcache#1 branch
.. //depot/projects/toestack/contrib/amd/README.ldap#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/am_ops.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/amd.8#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/amd.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/amd.h#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/amfs_auto.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/amfs_direct.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/amfs_error.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/amfs_generic.c#1 branch
.. //depot/projects/toestack/contrib/amd/amd/amfs_host.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/amfs_inherit.c#2 delete
.. //depot/projects/toestack/contrib/amd/amd/amfs_link.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/amfs_linkx.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/amfs_nfsl.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/amfs_nfsx.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/amfs_program.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/amfs_root.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/amfs_toplvl.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/amfs_union.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/amq_subr.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/amq_svc.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/autil.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/clock.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/conf.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/conf_parse.y#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/conf_tok.l#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/get_args.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/info_exec.c#1 branch
.. //depot/projects/toestack/contrib/amd/amd/info_file.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/info_hesiod.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/info_ldap.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/info_ndbm.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/info_nis.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/info_nisplus.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/info_passwd.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/info_union.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/map.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/mapc.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/mntfs.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/nfs_prot_svc.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/nfs_start.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/nfs_subr.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/ops_TEMPLATE.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/ops_cachefs.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/ops_cdfs.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/ops_efs.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/ops_lofs.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/ops_mfs.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/ops_nfs.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/ops_nfs3.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/ops_nullfs.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/ops_pcfs.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/ops_tfs.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/ops_tmpfs.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/ops_ufs.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/ops_umapfs.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/ops_unionfs.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/ops_xfs.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/opts.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/readdir.c#1 branch
.. //depot/projects/toestack/contrib/amd/amd/restart.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/rpc_fwd.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/sched.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/srvr_amfs_auto.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amd/srvr_nfs.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amq/amq.8#2 integrate
.. //depot/projects/toestack/contrib/amd/amq/amq.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amq/amq.h#2 integrate
.. //depot/projects/toestack/contrib/amd/amq/amq_clnt.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amq/amq_xdr.c#2 integrate
.. //depot/projects/toestack/contrib/amd/amq/pawd.1#2 integrate
.. //depot/projects/toestack/contrib/amd/amq/pawd.c#2 integrate
.. //depot/projects/toestack/contrib/amd/aux_conf.h.in#2 integrate
.. //depot/projects/toestack/contrib/amd/bootstrap#2 integrate
.. //depot/projects/toestack/contrib/amd/conf/checkmount/checkmount_bsd44.c#2 integrate
.. //depot/projects/toestack/contrib/amd/conf/mtab/mtab_bsd.c#2 integrate
.. //depot/projects/toestack/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#2 integrate
.. //depot/projects/toestack/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#2 integrate
.. //depot/projects/toestack/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#2 integrate
.. //depot/projects/toestack/contrib/amd/conf/transp/transp_sockets.c#2 integrate
.. //depot/projects/toestack/contrib/amd/conf/trap/trap_default.h#2 integrate
.. //depot/projects/toestack/contrib/amd/conf/umount/umount_bsd44.c#2 integrate
.. //depot/projects/toestack/contrib/amd/doc/am-utils.texi#2 integrate
.. //depot/projects/toestack/contrib/amd/doc/stamp-vti#1 branch
.. //depot/projects/toestack/contrib/amd/doc/texinfo.tex#2 integrate
.. //depot/projects/toestack/contrib/amd/doc/version.texi#2 integrate
.. //depot/projects/toestack/contrib/amd/fixmount/fixmount.8#2 integrate
.. //depot/projects/toestack/contrib/amd/fixmount/fixmount.c#2 integrate
.. //depot/projects/toestack/contrib/amd/fsinfo/fsi_analyze.c#2 integrate
.. //depot/projects/toestack/contrib/amd/fsinfo/fsi_data.h#2 integrate
.. //depot/projects/toestack/contrib/amd/fsinfo/fsi_dict.c#2 integrate
.. //depot/projects/toestack/contrib/amd/fsinfo/fsi_gram.y#2 integrate
.. //depot/projects/toestack/contrib/amd/fsinfo/fsi_lex.l#2 integrate
.. //depot/projects/toestack/contrib/amd/fsinfo/fsi_util.c#2 integrate
.. //depot/projects/toestack/contrib/amd/fsinfo/fsinfo.8#2 integrate
.. //depot/projects/toestack/contrib/amd/fsinfo/fsinfo.c#2 integrate
.. //depot/projects/toestack/contrib/amd/fsinfo/fsinfo.h#2 integrate
.. //depot/projects/toestack/contrib/amd/fsinfo/wr_atab.c#2 integrate
.. //depot/projects/toestack/contrib/amd/fsinfo/wr_bparam.c#2 integrate
.. //depot/projects/toestack/contrib/amd/fsinfo/wr_dumpset.c#2 integrate
.. //depot/projects/toestack/contrib/amd/fsinfo/wr_exportfs.c#2 integrate
.. //depot/projects/toestack/contrib/amd/fsinfo/wr_fstab.c#2 integrate
.. //depot/projects/toestack/contrib/amd/hlfsd/hlfsd.8#2 integrate
.. //depot/projects/toestack/contrib/amd/hlfsd/hlfsd.c#2 integrate
.. //depot/projects/toestack/contrib/amd/hlfsd/hlfsd.h#2 integrate
.. //depot/projects/toestack/contrib/amd/hlfsd/homedir.c#2 integrate
.. //depot/projects/toestack/contrib/amd/hlfsd/nfs_prot_svc.c#2 integrate
.. //depot/projects/toestack/contrib/amd/hlfsd/stubs.c#2 integrate
.. //depot/projects/toestack/contrib/amd/include/am_compat.h#2 integrate
.. //depot/projects/toestack/contrib/amd/include/am_defs.h#2 integrate
.. //depot/projects/toestack/contrib/amd/include/am_utils.h#2 integrate
.. //depot/projects/toestack/contrib/amd/include/am_xdr_func.h#2 integrate
.. //depot/projects/toestack/contrib/amd/include/amq_defs.h#2 integrate
.. //depot/projects/toestack/contrib/amd/include/mount_headers1.h#2 integrate
.. //depot/projects/toestack/contrib/amd/include/mount_headers2.h#2 integrate
.. //depot/projects/toestack/contrib/amd/ldap-id.ms#2 integrate
.. //depot/projects/toestack/contrib/amd/ldap.schema#1 branch
.. //depot/projects/toestack/contrib/amd/libamu/alloca.c#2 delete
.. //depot/projects/toestack/contrib/amd/libamu/amu.h#2 integrate
.. //depot/projects/toestack/contrib/amd/libamu/hasmntopt.c#2 integrate
.. //depot/projects/toestack/contrib/amd/libamu/misc_rpc.c#2 integrate
.. //depot/projects/toestack/contrib/amd/libamu/mount_fs.c#2 integrate
.. //depot/projects/toestack/contrib/amd/libamu/mtab.c#2 integrate
.. //depot/projects/toestack/contrib/amd/libamu/nfs_prot_xdr.c#2 integrate
.. //depot/projects/toestack/contrib/amd/libamu/strerror.c#2 integrate
.. //depot/projects/toestack/contrib/amd/libamu/strutil.c#1 branch
.. //depot/projects/toestack/contrib/amd/libamu/util.c#2 delete
.. //depot/projects/toestack/contrib/amd/libamu/wire.c#2 integrate
.. //depot/projects/toestack/contrib/amd/libamu/xdr_func.c#2 integrate
.. //depot/projects/toestack/contrib/amd/libamu/xutil.c#2 integrate
.. //depot/projects/toestack/contrib/amd/m4/GNUmakefile#2 delete
.. //depot/projects/toestack/contrib/amd/m4/amdgrep#2 delete
.. //depot/projects/toestack/contrib/amd/m4/amindent#2 delete
.. //depot/projects/toestack/contrib/amd/m4/autopat#2 delete
.. //depot/projects/toestack/contrib/amd/m4/chop-aclocal.pl#2 delete
.. //depot/projects/toestack/contrib/amd/m4/copy-if-newbig#2 delete
.. //depot/projects/toestack/contrib/amd/m4/macros/HEADER#2 delete
.. //depot/projects/toestack/contrib/amd/m4/macros/TRAILER#2 delete
.. //depot/projects/toestack/contrib/amd/m4/mk-aclocal#2 delete
.. //depot/projects/toestack/contrib/amd/m4/mkconf#2 delete
.. //depot/projects/toestack/contrib/amd/m4/rmtspc#2 delete
.. //depot/projects/toestack/contrib/amd/m4/update_build_version#2 delete
.. //depot/projects/toestack/contrib/amd/mk-amd-map/mk-amd-map.8#2 integrate
.. //depot/projects/toestack/contrib/amd/mk-amd-map/mk-amd-map.c#2 integrate
.. //depot/projects/toestack/contrib/amd/scripts/am-eject.in#2 integrate
.. //depot/projects/toestack/contrib/amd/scripts/amd.conf-sample#2 integrate
.. //depot/projects/toestack/contrib/amd/scripts/amd.conf.5#2 integrate
.. //depot/projects/toestack/contrib/amd/scripts/amd2ldif.in#2 integrate
.. //depot/projects/toestack/contrib/amd/scripts/amd2sun.in#2 integrate
.. //depot/projects/toestack/contrib/amd/scripts/automount2amd.8#2 integrate
.. //depot/projects/toestack/contrib/amd/scripts/automount2amd.in#2 integrate
.. //depot/projects/toestack/contrib/amd/scripts/ctl-amd.in#2 integrate
.. //depot/projects/toestack/contrib/amd/scripts/ctl-hlfsd.in#2 integrate
.. //depot/projects/toestack/contrib/amd/scripts/expn.1#2 integrate
.. //depot/projects/toestack/contrib/amd/scripts/expn.in#2 integrate
.. //depot/projects/toestack/contrib/amd/scripts/fix-amd-map.in#2 integrate
.. //depot/projects/toestack/contrib/amd/scripts/fixrmtab.in#2 integrate
.. //depot/projects/toestack/contrib/amd/scripts/redhat-ctl-amd.in#2 integrate
.. //depot/projects/toestack/contrib/amd/scripts/test-attrcache.in#1 branch
.. //depot/projects/toestack/contrib/amd/scripts/wait4amd.in#2 integrate
.. //depot/projects/toestack/contrib/amd/scripts/wait4amd2die.in#2 integrate
.. //depot/projects/toestack/contrib/amd/tasks#2 integrate
.. //depot/projects/toestack/contrib/amd/vers.m4#1 branch
.. //depot/projects/toestack/contrib/amd/wire-test/wire-test.8#2 integrate
.. //depot/projects/toestack/contrib/amd/wire-test/wire-test.c#2 integrate
.. //depot/projects/toestack/lib/csu/common/crtbrand.c#3 integrate
.. //depot/projects/toestack/lib/libarchive/archive_read_support_format_zip.c#3 integrate
.. //depot/projects/toestack/release/Makefile#6 integrate
.. //depot/projects/toestack/sbin/dhclient/dispatch.c#2 integrate
.. //depot/projects/toestack/share/man/man4/msk.4#3 integrate
.. //depot/projects/toestack/share/misc/iso3166#3 integrate
.. //depot/projects/toestack/share/zoneinfo/asia#4 integrate
.. //depot/projects/toestack/share/zoneinfo/northamerica#3 integrate
.. //depot/projects/toestack/share/zoneinfo/southamerica#3 integrate
.. //depot/projects/toestack/share/zoneinfo/zone.tab#2 integrate
.. //depot/projects/toestack/sys/amd64/amd64/pmap.c#5 integrate
.. //depot/projects/toestack/sys/amd64/amd64/trap.c#3 integrate
.. //depot/projects/toestack/sys/amd64/amd64/vm_machdep.c#5 integrate
.. //depot/projects/toestack/sys/compat/freebsd32/freebsd32_misc.c#2 integrate
.. //depot/projects/toestack/sys/compat/ndis/subr_ndis.c#3 integrate
.. //depot/projects/toestack/sys/compat/ndis/subr_ntoskrnl.c#4 integrate
.. //depot/projects/toestack/sys/conf/NOTES#5 integrate
.. //depot/projects/toestack/sys/dev/if_ndis/if_ndis.c#4 integrate
.. //depot/projects/toestack/sys/dev/if_ndis/if_ndis_pci.c#2 integrate
.. //depot/projects/toestack/sys/dev/if_ndis/if_ndisvar.h#2 integrate
.. //depot/projects/toestack/sys/dev/ipw/if_ipw.c#4 integrate
.. //depot/projects/toestack/sys/dev/iwi/if_iwi.c#4 integrate
.. //depot/projects/toestack/sys/dev/msk/if_msk.c#3 integrate
.. //depot/projects/toestack/sys/dev/msk/if_mskreg.h#3 integrate
.. //depot/projects/toestack/sys/dev/sio/sio.c#3 integrate
.. //depot/projects/toestack/sys/dev/utopia/utopia.c#3 integrate
.. //depot/projects/toestack/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate
.. //depot/projects/toestack/sys/i386/i386/pmap.c#6 integrate
.. //depot/projects/toestack/sys/i386/i386/trap.c#3 integrate
.. //depot/projects/toestack/sys/kern/imgact_elf.c#4 integrate
.. //depot/projects/toestack/sys/kern/init_main.c#7 integrate
.. //depot/projects/toestack/sys/kern/kern_conf.c#2 integrate
.. //depot/projects/toestack/sys/kern/kern_exec.c#6 integrate
.. //depot/projects/toestack/sys/kern/kern_mbuf.c#6 integrate
.. //depot/projects/toestack/sys/kern/kern_mib.c#2 integrate
.. //depot/projects/toestack/sys/kern/vfs_mount.c#4 integrate
.. //depot/projects/toestack/sys/kern/vfs_subr.c#5 integrate
.. //depot/projects/toestack/sys/net/if_lagg.c#5 integrate
.. //depot/projects/toestack/sys/netinet/if_ether.c#13 integrate
.. //depot/projects/toestack/sys/netinet/sctp.h#4 integrate
.. //depot/projects/toestack/sys/netinet/sctp_output.c#8 integrate
.. //depot/projects/toestack/sys/netinet/sctp_structs.h#4 integrate
.. //depot/projects/toestack/sys/netinet/sctp_usrreq.c#7 integrate
.. //depot/projects/toestack/sys/netinet/sctputil.c#8 integrate
.. //depot/projects/toestack/sys/netinet/tcp_syncache.c#8 integrate
.. //depot/projects/toestack/sys/security/audit/audit.c#4 integrate
.. //depot/projects/toestack/sys/sys/param.h#11 integrate
.. //depot/projects/toestack/sys/sys/proc.h#7 integrate
.. //depot/projects/toestack/sys/sys/systm.h#4 integrate
.. //depot/projects/toestack/sys/vm/vm_contig.c#5 integrate
.. //depot/projects/toestack/sys/vm/vm_extern.h#7 integrate
.. //depot/projects/toestack/tools/tools/ath/athdebug/athdebug.c#2 integrate
.. //depot/projects/toestack/tools/tools/ath/athstats/athstats.c#2 integrate
.. //depot/projects/toestack/tools/tools/ath/athstats/athstats.h#2 integrate
.. //depot/projects/toestack/tools/tools/ath/athstats/main.c#2 integrate
.. //depot/projects/toestack/tools/tools/ath/athstats/statfoo.c#2 integrate
.. //depot/projects/toestack/tools/tools/ath/athstats/statfoo.h#2 integrate
.. //depot/projects/toestack/tools/tools/net80211/wlanstats/main.c#3 integrate
.. //depot/projects/toestack/tools/tools/net80211/wlanstats/statfoo.c#3 integrate
.. //depot/projects/toestack/tools/tools/net80211/wlanstats/statfoo.h#2 integrate
.. //depot/projects/toestack/tools/tools/net80211/wlanstats/wlanstats.c#3 integrate
.. //depot/projects/toestack/tools/tools/net80211/wlanstats/wlanstats.h#2 integrate
.. //depot/projects/toestack/tools/tools/net80211/wlanwatch/wlanwatch.c#2 integrate
.. //depot/projects/toestack/usr.bin/procstat/procstat_kstack.c#2 integrate
.. //depot/projects/toestack/usr.bin/procstat/procstat_threads.c#2 integrate
.. //depot/projects/toestack/usr.sbin/Makefile#7 integrate
.. //depot/projects/toestack/usr.sbin/amd/amd/Makefile#2 integrate
.. //depot/projects/toestack/usr.sbin/amd/fsinfo/Makefile#2 integrate
.. //depot/projects/toestack/usr.sbin/amd/include/amu_autofs_prot.h#1 branch
.. //depot/projects/toestack/usr.sbin/amd/include/aux_conf.h#2 integrate
.. //depot/projects/toestack/usr.sbin/amd/include/build_version.h#2 integrate
.. //depot/projects/toestack/usr.sbin/amd/include/config.h#2 integrate
.. //depot/projects/toestack/usr.sbin/amd/include/newvers.sh#2 integrate
.. //depot/projects/toestack/usr.sbin/amd/libamu/Makefile#2 integrate
.. //depot/projects/toestack/usr.sbin/amd/mk-amd-map/Makefile#2 integrate
.. //depot/projects/toestack/usr.sbin/syslogd/syslogd.c#2 integrate

Differences ...

==== //depot/projects/toestack/Makefile.inc1#6 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.590 2007/10/31 09:26:42 yar Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.591 2007/12/04 12:55:27 yar Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -591,17 +591,25 @@
 #
 distributeworld installworld: installcheck
 	mkdir -p ${INSTALLTMP}
-	for prog in ${ITOOLS}; do \
+	progs=$$(for prog in ${ITOOLS}; do \
 		if progpath=`which $$prog`; then \
-			progs="$$progs $$progpath"; \
+			echo $$progpath; \
 		else \
 			echo "Required tool $$prog not found in PATH." >&2; \
 			exit 1; \
 		fi; \
-	done; \
-	cp $$progs ${INSTALLTMP}; \
-	cp `ldd -f "%p\n" -f "%p\n" $$progs 2>/dev/null | \
-	    sort -u` ${INSTALLTMP}
+	    done); \
+	libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | \
+	    while read line; do \
+		set -- $$line; \
+		if [ "$$2 $$3" != "not found" ]; then \
+			echo $$2; \
+		else \
+			echo "Required library $$1 not found." >&2; \
+			exit 1; \
+		fi; \
+	    done); \
+	cp $$libs $$progs ${INSTALLTMP}
 	cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale
 	${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
 	    ${IMAKEENV} rm -rf ${INSTALLTMP}

==== //depot/projects/toestack/bin/sh/sh.1#3 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.125 2007/10/04 16:14:48 stefanf Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.126 2007/12/05 12:29:26 ru Exp $
 .\"
 .Dd October 7, 2006
 .Dt SH 1
@@ -57,9 +57,12 @@
 This version has many features which make
 it appear
 similar in some respects to the Korn shell, but it is not a Korn
-shell clone like pdksh.
+shell clone like
+.Nm pdksh .
 Only features
-designated by POSIX, plus a few Berkeley extensions, are being
+designated by
+.Tn POSIX ,
+plus a few Berkeley extensions, are being
 incorporated into this shell.
 This man page is not intended to be a tutorial nor a complete
 specification of the shell.
@@ -107,6 +110,7 @@
 .Pa /etc/profile
 and then
 .Pa .profile
+in a user's home directory,
 if they exist.
 If the environment variable
 .Ev ENV
@@ -129,13 +133,15 @@
 .Pa .shinit
 the filename desired:
 .Pp
-.Dl ENV=$HOME/.shinit; export ENV
+.Dl "ENV=$HOME/.shinit; export ENV"
 .Pp
 The first non-option argument specified on the command line
 will be treated as the
 name of a file from which to read commands (a shell script), and
 the remaining arguments are set as the positional parameters
-of the shell ($1, $2, etc).
+of the shell
+.Li ( $1 , $2 ,
+etc.).
 Otherwise, the shell reads commands
 from its standard input.
 .Pp
@@ -180,7 +186,7 @@
 A
 .Dq Li --
 or plain
-.Dq Ql -
+.Ql -
 will stop option processing and will force the remaining
 words on the command line to be treated as arguments.
 The
@@ -198,7 +204,7 @@
 (UNIMPLEMENTED)
 .It Fl C Li noclobber
 Do not overwrite existing files with
-.Dq Li > .
+.Ql > .
 .It Fl E Li emacs
 Enable the built-in
 .Xr emacs 1
@@ -228,7 +234,7 @@
 Disable pathname expansion.
 .It Fl I Li ignoreeof
 Ignore
-.Dv EOF Ns ' Ns s
+.Dv EOF Ap s
 from input when in interactive mode.
 .It Fl i Li interactive
 Force the shell to behave interactively.
@@ -253,10 +259,10 @@
 .It Fl p Li privileged
 Turn on privileged mode.
 This mode is enabled on startup
-if either the effective user or group id is not equal to the
-real user or group id.
+if either the effective user or group ID is not equal to the
+real user or group ID.
 Turning this mode off sets the
-effective user and group ids to the real user and group ids.
+effective user and group IDs to the real user and group IDs.
 When this mode is enabled for interactive shells, the file
 .Pa /etc/suid_profile
 is sourced instead of
@@ -288,7 +294,6 @@
 .Bd -literal -offset indent
 sh -T -c "trap 'exit 1' 2 ; some-blocking-program"
 .Ed
-.Pp
 .It Fl u Li nounset
 Write a message to standard error when attempting
 to expand a variable that is not set, and if the
@@ -306,7 +311,7 @@
 .It Fl x Li xtrace
 Write each command
 (preceded by the value of the
-.Ev PS4
+.Va PS4
 variable)
 to standard error before it is executed.
 Useful for debugging.
@@ -384,7 +389,7 @@
 it impossible to put single-quotes in a single-quoted string).
 .It Double Quotes
 Enclosing characters within double quotes preserves the literal
-meaning of all characters except dollarsign
+meaning of all characters except dollar sign
 .Pq Ql $ ,
 backquote
 .Pq Ql ` ,
@@ -423,16 +428,14 @@
 For example, if there is an alias called
 .Dq Li lf
 with the value
-.Dq Li ls -F ,
+.Dq Li "ls -F" ,
 then the input
-.Bd -literal -offset indent
-lf foobar
-.Ed
+.Pp
+.Dl "lf foobar"
 .Pp
 would become
-.Bd -literal -offset indent
-ls -F foobar
-.Ed
+.Pp
+.Dl "ls -F foobar"
 .Pp
 Aliases provide a convenient way for naive users to
 create shorthands for commands without having to learn how
@@ -498,10 +501,10 @@
 The overall format
 used for redirection is:
 .Pp
-.Dl [n] redir-op file
+.D1 Oo Ar n Oc Ar redir-op file
 .Pp
 The
-.Ql redir-op
+.Ar redir-op
 is one of the redirection operators mentioned
 previously.
 The following gives some examples of how these
@@ -509,42 +512,66 @@
 Note that stdin and stdout are commonly used abbreviations
 for standard input and standard output respectively.
 .Bl -tag -width "1234567890XX" -offset indent
-.It Li [n]> file
-redirect stdout (or file descriptor n) to file
-.It Li [n]>| file
+.It Oo Ar n Oc Ns Li > Ar file
+redirect stdout (or file descriptor
+.Ar n )
+to
+.Ar file
+.It Oo Ar n Oc Ns Li >| Ar file
 same as above, but override the
 .Fl C
 option
-.It Li [n]>> file
-append stdout (or file descriptor n) to file
-.It Li [n]< file
-redirect stdin (or file descriptor n) from file
-.It Li [n]<> file
-redirect stdin (or file descriptor n) to and from file
-.It Li [n1]<&n2
-duplicate stdin (or file descriptor n1) from file descriptor n2
-.It Li [n]<&-
-close stdin (or file descriptor n)
-.It Li [n1]>&n2
-duplicate stdout (or file descriptor n1) to file descriptor n2
-.It Li [n]>&-
-close stdout (or file descriptor n)
+.It Oo Ar n Oc Ns Li >> Ar file
+append stdout (or file descriptor
+.Ar n )
+to
+.Ar file
+.It Oo Ar n Oc Ns Li < Ar file
+redirect stdin (or file descriptor
+.Ar n )
+from
+.Ar file
+.It Oo Ar n Oc Ns Li <> Ar file
+redirect stdin (or file descriptor
+.Ar n )
+to and from
+.Ar file
+.It Oo Ar n1 Oc Ns Li <& Ns Ar n2
+duplicate stdin (or file descriptor
+.Ar n1 )
+from file descriptor
+.Ar n2
+.It Oo Ar n Oc Ns Li <&-
+close stdin (or file descriptor
+.Ar n )
+.It Oo Ar n1 Oc Ns Li >& Ns Ar n2
+duplicate stdout (or file descriptor
+.Ar n1 )
+to file descriptor
+.Ar n2
+.It Oo Ar n Oc Ns Li >&-
+close stdout (or file descriptor
+.Ar n )
 .El
 .Pp
 The following redirection is often called a
 .Dq here-document .
-.Bd -literal -offset indent
-[n]<< delimiter
-	here-doc-text
-	...
-delimiter
+.Bd -unfilled -offset indent
+.Oo Ar n Oc Ns Li << Ar delimiter
+.D1 Ar here-doc-text
+.D1 ...
+.Ar delimiter
 .Ed
 .Pp
 All the text on successive lines up to the delimiter is
 saved away and made available to the command on standard
-input, or file descriptor n if it is specified.
-If the delimiter
-as specified on the initial line is quoted, then the here-doc-text
+input, or file descriptor
+.Ar n
+if it is specified.
+If the
+.Ar delimiter
+as specified on the initial line is quoted, then the
+.Ar here-doc-text
 is treated literally, otherwise the text is subjected to
 parameter expansion, command substitution, and arithmetic
 expansion (as described in the section on
@@ -554,7 +581,9 @@
 instead of
 .Dq Li << ,
 then leading tabs
-in the here-doc-text are stripped.
+in the
+.Ar here-doc-text
+are stripped.
 .Ss Search and Execution
 There are three types of commands: shell functions,
 built-in commands, and normal programs.
@@ -562,7 +591,9 @@
 The three types of commands are all executed in a different way.
 .Pp
 When a shell function is executed, all of the shell positional
-parameters (except $0, which remains unchanged) are
+parameters (except
+.Li $0 ,
+which remains unchanged) are
 set to the arguments of the shell function.
 The variables which are explicitly placed in the environment of
 the command (by placing assignments to them before the
@@ -583,11 +614,11 @@
 passing the arguments and the environment to the program.
 If the program is not a normal executable file
 (i.e., if it does not begin with the
-.Qq magic number
+.Dq "magic number"
 whose
 .Tn ASCII
 representation is
-.Qq #! ,
+.Dq Li #! ,
 resulting in an
 .Er ENOEXEC
 return value from
@@ -597,13 +628,16 @@
 so that the effect will be
 as if a new shell had been invoked to handle the ad-hoc shell script,
 except that the location of hashed commands located in
-the parent shell will be remembered by the child.
+the parent shell will be remembered by the child
+(see the description of the
+.Ic hash
+built-in command below).
 .Pp
 Note that previous versions of this document
 and the source code itself misleadingly and sporadically
 refer to a shell script without a magic number
 as a
-.Qq shell procedure .
+.Dq "shell procedure" .
 .Ss Path Search
 When locating a command, the shell first looks to see if
 it has a shell function by that name.
@@ -616,8 +650,9 @@
 Command names containing a slash are simply executed without
 performing any searches.
 .It
-The shell searches each entry in
+The shell searches each entry in the
 .Ev PATH
+environment variable
 in turn for the command.
 The value of the
 .Ev PATH
@@ -666,7 +701,8 @@
 that of the last simple command executed by the command.
 .Ss Pipelines
 A pipeline is a sequence of one or more commands separated
-by the control operator |.
+by the control operator
+.Ql \&| .
 The standard output of all but
 the last command is connected to the standard input
 of the next command.
@@ -675,10 +711,12 @@
 .Pp
 The format for a pipeline is:
 .Pp
-.Dl [!] command1 [ | command2 ...]
+.D1 Oo Li \&! Oc Ar command1 Op Li \&| Ar command2 ...
 .Pp
-The standard output of command1 is connected to the standard
-input of command2.
+The standard output of
+.Ar command1
+is connected to the standard input of
+.Ar command2 .
 The standard input, standard output, or
 both of a command is considered to be assigned by the
 pipeline before any redirection specified by redirection
@@ -704,22 +742,22 @@
 modified by redirection.
 For example:
 .Pp
-.Dl $ command1 2>&1 | command2
+.Dl "command1 2>&1 | command2"
 .Pp
 sends both the standard output and standard error of
-.Ql command1
+.Ar command1
 to the standard input of
-.Ql command2 .
+.Ar command2 .
 .Pp
 A
-.Dq Li \&;
+.Ql \&;
 or newline terminator causes the preceding
 AND-OR-list
 (described below in the section called
 .Sx Short-Circuit List Operators )
 to be executed sequentially;
 an
-.Dq Li &
+.Ql &
 causes asynchronous execution of the preceding AND-OR-list.
 .Pp
 Note that unlike some other shells,
@@ -738,12 +776,12 @@
 before executing the next command.
 .Pp
 The format for running a command in background is:
-.Bd -literal -offset indent
-command1 & [command2 & ...]
-.Ed
+.Pp
+.D1 Ar command1 Li & Op Ar command2 Li & Ar ...
 .Pp
 If the shell is not interactive, the standard input of an
-asynchronous command is set to /dev/null.
+asynchronous command is set to
+.Pa /dev/null .
 .Ss Lists (Generally Speaking)
 A list is a sequence of zero or more commands separated by
 newlines, semicolons, or ampersands,
@@ -773,22 +811,23 @@
 The syntax of the
 .Ic if
 command is:
-.\"
-.\" XXX Use .Dl to work around broken handling of .Ic inside .Bd and .Ed .
-.\"
-.Dl Ic if Ar list
-.Dl Ic then Ar list
-.Dl [ Ic elif Ar list
-.Dl Ic then Ar list ] ...
-.Dl [ Ic else Ar list ]
-.Dl Ic fi
+.Bd -unfilled -offset indent -compact
+.Ic if Ar list
+.Ic then Ar list
+.Oo Ic elif Ar list
+.Ic then Ar list Oc Ar ...
+.Op Ic else Ar list
+.Ic fi
+.Ed
 .Pp
 The syntax of the
 .Ic while
 command is:
-.Dl Ic while Ar list
-.Dl Ic do Ar list
-.Dl Ic done
+.Bd -unfilled -offset indent -compact
+.Ic while Ar list
+.Ic do Ar list
+.Ic done
+.Ed
 .Pp
 The two lists are executed repeatedly while the exit status of the
 first list is zero.
@@ -804,9 +843,11 @@
 The syntax of the
 .Ic for
 command is:
-.Dl Ic for Ar variable Op Ic in Ar word ...
-.Dl Ic do Ar list
-.Dl Ic done
+.Bd -unfilled -offset indent -compact
+.Ic for Ar variable Op Ic in Ar word ...
+.Ic do Ar list
+.Ic done
+.Ed
 .Pp
 If
 .Ic in
@@ -820,17 +861,17 @@
 and
 .Ic done
 commands may be replaced with
-.Dq Li {
+.Ql {
 and
-.Dq Li } .
+.Ql } .
 .Pp
 The syntax of the
 .Ic break
 and
 .Ic continue
 commands is:
-.Dl Ic break Op Ar num
-.Dl Ic continue Op Ar num
+.D1 Ic break Op Ar num
+.D1 Ic continue Op Ar num
 .Pp
 The
 .Ic break
@@ -848,18 +889,20 @@
 .Pp
 The syntax of the
 .Ic case
-command is
-.Dl Ic case Ar word Ic in
-.Dl pattern) list ;;
-.Dl ...
-.Dl Ic esac
+command is:
+.Bd -unfilled -offset indent -compact
+.Ic case Ar word Ic in
+.Ar pattern Ns Li ) Ar list Li ;;
+.Ar ...
+.Ic esac
+.Ed
 .Pp
 The pattern can actually be one or more patterns
 (see
 .Sx Shell Patterns
 described later),
 separated by
-.Dq Li \&|
+.Ql \&|
 characters.
 The exit code of the
 .Ic case
@@ -867,14 +910,12 @@
 zero if no patterns were matched.
 .Ss Grouping Commands Together
 Commands may be grouped by writing either
-.Bd -literal -offset indent
-(list)
-.Ed
+.Pp
+.D1 Li \&( Ns Ar list Ns Li \%)
 .Pp
 or
-.Bd -literal -offset indent
-{ list; }
-.Ed
+.Pp
+.D1 Li { Ar list Ns Li \&; }
 .Pp
 The first form executes the commands in a subshell.
 Note that built-in commands thus executed do not affect the current shell.
@@ -887,18 +928,21 @@
 .Ed
 .Ss Functions
 The syntax of a function definition is
-.Bd -literal -offset indent
-name ( ) command
-.Ed
+.Pp
+.D1 Ar name Li \&( \&) Ar command
 .Pp
 A function definition is an executable statement; when
-executed it installs a function named name and returns an
+executed it installs a function named
+.Ar name
+and returns an
 exit status of zero.
-The command is normally a list
+The
+.Ar command
+is normally a list
 enclosed between
-.Dq Li {
+.Ql {
 and
-.Dq Li } .
+.Ql } .
 .Pp
 Variables may be declared to be local to a function by
 using the
@@ -906,11 +950,8 @@
 command.
 This should appear as the first statement of a function,
 and the syntax is:
-.Bd -ragged -offset indent
-.Ic local
-.Op Ar variable ...
-.Op Fl
-.Ed
+.Pp
+.D1 Ic local Oo Ar variable ... Oc Op Fl
 .Pp
 The
 .Ic local
@@ -923,38 +964,38 @@
 Otherwise, the variable is initially unset.
 The shell
 uses dynamic scoping, so that if the variable
-.Em x
+.Va x
 is made local to function
 .Em f ,
 which then calls function
 .Em g ,
 references to the variable
-.Em x
+.Va x
 made inside
 .Em g
 will refer to the variable
-.Em x
+.Va x
 declared inside
 .Em f ,
 not to the global variable named
-.Em x .
+.Va x .
 .Pp
 The only special parameter that can be made local is
-.Dq Li - .
+.Ql - .
 Making
-.Dq Li -
+.Ql -
 local causes any shell options that are
-changed via the set command inside the function to be
+changed via the
+.Ic set
+command inside the function to be
 restored to their original values when the function
 returns.
 .Pp
 The syntax of the
 .Ic return
 command is
-.Bd -ragged -offset indent
-.Ic return
-.Op Ar exitstatus
-.Ed
+.Pp
+.D1 Ic return Op Ar exitstatus
 .Pp
 It terminates the current executional scope, returning from the previous
 nested function, sourced script, or shell instance, in that order.
@@ -969,9 +1010,8 @@
 the shell turns all the environment variables into shell
 variables.
 New variables can be set using the form
-.Bd -literal -offset indent
-name=value
-.Ed
+.Pp
+.D1 Ar name Ns = Ns Ar value
 .Pp
 Variables set by the user must have a name consisting solely
 of alphabetics, numerics, and underscores.
@@ -1001,12 +1041,10 @@
 the expansion occurs within a double-quoted string
 it expands to a single field with the value of each parameter
 separated by the first character of the
-.Ev IFS
+.Va IFS
 variable,
-or by a
-.Aq space
-if
-.Ev IFS
+or by a space if
+.Va IFS
 is unset.
 .It Li $@
 Expands to the positional parameters, starting from one.
@@ -1020,12 +1058,16 @@
 .Li @
 is double-quoted.
 What this basically means, for example, is
-if $1 is
-.Dq abc
-and $2 is
-.Dq def ghi ,
+if
+.Li $1
+is
+.Dq Li abc
+and
+.Li $2
+is
+.Dq Li "def ghi" ,
 then
-.Qq Li $@
+.Dq Li $@
 expands to
 the two arguments:
 .Bd -literal -offset indent
@@ -1033,18 +1075,22 @@
 .Ed
 .It Li $#
 Expands to the number of positional parameters.
-.It Li $\&?
+.It Li $?
 Expands to the exit status of the most recent pipeline.
 .It Li $-
 (hyphen) Expands to the current option flags (the single-letter
 option names concatenated into a string) as specified on
-invocation, by the set built-in command, or implicitly
+invocation, by the
+.Ic set
+built-in command, or implicitly
 by the shell.
 .It Li $$
 Expands to the process ID of the invoked shell.
 A subshell
-retains the same value of $ as its parent.
-.It Li $\&!
+retains the same value of
+.Va $
+as its parent.
+.It Li $!
 Expands to the process ID of the most recent background
 command executed from the current shell.
 For a
@@ -1067,7 +1113,7 @@
 fields from a single word.
 The single exception to this rule is
 the expansion of the special parameter
-.Li @
+.Va @
 within double-quotes,
 as was described above.
 .Pp
@@ -1079,7 +1125,7 @@
 .It
 Field Splitting is performed on fields generated by step (1)
 unless the
-.Ev IFS
+.Va IFS
 variable is null.
 .It
 Pathname Expansion (unless the
@@ -1090,7 +1136,7 @@
 .El
 .Pp
 The
-.Dq Li $
+.Ql $
 character is used to introduce parameter expansion, command
 substitution, or arithmetic evaluation.

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Dec  5 23:44:48 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8C61316A420; Wed,  5 Dec 2007 23:44:48 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2ADFA16A41A
	for ; Wed,  5 Dec 2007 23:44:48 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1016C13C448
	for ; Wed,  5 Dec 2007 23:44:48 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB5NiltX071601
	for ; Wed, 5 Dec 2007 23:44:47 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB5Nilma071598
	for perforce@freebsd.org; Wed, 5 Dec 2007 23:44:47 GMT
	(envelope-from marcel@freebsd.org)
Date: Wed, 5 Dec 2007 23:44:47 GMT
Message-Id: <200712052344.lB5Nilma071598@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130296 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 05 Dec 2007 23:44:49 -0000

http://perforce.freebsd.org/chv.cgi?CH=130296

Change 130296 by marcel@marcel_xcllnt on 2007/12/05 23:44:35

	o  Properly deal with the raw partition. We create a partition
	   list entry for it and mark it internal. This allows us to
	   skip it as part of partition overlap tests. It also allows
	   us to not create a device special file for it.
	o  Calculate the checksum upon write.

Affected files ...

.. //depot/projects/ia64/sys/geom/part/g_part.c#7 edit
.. //depot/projects/ia64/sys/geom/part/g_part.h#6 edit
.. //depot/projects/ia64/sys/geom/part/g_part_bsd.c#2 edit

Differences ...

==== //depot/projects/ia64/sys/geom/part/g_part.c#7 (text+ko) ====

@@ -453,6 +453,8 @@
 			index = entry->gpe_index + 1;
 			last = entry;
 		}
+		if (entry->gpe_internal)
+			continue;
 		if (gpp->gpp_start >= entry->gpe_start &&
 		    gpp->gpp_start <= entry->gpe_end) {
 			gctl_error(req, "%d start '%jd'", ENOSPC,
@@ -750,13 +752,16 @@
 	}
 
 	pp = entry->gpe_pp;
-	if (pp->acr > 0 || pp->acw > 0 || pp->ace > 0) {
-		gctl_error(req, "%d", EBUSY);
-		return (EBUSY);
+	if (pp != NULL) {
+		if (pp->acr > 0 || pp->acw > 0 || pp->ace > 0) {
+			gctl_error(req, "%d", EBUSY);
+			return (EBUSY);
+		}
+
+		pp->private = NULL;
+		entry->gpe_pp = NULL;
 	}
 
-	pp->private = NULL;
-	entry->gpe_pp = NULL;
 	if (entry->gpe_created) {
 		LIST_REMOVE(entry, gpe_entry);
 		g_free(entry);
@@ -764,7 +769,9 @@
 		entry->gpe_modified = 0;
 		entry->gpe_deleted = 1;
 	}
-	g_wither_provider(pp, ENXIO);
+
+	if (pp != NULL)
+		g_wither_provider(pp, ENXIO);
 
 	/* Provide feedback if so requested. */
 	if (gpp->gpp_parms & G_PART_PARM_OUTPUT) {
@@ -927,9 +934,11 @@
 		entry->gpe_modified = 0;
 		if (entry->gpe_created) {
 			pp = entry->gpe_pp;
-			pp->private = NULL;
-			entry->gpe_pp = NULL;
-			g_wither_provider(pp, ENXIO);
+			if (pp != NULL) {
+				pp->private = NULL;
+				entry->gpe_pp = NULL;
+				g_wither_provider(pp, ENXIO);
+			}
 			entry->gpe_deleted = 1;
 		}
 		if (entry->gpe_deleted) {
@@ -964,8 +973,10 @@
 
 	g_topology_lock();
 
-	LIST_FOREACH(entry, &table->gpt_entry, gpe_entry)
-		g_part_new_provider(gp, table, entry);
+	LIST_FOREACH(entry, &table->gpt_entry, gpe_entry) {
+		if (!entry->gpe_internal)
+			g_part_new_provider(gp, table, entry);
+	}
 
 	table->gpt_opened = 0;
 	g_access(cp, -1, -1, -1);
@@ -1361,8 +1372,10 @@
 		goto fail;
 
 	g_topology_lock();
-	LIST_FOREACH(entry, &table->gpt_entry, gpe_entry)
-		g_part_new_provider(gp, table, entry);
+	LIST_FOREACH(entry, &table->gpt_entry, gpe_entry) {
+		if (!entry->gpe_internal)
+			g_part_new_provider(gp, table, entry);
+	}
 
 	g_access(cp, -1, 0, 0);
 	return (gp);

==== //depot/projects/ia64/sys/geom/part/g_part.h#6 (text+ko) ====

@@ -69,6 +69,7 @@
 	int		gpe_created:1;	/* Entry is newly created. */
 	int		gpe_deleted:1;	/* Entry has been deleted. */
 	int		gpe_modified:1;	/* Entry has been modified. */
+	int		gpe_internal:1;	/* Entry is not a used entry. */
 };
 
 /* G_PART table (KOBJ instance). */

==== //depot/projects/ia64/sys/geom/part/g_part_bsd.c#2 (text+ko) ====

@@ -172,6 +172,8 @@
 {
 	struct g_consumer *cp;
 	struct g_provider *pp;
+	struct g_part_entry *baseentry;
+	struct g_part_bsd_entry *entry;
 	struct g_part_bsd_table *table;
 	u_char *ptr;
 	uint64_t msize;
@@ -205,6 +207,14 @@
 	basetable->gpt_first = 0;
 	basetable->gpt_last = ncyls * secpercyl - 1;
 	basetable->gpt_isleaf = 1;
+
+	baseentry = g_part_new_entry(basetable, RAW_PART + 1,
+	    basetable->gpt_first, basetable->gpt_last);
+	baseentry->gpe_internal = 1;
+	entry = (struct g_part_bsd_entry *)baseentry;
+	entry->part.p_size = basetable->gpt_last + 1;
+	entry->part.p_offset = basetable->gpt_offset;
+
 	return (0);
 }
 
@@ -282,6 +292,7 @@
 {
 	struct g_provider *pp;
 	struct g_part_bsd_table *table;
+	struct g_part_entry *baseentry;
 	struct g_part_bsd_entry *entry;
 	struct partition part;
 	u_char *buf, *p;
@@ -342,14 +353,19 @@
 		part.p_fstype = p[12];
 		part.p_frag = p[13];
 		part.p_cpg = le16dec(p + 14);
-		if (part.p_fstype == FS_UNUSED || part.p_size == 0)
+		if (part.p_size == 0)
+			continue;
+		if (part.p_fstype == FS_UNUSED && index != RAW_PART)
 			continue;
 		if (part.p_offset < basetable->gpt_offset)
 			continue;
-		entry = (struct g_part_bsd_entry *)g_part_new_entry(basetable,
-		    index + 1, part.p_offset - basetable->gpt_offset,
+		baseentry = g_part_new_entry(basetable, index + 1,
+		    part.p_offset - basetable->gpt_offset,
 		    part.p_offset - basetable->gpt_offset + part.p_size - 1);
+		entry = (struct g_part_bsd_entry *)baseentry;
 		entry->part = part;
+		if (part.p_fstype == FS_UNUSED)
+			baseentry->gpe_internal = 1;
 	}
 
 	return (0);
@@ -386,7 +402,8 @@
 	struct g_part_entry *baseentry;
 	struct g_part_bsd_entry *entry;
 	struct g_part_bsd_table *table;
-	u_char *p;
+	uint16_t sum;
+	u_char *p, *pe;
 	int error, index;
 
 	pp = cp->provider;
@@ -410,6 +427,14 @@
 			baseentry = LIST_NEXT(baseentry, gpe_entry);
 	}
 
+	/* Calculate checksum. */
+	le16enc(table->label + 136, 0);
+	pe = table->label + 148 + basetable->gpt_entries * 16;
+	sum = 0;
+	for (p = table->label; p < pe; p += 2)
+		sum ^= le16dec(p);
+	le16enc(table->label + 136, sum);
+
 	error = g_write_data(cp, pp->sectorsize, table->label, pp->sectorsize);
 	return (error);
 }

From owner-p4-projects@FreeBSD.ORG  Thu Dec  6 03:16:42 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B910B16A418; Thu,  6 Dec 2007 03:16:42 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 13CE016A41A
	for ; Thu,  6 Dec 2007 03:16:42 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F406513C459
	for ; Thu,  6 Dec 2007 03:16:41 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB63Gf97018837
	for ; Thu, 6 Dec 2007 03:16:41 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB63GcLt018834
	for perforce@freebsd.org; Thu, 6 Dec 2007 03:16:38 GMT
	(envelope-from peter@freebsd.org)
Date: Thu, 6 Dec 2007 03:16:38 GMT
Message-Id: <200712060316.lB63GcLt018834@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130308 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 06 Dec 2007 03:16:43 -0000

http://perforce.freebsd.org/chv.cgi?CH=130308

Change 130308 by peter@peter_daintree on 2007/12/06 03:16:36

	IFC @130307

Affected files ...

.. //depot/projects/hammer/Makefile.inc1#128 integrate
.. //depot/projects/hammer/bin/sh/sh.1#29 integrate
.. //depot/projects/hammer/contrib/amd/AUTHORS#4 integrate
.. //depot/projects/hammer/contrib/amd/BUGS#4 integrate
.. //depot/projects/hammer/contrib/amd/COPYING#4 integrate
.. //depot/projects/hammer/contrib/amd/ChangeLog#4 integrate
.. //depot/projects/hammer/contrib/amd/FAQ#1 branch
.. //depot/projects/hammer/contrib/amd/INSTALL#4 integrate
.. //depot/projects/hammer/contrib/amd/NEWS#4 integrate
.. //depot/projects/hammer/contrib/amd/README.attrcache#1 branch
.. //depot/projects/hammer/contrib/amd/README.ldap#3 integrate
.. //depot/projects/hammer/contrib/amd/amd/am_ops.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/amd.8#7 integrate
.. //depot/projects/hammer/contrib/amd/amd/amd.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/amd.h#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/amfs_auto.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/amfs_direct.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/amfs_error.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/amfs_generic.c#1 branch
.. //depot/projects/hammer/contrib/amd/amd/amfs_host.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/amfs_inherit.c#4 delete
.. //depot/projects/hammer/contrib/amd/amd/amfs_link.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/amfs_linkx.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/amfs_nfsl.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/amfs_nfsx.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/amfs_program.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/amfs_root.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/amfs_toplvl.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/amfs_union.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/amq_subr.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/amq_svc.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/autil.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/clock.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/conf.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/conf_parse.y#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/conf_tok.l#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/get_args.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/info_exec.c#1 branch
.. //depot/projects/hammer/contrib/amd/amd/info_file.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/info_hesiod.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/info_ldap.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/info_ndbm.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/info_nis.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/info_nisplus.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/info_passwd.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/info_union.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/map.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/mapc.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/mntfs.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/nfs_prot_svc.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/nfs_start.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/nfs_subr.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/ops_TEMPLATE.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/ops_cachefs.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/ops_cdfs.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/ops_efs.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/ops_lofs.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/ops_mfs.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/ops_nfs.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/ops_nfs3.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/ops_nullfs.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/ops_pcfs.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/ops_tfs.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/ops_tmpfs.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/ops_ufs.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/ops_umapfs.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/ops_unionfs.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/ops_xfs.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/opts.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/readdir.c#1 branch
.. //depot/projects/hammer/contrib/amd/amd/restart.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/rpc_fwd.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/sched.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/srvr_amfs_auto.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amd/srvr_nfs.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amq/amq.8#7 integrate
.. //depot/projects/hammer/contrib/amd/amq/amq.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amq/amq.h#4 integrate
.. //depot/projects/hammer/contrib/amd/amq/amq_clnt.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amq/amq_xdr.c#4 integrate
.. //depot/projects/hammer/contrib/amd/amq/pawd.1#5 integrate
.. //depot/projects/hammer/contrib/amd/amq/pawd.c#4 integrate
.. //depot/projects/hammer/contrib/amd/aux_conf.h.in#3 integrate
.. //depot/projects/hammer/contrib/amd/bootstrap#3 integrate
.. //depot/projects/hammer/contrib/amd/conf/checkmount/checkmount_bsd44.c#4 integrate
.. //depot/projects/hammer/contrib/amd/conf/mtab/mtab_bsd.c#4 integrate
.. //depot/projects/hammer/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#4 integrate
.. //depot/projects/hammer/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#4 integrate
.. //depot/projects/hammer/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#2 integrate
.. //depot/projects/hammer/contrib/amd/conf/transp/transp_sockets.c#5 integrate
.. //depot/projects/hammer/contrib/amd/conf/trap/trap_default.h#3 integrate
.. //depot/projects/hammer/contrib/amd/conf/umount/umount_bsd44.c#4 integrate
.. //depot/projects/hammer/contrib/amd/doc/am-utils.texi#4 integrate
.. //depot/projects/hammer/contrib/amd/doc/stamp-vti#3 branch
.. //depot/projects/hammer/contrib/amd/doc/texinfo.tex#3 integrate
.. //depot/projects/hammer/contrib/amd/doc/version.texi#3 integrate
.. //depot/projects/hammer/contrib/amd/fixmount/fixmount.8#8 integrate
.. //depot/projects/hammer/contrib/amd/fixmount/fixmount.c#4 integrate
.. //depot/projects/hammer/contrib/amd/fsinfo/fsi_analyze.c#4 integrate
.. //depot/projects/hammer/contrib/amd/fsinfo/fsi_data.h#4 integrate
.. //depot/projects/hammer/contrib/amd/fsinfo/fsi_dict.c#4 integrate
.. //depot/projects/hammer/contrib/amd/fsinfo/fsi_gram.y#4 integrate
.. //depot/projects/hammer/contrib/amd/fsinfo/fsi_lex.l#4 integrate
.. //depot/projects/hammer/contrib/amd/fsinfo/fsi_util.c#4 integrate
.. //depot/projects/hammer/contrib/amd/fsinfo/fsinfo.8#8 integrate
.. //depot/projects/hammer/contrib/amd/fsinfo/fsinfo.c#4 integrate
.. //depot/projects/hammer/contrib/amd/fsinfo/fsinfo.h#4 integrate
.. //depot/projects/hammer/contrib/amd/fsinfo/wr_atab.c#4 integrate
.. //depot/projects/hammer/contrib/amd/fsinfo/wr_bparam.c#4 integrate
.. //depot/projects/hammer/contrib/amd/fsinfo/wr_dumpset.c#4 integrate
.. //depot/projects/hammer/contrib/amd/fsinfo/wr_exportfs.c#4 integrate
.. //depot/projects/hammer/contrib/amd/fsinfo/wr_fstab.c#4 integrate
.. //depot/projects/hammer/contrib/amd/hlfsd/hlfsd.8#7 integrate
.. //depot/projects/hammer/contrib/amd/hlfsd/hlfsd.c#4 integrate
.. //depot/projects/hammer/contrib/amd/hlfsd/hlfsd.h#5 integrate
.. //depot/projects/hammer/contrib/amd/hlfsd/homedir.c#4 integrate
.. //depot/projects/hammer/contrib/amd/hlfsd/nfs_prot_svc.c#4 integrate
.. //depot/projects/hammer/contrib/amd/hlfsd/stubs.c#4 integrate
.. //depot/projects/hammer/contrib/amd/include/am_compat.h#3 integrate
.. //depot/projects/hammer/contrib/amd/include/am_defs.h#4 integrate
.. //depot/projects/hammer/contrib/amd/include/am_utils.h#4 integrate
.. //depot/projects/hammer/contrib/amd/include/am_xdr_func.h#4 integrate
.. //depot/projects/hammer/contrib/amd/include/amq_defs.h#4 integrate
.. //depot/projects/hammer/contrib/amd/include/mount_headers1.h#3 integrate
.. //depot/projects/hammer/contrib/amd/include/mount_headers2.h#2 integrate
.. //depot/projects/hammer/contrib/amd/ldap-id.ms#2 integrate
.. //depot/projects/hammer/contrib/amd/ldap.schema#1 branch
.. //depot/projects/hammer/contrib/amd/libamu/alloca.c#2 delete
.. //depot/projects/hammer/contrib/amd/libamu/amu.h#4 integrate
.. //depot/projects/hammer/contrib/amd/libamu/hasmntopt.c#4 integrate
.. //depot/projects/hammer/contrib/amd/libamu/misc_rpc.c#4 integrate
.. //depot/projects/hammer/contrib/amd/libamu/mount_fs.c#4 integrate
.. //depot/projects/hammer/contrib/amd/libamu/mtab.c#4 integrate
.. //depot/projects/hammer/contrib/amd/libamu/nfs_prot_xdr.c#4 integrate
.. //depot/projects/hammer/contrib/amd/libamu/strerror.c#3 integrate
.. //depot/projects/hammer/contrib/amd/libamu/strutil.c#1 branch
.. //depot/projects/hammer/contrib/amd/libamu/util.c#4 delete
.. //depot/projects/hammer/contrib/amd/libamu/wire.c#4 integrate
.. //depot/projects/hammer/contrib/amd/libamu/xdr_func.c#4 integrate
.. //depot/projects/hammer/contrib/amd/libamu/xutil.c#4 integrate
.. //depot/projects/hammer/contrib/amd/m4/GNUmakefile#2 delete
.. //depot/projects/hammer/contrib/amd/m4/amdgrep#2 delete
.. //depot/projects/hammer/contrib/amd/m4/amindent#2 delete
.. //depot/projects/hammer/contrib/amd/m4/autopat#2 delete
.. //depot/projects/hammer/contrib/amd/m4/chop-aclocal.pl#2 delete
.. //depot/projects/hammer/contrib/amd/m4/copy-if-newbig#2 delete
.. //depot/projects/hammer/contrib/amd/m4/macros/HEADER#2 delete
.. //depot/projects/hammer/contrib/amd/m4/macros/TRAILER#2 delete
.. //depot/projects/hammer/contrib/amd/m4/mk-aclocal#2 delete
.. //depot/projects/hammer/contrib/amd/m4/mkconf#2 delete
.. //depot/projects/hammer/contrib/amd/m4/rmtspc#2 delete
.. //depot/projects/hammer/contrib/amd/m4/update_build_version#2 delete
.. //depot/projects/hammer/contrib/amd/mk-amd-map/mk-amd-map.8#5 integrate
.. //depot/projects/hammer/contrib/amd/mk-amd-map/mk-amd-map.c#4 integrate
.. //depot/projects/hammer/contrib/amd/scripts/am-eject.in#2 integrate
.. //depot/projects/hammer/contrib/amd/scripts/amd.conf-sample#4 integrate
.. //depot/projects/hammer/contrib/amd/scripts/amd.conf.5#8 integrate
.. //depot/projects/hammer/contrib/amd/scripts/amd2ldif.in#2 integrate
.. //depot/projects/hammer/contrib/amd/scripts/amd2sun.in#2 integrate
.. //depot/projects/hammer/contrib/amd/scripts/automount2amd.8#4 integrate
.. //depot/projects/hammer/contrib/amd/scripts/automount2amd.in#2 integrate
.. //depot/projects/hammer/contrib/amd/scripts/ctl-amd.in#3 integrate
.. //depot/projects/hammer/contrib/amd/scripts/ctl-hlfsd.in#3 integrate
.. //depot/projects/hammer/contrib/amd/scripts/expn.1#4 integrate
.. //depot/projects/hammer/contrib/amd/scripts/expn.in#4 integrate
.. //depot/projects/hammer/contrib/amd/scripts/fix-amd-map.in#2 integrate
.. //depot/projects/hammer/contrib/amd/scripts/fixrmtab.in#2 integrate
.. //depot/projects/hammer/contrib/amd/scripts/redhat-ctl-amd.in#2 integrate
.. //depot/projects/hammer/contrib/amd/scripts/test-attrcache.in#1 branch
.. //depot/projects/hammer/contrib/amd/scripts/wait4amd.in#2 integrate
.. //depot/projects/hammer/contrib/amd/scripts/wait4amd2die.in#2 integrate
.. //depot/projects/hammer/contrib/amd/tasks#4 integrate
.. //depot/projects/hammer/contrib/amd/vers.m4#1 branch
.. //depot/projects/hammer/contrib/amd/wire-test/wire-test.8#5 integrate
.. //depot/projects/hammer/contrib/amd/wire-test/wire-test.c#4 integrate
.. //depot/projects/hammer/lib/csu/common/crtbrand.c#5 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_format_zip.c#14 integrate
.. //depot/projects/hammer/release/Makefile#97 integrate
.. //depot/projects/hammer/sbin/dhclient/dispatch.c#3 integrate
.. //depot/projects/hammer/share/man/man4/msk.4#5 integrate
.. //depot/projects/hammer/share/misc/iso3166#9 integrate
.. //depot/projects/hammer/share/zoneinfo/asia#13 integrate
.. //depot/projects/hammer/share/zoneinfo/northamerica#13 integrate
.. //depot/projects/hammer/share/zoneinfo/southamerica#13 integrate
.. //depot/projects/hammer/share/zoneinfo/zone.tab#12 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#167 integrate
.. //depot/projects/hammer/sys/amd64/amd64/trap.c#101 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#52 integrate
.. //depot/projects/hammer/sys/conf/NOTES#131 integrate
.. //depot/projects/hammer/sys/conf/files#166 integrate
.. //depot/projects/hammer/sys/conf/options#118 integrate
.. //depot/projects/hammer/sys/dev/aac/aac_pci.c#30 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#56 integrate
.. //depot/projects/hammer/sys/dev/ipw/if_ipw.c#22 integrate
.. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#27 integrate
.. //depot/projects/hammer/sys/dev/msk/if_msk.c#9 integrate
.. //depot/projects/hammer/sys/dev/msk/if_mskreg.h#5 integrate
.. //depot/projects/hammer/sys/dev/sio/sio.c#57 integrate
.. //depot/projects/hammer/sys/dev/utopia/utopia.c#12 integrate
.. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vnops.c#7 integrate
.. //depot/projects/hammer/sys/geom/part/g_part.c#8 integrate
.. //depot/projects/hammer/sys/geom/part/g_part.h#6 integrate
.. //depot/projects/hammer/sys/geom/part/g_part_bsd.c#1 branch
.. //depot/projects/hammer/sys/i386/bios/apm.c#16 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#103 integrate
.. //depot/projects/hammer/sys/i386/i386/trap.c#57 integrate
.. //depot/projects/hammer/sys/ia64/conf/DEFAULTS#7 integrate
.. //depot/projects/hammer/sys/kern/imgact_elf.c#44 integrate
.. //depot/projects/hammer/sys/kern/init_main.c#50 integrate
.. //depot/projects/hammer/sys/kern/kern_conf.c#47 integrate
.. //depot/projects/hammer/sys/kern/kern_exec.c#75 integrate
.. //depot/projects/hammer/sys/kern/kern_mbuf.c#27 integrate
.. //depot/projects/hammer/sys/kern/kern_mib.c#17 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#84 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#118 integrate
.. //depot/projects/hammer/sys/net/if_lagg.c#11 integrate
.. //depot/projects/hammer/sys/netinet/if_ether.c#41 integrate
.. //depot/projects/hammer/sys/netinet/sctp.h#9 integrate
.. //depot/projects/hammer/sys/netinet/sctp_output.c#19 integrate
.. //depot/projects/hammer/sys/netinet/sctp_structs.h#14 integrate
.. //depot/projects/hammer/sys/netinet/sctp_usrreq.c#19 integrate
.. //depot/projects/hammer/sys/netinet/sctputil.c#22 integrate
.. //depot/projects/hammer/sys/netinet/tcp_syncache.c#54 integrate
.. //depot/projects/hammer/sys/security/audit/audit.c#12 integrate
.. //depot/projects/hammer/sys/sys/param.h#98 integrate
.. //depot/projects/hammer/sys/sys/proc.h#111 integrate
.. //depot/projects/hammer/sys/sys/systm.h#50 integrate
.. //depot/projects/hammer/tools/tools/ath/athdebug/athdebug.c#3 integrate
.. //depot/projects/hammer/tools/tools/ath/athstats/athstats.c#5 integrate
.. //depot/projects/hammer/tools/tools/ath/athstats/athstats.h#2 integrate
.. //depot/projects/hammer/tools/tools/ath/athstats/main.c#2 integrate
.. //depot/projects/hammer/tools/tools/ath/athstats/statfoo.c#2 integrate
.. //depot/projects/hammer/tools/tools/ath/athstats/statfoo.h#2 integrate
.. //depot/projects/hammer/tools/tools/net80211/wlanstats/main.c#3 integrate
.. //depot/projects/hammer/tools/tools/net80211/wlanstats/statfoo.c#3 integrate
.. //depot/projects/hammer/tools/tools/net80211/wlanstats/statfoo.h#2 integrate
.. //depot/projects/hammer/tools/tools/net80211/wlanstats/wlanstats.c#6 integrate
.. //depot/projects/hammer/tools/tools/net80211/wlanstats/wlanstats.h#2 integrate
.. //depot/projects/hammer/tools/tools/net80211/wlanwatch/wlanwatch.c#3 integrate
.. //depot/projects/hammer/usr.sbin/Makefile#84 integrate
.. //depot/projects/hammer/usr.sbin/amd/amd/Makefile#8 integrate
.. //depot/projects/hammer/usr.sbin/amd/fsinfo/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/amd/include/amu_autofs_prot.h#1 branch
.. //depot/projects/hammer/usr.sbin/amd/include/aux_conf.h#3 integrate
.. //depot/projects/hammer/usr.sbin/amd/include/build_version.h#2 integrate
.. //depot/projects/hammer/usr.sbin/amd/include/config.h#6 integrate
.. //depot/projects/hammer/usr.sbin/amd/include/newvers.sh#4 integrate
.. //depot/projects/hammer/usr.sbin/amd/libamu/Makefile#5 integrate
.. //depot/projects/hammer/usr.sbin/amd/mk-amd-map/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#30 integrate

Differences ...

==== //depot/projects/hammer/Makefile.inc1#128 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.590 2007/10/31 09:26:42 yar Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.591 2007/12/04 12:55:27 yar Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -603,17 +603,25 @@
 #
 distributeworld installworld: installcheck
 	mkdir -p ${INSTALLTMP}
-	for prog in ${ITOOLS}; do \
+	progs=$$(for prog in ${ITOOLS}; do \
 		if progpath=`which $$prog`; then \
-			progs="$$progs $$progpath"; \
+			echo $$progpath; \
 		else \
 			echo "Required tool $$prog not found in PATH." >&2; \
 			exit 1; \
 		fi; \
-	done; \
-	cp $$progs ${INSTALLTMP}; \
-	cp `ldd -f "%p\n" -f "%p\n" $$progs 2>/dev/null | \
-	    sort -u` ${INSTALLTMP}
+	    done); \
+	libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | \
+	    while read line; do \
+		set -- $$line; \
+		if [ "$$2 $$3" != "not found" ]; then \
+			echo $$2; \
+		else \
+			echo "Required library $$1 not found." >&2; \
+			exit 1; \
+		fi; \
+	    done); \
+	cp $$libs $$progs ${INSTALLTMP}
 	cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale
 	${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
 	    ${IMAKEENV} rm -rf ${INSTALLTMP}

==== //depot/projects/hammer/bin/sh/sh.1#29 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.125 2007/10/04 16:14:48 stefanf Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.126 2007/12/05 12:29:26 ru Exp $
 .\"
 .Dd October 7, 2006
 .Dt SH 1
@@ -57,9 +57,12 @@
 This version has many features which make
 it appear
 similar in some respects to the Korn shell, but it is not a Korn
-shell clone like pdksh.
+shell clone like
+.Nm pdksh .
 Only features
-designated by POSIX, plus a few Berkeley extensions, are being
+designated by
+.Tn POSIX ,
+plus a few Berkeley extensions, are being
 incorporated into this shell.
 This man page is not intended to be a tutorial nor a complete
 specification of the shell.
@@ -107,6 +110,7 @@
 .Pa /etc/profile
 and then
 .Pa .profile
+in a user's home directory,
 if they exist.
 If the environment variable
 .Ev ENV
@@ -129,13 +133,15 @@
 .Pa .shinit
 the filename desired:
 .Pp
-.Dl ENV=$HOME/.shinit; export ENV
+.Dl "ENV=$HOME/.shinit; export ENV"
 .Pp
 The first non-option argument specified on the command line
 will be treated as the
 name of a file from which to read commands (a shell script), and
 the remaining arguments are set as the positional parameters
-of the shell ($1, $2, etc).
+of the shell
+.Li ( $1 , $2 ,
+etc.).
 Otherwise, the shell reads commands
 from its standard input.
 .Pp
@@ -180,7 +186,7 @@
 A
 .Dq Li --
 or plain
-.Dq Ql -
+.Ql -
 will stop option processing and will force the remaining
 words on the command line to be treated as arguments.
 The
@@ -198,7 +204,7 @@
 (UNIMPLEMENTED)
 .It Fl C Li noclobber
 Do not overwrite existing files with
-.Dq Li > .
+.Ql > .
 .It Fl E Li emacs
 Enable the built-in
 .Xr emacs 1
@@ -228,7 +234,7 @@
 Disable pathname expansion.
 .It Fl I Li ignoreeof
 Ignore
-.Dv EOF Ns ' Ns s
+.Dv EOF Ap s
 from input when in interactive mode.
 .It Fl i Li interactive
 Force the shell to behave interactively.
@@ -253,10 +259,10 @@
 .It Fl p Li privileged
 Turn on privileged mode.
 This mode is enabled on startup
-if either the effective user or group id is not equal to the
-real user or group id.
+if either the effective user or group ID is not equal to the
+real user or group ID.
 Turning this mode off sets the
-effective user and group ids to the real user and group ids.
+effective user and group IDs to the real user and group IDs.
 When this mode is enabled for interactive shells, the file
 .Pa /etc/suid_profile
 is sourced instead of
@@ -288,7 +294,6 @@
 .Bd -literal -offset indent
 sh -T -c "trap 'exit 1' 2 ; some-blocking-program"
 .Ed
-.Pp
 .It Fl u Li nounset
 Write a message to standard error when attempting
 to expand a variable that is not set, and if the
@@ -306,7 +311,7 @@
 .It Fl x Li xtrace
 Write each command
 (preceded by the value of the
-.Ev PS4
+.Va PS4
 variable)
 to standard error before it is executed.
 Useful for debugging.
@@ -384,7 +389,7 @@
 it impossible to put single-quotes in a single-quoted string).
 .It Double Quotes
 Enclosing characters within double quotes preserves the literal
-meaning of all characters except dollarsign
+meaning of all characters except dollar sign
 .Pq Ql $ ,
 backquote
 .Pq Ql ` ,
@@ -423,16 +428,14 @@
 For example, if there is an alias called
 .Dq Li lf
 with the value
-.Dq Li ls -F ,
+.Dq Li "ls -F" ,
 then the input
-.Bd -literal -offset indent
-lf foobar
-.Ed
+.Pp
+.Dl "lf foobar"
 .Pp
 would become
-.Bd -literal -offset indent
-ls -F foobar
-.Ed
+.Pp
+.Dl "ls -F foobar"
 .Pp
 Aliases provide a convenient way for naive users to
 create shorthands for commands without having to learn how
@@ -498,10 +501,10 @@
 The overall format
 used for redirection is:
 .Pp
-.Dl [n] redir-op file
+.D1 Oo Ar n Oc Ar redir-op file
 .Pp
 The
-.Ql redir-op
+.Ar redir-op
 is one of the redirection operators mentioned
 previously.
 The following gives some examples of how these
@@ -509,42 +512,66 @@
 Note that stdin and stdout are commonly used abbreviations
 for standard input and standard output respectively.
 .Bl -tag -width "1234567890XX" -offset indent
-.It Li [n]> file
-redirect stdout (or file descriptor n) to file
-.It Li [n]>| file
+.It Oo Ar n Oc Ns Li > Ar file
+redirect stdout (or file descriptor
+.Ar n )
+to
+.Ar file
+.It Oo Ar n Oc Ns Li >| Ar file
 same as above, but override the
 .Fl C
 option
-.It Li [n]>> file
-append stdout (or file descriptor n) to file
-.It Li [n]< file
-redirect stdin (or file descriptor n) from file
-.It Li [n]<> file
-redirect stdin (or file descriptor n) to and from file
-.It Li [n1]<&n2
-duplicate stdin (or file descriptor n1) from file descriptor n2
-.It Li [n]<&-
-close stdin (or file descriptor n)
-.It Li [n1]>&n2
-duplicate stdout (or file descriptor n1) to file descriptor n2
-.It Li [n]>&-
-close stdout (or file descriptor n)
+.It Oo Ar n Oc Ns Li >> Ar file
+append stdout (or file descriptor
+.Ar n )
+to
+.Ar file
+.It Oo Ar n Oc Ns Li < Ar file
+redirect stdin (or file descriptor
+.Ar n )
+from
+.Ar file
+.It Oo Ar n Oc Ns Li <> Ar file
+redirect stdin (or file descriptor
+.Ar n )
+to and from
+.Ar file
+.It Oo Ar n1 Oc Ns Li <& Ns Ar n2
+duplicate stdin (or file descriptor
+.Ar n1 )
+from file descriptor
+.Ar n2
+.It Oo Ar n Oc Ns Li <&-
+close stdin (or file descriptor
+.Ar n )
+.It Oo Ar n1 Oc Ns Li >& Ns Ar n2
+duplicate stdout (or file descriptor
+.Ar n1 )
+to file descriptor
+.Ar n2
+.It Oo Ar n Oc Ns Li >&-
+close stdout (or file descriptor
+.Ar n )
 .El
 .Pp
 The following redirection is often called a
 .Dq here-document .
-.Bd -literal -offset indent
-[n]<< delimiter
-	here-doc-text
-	...
-delimiter
+.Bd -unfilled -offset indent
+.Oo Ar n Oc Ns Li << Ar delimiter
+.D1 Ar here-doc-text
+.D1 ...
+.Ar delimiter
 .Ed
 .Pp
 All the text on successive lines up to the delimiter is
 saved away and made available to the command on standard
-input, or file descriptor n if it is specified.
-If the delimiter
-as specified on the initial line is quoted, then the here-doc-text
+input, or file descriptor
+.Ar n
+if it is specified.
+If the
+.Ar delimiter
+as specified on the initial line is quoted, then the
+.Ar here-doc-text
 is treated literally, otherwise the text is subjected to
 parameter expansion, command substitution, and arithmetic
 expansion (as described in the section on
@@ -554,7 +581,9 @@
 instead of
 .Dq Li << ,
 then leading tabs
-in the here-doc-text are stripped.
+in the
+.Ar here-doc-text
+are stripped.
 .Ss Search and Execution
 There are three types of commands: shell functions,
 built-in commands, and normal programs.
@@ -562,7 +591,9 @@
 The three types of commands are all executed in a different way.
 .Pp
 When a shell function is executed, all of the shell positional
-parameters (except $0, which remains unchanged) are
+parameters (except
+.Li $0 ,
+which remains unchanged) are
 set to the arguments of the shell function.
 The variables which are explicitly placed in the environment of
 the command (by placing assignments to them before the
@@ -583,11 +614,11 @@
 passing the arguments and the environment to the program.
 If the program is not a normal executable file
 (i.e., if it does not begin with the
-.Qq magic number
+.Dq "magic number"
 whose
 .Tn ASCII
 representation is
-.Qq #! ,
+.Dq Li #! ,
 resulting in an
 .Er ENOEXEC
 return value from
@@ -597,13 +628,16 @@
 so that the effect will be
 as if a new shell had been invoked to handle the ad-hoc shell script,
 except that the location of hashed commands located in
-the parent shell will be remembered by the child.
+the parent shell will be remembered by the child
+(see the description of the
+.Ic hash
+built-in command below).
 .Pp
 Note that previous versions of this document
 and the source code itself misleadingly and sporadically
 refer to a shell script without a magic number
 as a
-.Qq shell procedure .
+.Dq "shell procedure" .
 .Ss Path Search
 When locating a command, the shell first looks to see if
 it has a shell function by that name.
@@ -616,8 +650,9 @@
 Command names containing a slash are simply executed without
 performing any searches.
 .It
-The shell searches each entry in
+The shell searches each entry in the
 .Ev PATH
+environment variable
 in turn for the command.
 The value of the
 .Ev PATH
@@ -666,7 +701,8 @@
 that of the last simple command executed by the command.
 .Ss Pipelines
 A pipeline is a sequence of one or more commands separated
-by the control operator |.
+by the control operator
+.Ql \&| .
 The standard output of all but
 the last command is connected to the standard input
 of the next command.
@@ -675,10 +711,12 @@
 .Pp
 The format for a pipeline is:
 .Pp
-.Dl [!] command1 [ | command2 ...]
+.D1 Oo Li \&! Oc Ar command1 Op Li \&| Ar command2 ...
 .Pp
-The standard output of command1 is connected to the standard
-input of command2.
+The standard output of
+.Ar command1
+is connected to the standard input of
+.Ar command2 .
 The standard input, standard output, or
 both of a command is considered to be assigned by the
 pipeline before any redirection specified by redirection
@@ -704,22 +742,22 @@
 modified by redirection.
 For example:
 .Pp
-.Dl $ command1 2>&1 | command2
+.Dl "command1 2>&1 | command2"
 .Pp
 sends both the standard output and standard error of
-.Ql command1
+.Ar command1
 to the standard input of
-.Ql command2 .
+.Ar command2 .
 .Pp
 A
-.Dq Li \&;
+.Ql \&;
 or newline terminator causes the preceding
 AND-OR-list
 (described below in the section called
 .Sx Short-Circuit List Operators )
 to be executed sequentially;
 an
-.Dq Li &
+.Ql &
 causes asynchronous execution of the preceding AND-OR-list.
 .Pp
 Note that unlike some other shells,
@@ -738,12 +776,12 @@
 before executing the next command.
 .Pp
 The format for running a command in background is:
-.Bd -literal -offset indent
-command1 & [command2 & ...]
-.Ed
+.Pp
+.D1 Ar command1 Li & Op Ar command2 Li & Ar ...
 .Pp
 If the shell is not interactive, the standard input of an
-asynchronous command is set to /dev/null.
+asynchronous command is set to
+.Pa /dev/null .
 .Ss Lists (Generally Speaking)
 A list is a sequence of zero or more commands separated by
 newlines, semicolons, or ampersands,
@@ -773,22 +811,23 @@
 The syntax of the
 .Ic if
 command is:
-.\"
-.\" XXX Use .Dl to work around broken handling of .Ic inside .Bd and .Ed .
-.\"
-.Dl Ic if Ar list
-.Dl Ic then Ar list
-.Dl [ Ic elif Ar list
-.Dl Ic then Ar list ] ...
-.Dl [ Ic else Ar list ]
-.Dl Ic fi
+.Bd -unfilled -offset indent -compact
+.Ic if Ar list
+.Ic then Ar list
+.Oo Ic elif Ar list
+.Ic then Ar list Oc Ar ...
+.Op Ic else Ar list
+.Ic fi
+.Ed
 .Pp
 The syntax of the
 .Ic while
 command is:
-.Dl Ic while Ar list
-.Dl Ic do Ar list
-.Dl Ic done
+.Bd -unfilled -offset indent -compact
+.Ic while Ar list
+.Ic do Ar list
+.Ic done
+.Ed
 .Pp
 The two lists are executed repeatedly while the exit status of the
 first list is zero.
@@ -804,9 +843,11 @@
 The syntax of the
 .Ic for
 command is:
-.Dl Ic for Ar variable Op Ic in Ar word ...
-.Dl Ic do Ar list
-.Dl Ic done
+.Bd -unfilled -offset indent -compact
+.Ic for Ar variable Op Ic in Ar word ...
+.Ic do Ar list
+.Ic done
+.Ed
 .Pp
 If
 .Ic in
@@ -820,17 +861,17 @@
 and
 .Ic done
 commands may be replaced with
-.Dq Li {
+.Ql {
 and
-.Dq Li } .
+.Ql } .
 .Pp
 The syntax of the
 .Ic break
 and
 .Ic continue
 commands is:
-.Dl Ic break Op Ar num
-.Dl Ic continue Op Ar num
+.D1 Ic break Op Ar num
+.D1 Ic continue Op Ar num
 .Pp
 The
 .Ic break
@@ -848,18 +889,20 @@
 .Pp
 The syntax of the
 .Ic case
-command is
-.Dl Ic case Ar word Ic in
-.Dl pattern) list ;;
-.Dl ...
-.Dl Ic esac
+command is:
+.Bd -unfilled -offset indent -compact
+.Ic case Ar word Ic in
+.Ar pattern Ns Li ) Ar list Li ;;
+.Ar ...
+.Ic esac
+.Ed
 .Pp
 The pattern can actually be one or more patterns
 (see
 .Sx Shell Patterns
 described later),
 separated by
-.Dq Li \&|
+.Ql \&|
 characters.
 The exit code of the
 .Ic case
@@ -867,14 +910,12 @@
 zero if no patterns were matched.
 .Ss Grouping Commands Together
 Commands may be grouped by writing either
-.Bd -literal -offset indent
-(list)
-.Ed
+.Pp
+.D1 Li \&( Ns Ar list Ns Li \%)
 .Pp
 or
-.Bd -literal -offset indent
-{ list; }
-.Ed
+.Pp
+.D1 Li { Ar list Ns Li \&; }
 .Pp
 The first form executes the commands in a subshell.
 Note that built-in commands thus executed do not affect the current shell.
@@ -887,18 +928,21 @@
 .Ed
 .Ss Functions
 The syntax of a function definition is
-.Bd -literal -offset indent
-name ( ) command
-.Ed
+.Pp
+.D1 Ar name Li \&( \&) Ar command
 .Pp
 A function definition is an executable statement; when
-executed it installs a function named name and returns an
+executed it installs a function named
+.Ar name
+and returns an
 exit status of zero.
-The command is normally a list
+The
+.Ar command
+is normally a list
 enclosed between
-.Dq Li {
+.Ql {
 and
-.Dq Li } .
+.Ql } .
 .Pp
 Variables may be declared to be local to a function by
 using the
@@ -906,11 +950,8 @@
 command.
 This should appear as the first statement of a function,
 and the syntax is:
-.Bd -ragged -offset indent
-.Ic local
-.Op Ar variable ...
-.Op Fl
-.Ed
+.Pp
+.D1 Ic local Oo Ar variable ... Oc Op Fl
 .Pp
 The
 .Ic local
@@ -923,38 +964,38 @@
 Otherwise, the variable is initially unset.
 The shell
 uses dynamic scoping, so that if the variable
-.Em x
+.Va x
 is made local to function
 .Em f ,
 which then calls function
 .Em g ,
 references to the variable
-.Em x
+.Va x
 made inside
 .Em g
 will refer to the variable
-.Em x
+.Va x
 declared inside
 .Em f ,
 not to the global variable named
-.Em x .
+.Va x .
 .Pp
 The only special parameter that can be made local is
-.Dq Li - .
+.Ql - .
 Making
-.Dq Li -
+.Ql -
 local causes any shell options that are
-changed via the set command inside the function to be
+changed via the
+.Ic set
+command inside the function to be
 restored to their original values when the function
 returns.
 .Pp
 The syntax of the
 .Ic return
 command is
-.Bd -ragged -offset indent
-.Ic return
-.Op Ar exitstatus
-.Ed
+.Pp
+.D1 Ic return Op Ar exitstatus
 .Pp
 It terminates the current executional scope, returning from the previous
 nested function, sourced script, or shell instance, in that order.
@@ -969,9 +1010,8 @@
 the shell turns all the environment variables into shell
 variables.
 New variables can be set using the form
-.Bd -literal -offset indent
-name=value
-.Ed
+.Pp
+.D1 Ar name Ns = Ns Ar value
 .Pp
 Variables set by the user must have a name consisting solely
 of alphabetics, numerics, and underscores.
@@ -1001,12 +1041,10 @@
 the expansion occurs within a double-quoted string
 it expands to a single field with the value of each parameter
 separated by the first character of the
-.Ev IFS
+.Va IFS
 variable,
-or by a
-.Aq space
-if
-.Ev IFS
+or by a space if
+.Va IFS
 is unset.
 .It Li $@
 Expands to the positional parameters, starting from one.
@@ -1020,12 +1058,16 @@
 .Li @
 is double-quoted.
 What this basically means, for example, is
-if $1 is
-.Dq abc
-and $2 is
-.Dq def ghi ,
+if
+.Li $1
+is
+.Dq Li abc
+and
+.Li $2
+is
+.Dq Li "def ghi" ,
 then
-.Qq Li $@
+.Dq Li $@
 expands to
 the two arguments:
 .Bd -literal -offset indent
@@ -1033,18 +1075,22 @@
 .Ed
 .It Li $#
 Expands to the number of positional parameters.
-.It Li $\&?
+.It Li $?
 Expands to the exit status of the most recent pipeline.
 .It Li $-
 (hyphen) Expands to the current option flags (the single-letter
 option names concatenated into a string) as specified on
-invocation, by the set built-in command, or implicitly
+invocation, by the
+.Ic set
+built-in command, or implicitly
 by the shell.
 .It Li $$
 Expands to the process ID of the invoked shell.
 A subshell
-retains the same value of $ as its parent.
-.It Li $\&!
+retains the same value of
+.Va $
+as its parent.
+.It Li $!
 Expands to the process ID of the most recent background
 command executed from the current shell.
 For a
@@ -1067,7 +1113,7 @@
 fields from a single word.
 The single exception to this rule is
 the expansion of the special parameter
-.Li @
+.Va @
 within double-quotes,
 as was described above.
 .Pp
@@ -1079,7 +1125,7 @@
 .It
 Field Splitting is performed on fields generated by step (1)
 unless the
-.Ev IFS
+.Va IFS
 variable is null.
 .It
 Pathname Expansion (unless the
@@ -1090,7 +1136,7 @@
 .El
 .Pp
 The
-.Dq Li $
+.Ql $
 character is used to introduce parameter expansion, command
 substitution, or arithmetic evaluation.
 .Ss Tilde Expansion (substituting a user's home directory)

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu Dec  6 04:20:56 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 779A916A421; Thu,  6 Dec 2007 04:20:56 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DE2DA16A419
	for ; Thu,  6 Dec 2007 04:20:55 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C949913C455
	for ; Thu,  6 Dec 2007 04:20:55 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB64KtBM029314
	for ; Thu, 6 Dec 2007 04:20:55 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB64KqUp029311
	for perforce@freebsd.org; Thu, 6 Dec 2007 04:20:52 GMT
	(envelope-from kmacy@freebsd.org)
Date: Thu, 6 Dec 2007 04:20:52 GMT
Message-Id: <200712060420.lB64KqUp029311@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130311 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 06 Dec 2007 04:20:56 -0000

http://perforce.freebsd.org/chv.cgi?CH=130311

Change 130311 by kmacy@entropy_kmacy_xen31 on 2007/12/06 04:20:36

	IFC #130310

Affected files ...

.. //depot/projects/xen31/bin/sh/sh.1#2 integrate
.. //depot/projects/xen31/contrib/amd/AUTHORS#2 integrate
.. //depot/projects/xen31/contrib/amd/BUGS#2 integrate
.. //depot/projects/xen31/contrib/amd/COPYING#2 integrate
.. //depot/projects/xen31/contrib/amd/ChangeLog#2 integrate
.. //depot/projects/xen31/contrib/amd/FAQ#1 branch
.. //depot/projects/xen31/contrib/amd/INSTALL#2 integrate
.. //depot/projects/xen31/contrib/amd/NEWS#2 integrate
.. //depot/projects/xen31/contrib/amd/README.attrcache#1 branch
.. //depot/projects/xen31/contrib/amd/README.ldap#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/am_ops.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/amd.8#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/amd.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/amd.h#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/amfs_auto.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/amfs_direct.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/amfs_error.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/amfs_generic.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/amfs_host.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/amfs_inherit.c#2 delete
.. //depot/projects/xen31/contrib/amd/amd/amfs_link.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/amfs_linkx.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/amfs_nfsl.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/amfs_nfsx.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/amfs_program.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/amfs_root.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/amfs_toplvl.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/amfs_union.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/amq_subr.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/amq_svc.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/autil.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/clock.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/conf.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/conf_parse.y#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/conf_tok.l#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/get_args.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/info_exec.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/info_file.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/info_hesiod.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/info_ldap.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/info_ndbm.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/info_nis.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/info_nisplus.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/info_passwd.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/info_union.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/map.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/mapc.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/mntfs.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/nfs_prot_svc.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/nfs_start.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/nfs_subr.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/ops_TEMPLATE.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/ops_cachefs.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/ops_cdfs.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/ops_efs.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/ops_lofs.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/ops_mfs.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/ops_nfs.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/ops_nfs3.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/ops_nullfs.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/ops_pcfs.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/ops_tfs.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/ops_tmpfs.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/ops_ufs.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/ops_umapfs.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/ops_unionfs.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/ops_xfs.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/opts.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/readdir.c#1 branch
.. //depot/projects/xen31/contrib/amd/amd/restart.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/rpc_fwd.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/sched.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/srvr_amfs_auto.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amd/srvr_nfs.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amq/amq.8#2 integrate
.. //depot/projects/xen31/contrib/amd/amq/amq.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amq/amq.h#2 integrate
.. //depot/projects/xen31/contrib/amd/amq/amq_clnt.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amq/amq_xdr.c#2 integrate
.. //depot/projects/xen31/contrib/amd/amq/pawd.1#2 integrate
.. //depot/projects/xen31/contrib/amd/amq/pawd.c#2 integrate
.. //depot/projects/xen31/contrib/amd/aux_conf.h.in#2 integrate
.. //depot/projects/xen31/contrib/amd/bootstrap#2 integrate
.. //depot/projects/xen31/contrib/amd/conf/checkmount/checkmount_bsd44.c#2 integrate
.. //depot/projects/xen31/contrib/amd/conf/mtab/mtab_bsd.c#2 integrate
.. //depot/projects/xen31/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#2 integrate
.. //depot/projects/xen31/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#2 integrate
.. //depot/projects/xen31/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#2 integrate
.. //depot/projects/xen31/contrib/amd/conf/transp/transp_sockets.c#2 integrate
.. //depot/projects/xen31/contrib/amd/conf/trap/trap_default.h#2 integrate
.. //depot/projects/xen31/contrib/amd/conf/umount/umount_bsd44.c#2 integrate
.. //depot/projects/xen31/contrib/amd/doc/am-utils.texi#2 integrate
.. //depot/projects/xen31/contrib/amd/doc/stamp-vti#1 branch
.. //depot/projects/xen31/contrib/amd/doc/texinfo.tex#2 integrate
.. //depot/projects/xen31/contrib/amd/doc/version.texi#2 integrate
.. //depot/projects/xen31/contrib/amd/fixmount/fixmount.8#2 integrate
.. //depot/projects/xen31/contrib/amd/fixmount/fixmount.c#2 integrate
.. //depot/projects/xen31/contrib/amd/fsinfo/fsi_analyze.c#2 integrate
.. //depot/projects/xen31/contrib/amd/fsinfo/fsi_data.h#2 integrate
.. //depot/projects/xen31/contrib/amd/fsinfo/fsi_dict.c#2 integrate
.. //depot/projects/xen31/contrib/amd/fsinfo/fsi_gram.y#2 integrate
.. //depot/projects/xen31/contrib/amd/fsinfo/fsi_lex.l#2 integrate
.. //depot/projects/xen31/contrib/amd/fsinfo/fsi_util.c#2 integrate
.. //depot/projects/xen31/contrib/amd/fsinfo/fsinfo.8#2 integrate
.. //depot/projects/xen31/contrib/amd/fsinfo/fsinfo.c#2 integrate
.. //depot/projects/xen31/contrib/amd/fsinfo/fsinfo.h#2 integrate
.. //depot/projects/xen31/contrib/amd/fsinfo/wr_atab.c#2 integrate
.. //depot/projects/xen31/contrib/amd/fsinfo/wr_bparam.c#2 integrate
.. //depot/projects/xen31/contrib/amd/fsinfo/wr_dumpset.c#2 integrate
.. //depot/projects/xen31/contrib/amd/fsinfo/wr_exportfs.c#2 integrate
.. //depot/projects/xen31/contrib/amd/fsinfo/wr_fstab.c#2 integrate
.. //depot/projects/xen31/contrib/amd/hlfsd/hlfsd.8#2 integrate
.. //depot/projects/xen31/contrib/amd/hlfsd/hlfsd.c#2 integrate
.. //depot/projects/xen31/contrib/amd/hlfsd/hlfsd.h#2 integrate
.. //depot/projects/xen31/contrib/amd/hlfsd/homedir.c#2 integrate
.. //depot/projects/xen31/contrib/amd/hlfsd/nfs_prot_svc.c#2 integrate
.. //depot/projects/xen31/contrib/amd/hlfsd/stubs.c#2 integrate
.. //depot/projects/xen31/contrib/amd/include/am_compat.h#2 integrate
.. //depot/projects/xen31/contrib/amd/include/am_defs.h#2 integrate
.. //depot/projects/xen31/contrib/amd/include/am_utils.h#2 integrate
.. //depot/projects/xen31/contrib/amd/include/am_xdr_func.h#2 integrate
.. //depot/projects/xen31/contrib/amd/include/amq_defs.h#2 integrate
.. //depot/projects/xen31/contrib/amd/include/mount_headers1.h#2 integrate
.. //depot/projects/xen31/contrib/amd/include/mount_headers2.h#2 integrate
.. //depot/projects/xen31/contrib/amd/ldap-id.ms#2 integrate
.. //depot/projects/xen31/contrib/amd/ldap.schema#1 branch
.. //depot/projects/xen31/contrib/amd/libamu/alloca.c#2 delete
.. //depot/projects/xen31/contrib/amd/libamu/amu.h#2 integrate
.. //depot/projects/xen31/contrib/amd/libamu/hasmntopt.c#2 integrate
.. //depot/projects/xen31/contrib/amd/libamu/misc_rpc.c#2 integrate
.. //depot/projects/xen31/contrib/amd/libamu/mount_fs.c#2 integrate
.. //depot/projects/xen31/contrib/amd/libamu/mtab.c#2 integrate
.. //depot/projects/xen31/contrib/amd/libamu/nfs_prot_xdr.c#2 integrate
.. //depot/projects/xen31/contrib/amd/libamu/strerror.c#2 integrate
.. //depot/projects/xen31/contrib/amd/libamu/strutil.c#1 branch
.. //depot/projects/xen31/contrib/amd/libamu/util.c#2 delete
.. //depot/projects/xen31/contrib/amd/libamu/wire.c#2 integrate
.. //depot/projects/xen31/contrib/amd/libamu/xdr_func.c#2 integrate
.. //depot/projects/xen31/contrib/amd/libamu/xutil.c#2 integrate
.. //depot/projects/xen31/contrib/amd/m4/GNUmakefile#2 delete
.. //depot/projects/xen31/contrib/amd/m4/amdgrep#2 delete
.. //depot/projects/xen31/contrib/amd/m4/amindent#2 delete
.. //depot/projects/xen31/contrib/amd/m4/autopat#2 delete
.. //depot/projects/xen31/contrib/amd/m4/chop-aclocal.pl#2 delete
.. //depot/projects/xen31/contrib/amd/m4/copy-if-newbig#2 delete
.. //depot/projects/xen31/contrib/amd/m4/macros/HEADER#2 delete
.. //depot/projects/xen31/contrib/amd/m4/macros/TRAILER#2 delete
.. //depot/projects/xen31/contrib/amd/m4/mk-aclocal#2 delete
.. //depot/projects/xen31/contrib/amd/m4/mkconf#2 delete
.. //depot/projects/xen31/contrib/amd/m4/rmtspc#2 delete
.. //depot/projects/xen31/contrib/amd/m4/update_build_version#2 delete
.. //depot/projects/xen31/contrib/amd/mk-amd-map/mk-amd-map.8#2 integrate
.. //depot/projects/xen31/contrib/amd/mk-amd-map/mk-amd-map.c#2 integrate
.. //depot/projects/xen31/contrib/amd/scripts/am-eject.in#2 integrate
.. //depot/projects/xen31/contrib/amd/scripts/amd.conf-sample#2 integrate
.. //depot/projects/xen31/contrib/amd/scripts/amd.conf.5#2 integrate
.. //depot/projects/xen31/contrib/amd/scripts/amd2ldif.in#2 integrate
.. //depot/projects/xen31/contrib/amd/scripts/amd2sun.in#2 integrate
.. //depot/projects/xen31/contrib/amd/scripts/automount2amd.8#2 integrate
.. //depot/projects/xen31/contrib/amd/scripts/automount2amd.in#2 integrate
.. //depot/projects/xen31/contrib/amd/scripts/ctl-amd.in#2 integrate
.. //depot/projects/xen31/contrib/amd/scripts/ctl-hlfsd.in#2 integrate
.. //depot/projects/xen31/contrib/amd/scripts/expn.1#2 integrate
.. //depot/projects/xen31/contrib/amd/scripts/expn.in#2 integrate
.. //depot/projects/xen31/contrib/amd/scripts/fix-amd-map.in#2 integrate
.. //depot/projects/xen31/contrib/amd/scripts/fixrmtab.in#2 integrate
.. //depot/projects/xen31/contrib/amd/scripts/redhat-ctl-amd.in#2 integrate
.. //depot/projects/xen31/contrib/amd/scripts/test-attrcache.in#1 branch
.. //depot/projects/xen31/contrib/amd/scripts/wait4amd.in#2 integrate
.. //depot/projects/xen31/contrib/amd/scripts/wait4amd2die.in#2 integrate
.. //depot/projects/xen31/contrib/amd/tasks#2 integrate
.. //depot/projects/xen31/contrib/amd/vers.m4#1 branch
.. //depot/projects/xen31/contrib/amd/wire-test/wire-test.8#2 integrate
.. //depot/projects/xen31/contrib/amd/wire-test/wire-test.c#2 integrate
.. //depot/projects/xen31/sbin/dhclient/dispatch.c#2 integrate
.. //depot/projects/xen31/share/man/man4/msk.4#3 integrate
.. //depot/projects/xen31/sys/conf/NOTES#6 integrate
.. //depot/projects/xen31/sys/conf/files#6 integrate
.. //depot/projects/xen31/sys/conf/options#4 integrate
.. //depot/projects/xen31/sys/dev/aac/aac_pci.c#2 integrate
.. //depot/projects/xen31/sys/dev/ipw/if_ipw.c#3 integrate
.. //depot/projects/xen31/sys/dev/iwi/if_iwi.c#2 integrate
.. //depot/projects/xen31/sys/dev/msk/if_msk.c#3 integrate
.. //depot/projects/xen31/sys/dev/msk/if_mskreg.h#3 integrate
.. //depot/projects/xen31/sys/dev/sio/sio.c#2 integrate
.. //depot/projects/xen31/sys/dev/utopia/utopia.c#2 integrate
.. //depot/projects/xen31/sys/geom/part/g_part.c#3 integrate
.. //depot/projects/xen31/sys/geom/part/g_part.h#3 integrate
.. //depot/projects/xen31/sys/geom/part/g_part_bsd.c#1 branch
.. //depot/projects/xen31/sys/i386/bios/apm.c#3 integrate
.. //depot/projects/xen31/sys/ia64/conf/DEFAULTS#2 integrate
.. //depot/projects/xen31/sys/kern/kern_mbuf.c#5 integrate
.. //depot/projects/xen31/sys/kern/vfs_subr.c#3 integrate
.. //depot/projects/xen31/sys/netinet/sctp_output.c#4 integrate
.. //depot/projects/xen31/sys/netinet/sctputil.c#4 integrate
.. //depot/projects/xen31/sys/sys/param.h#7 integrate
.. //depot/projects/xen31/usr.sbin/Makefile#2 integrate
.. //depot/projects/xen31/usr.sbin/amd/amd/Makefile#2 integrate
.. //depot/projects/xen31/usr.sbin/amd/fsinfo/Makefile#2 integrate
.. //depot/projects/xen31/usr.sbin/amd/include/amu_autofs_prot.h#1 branch
.. //depot/projects/xen31/usr.sbin/amd/include/aux_conf.h#2 integrate
.. //depot/projects/xen31/usr.sbin/amd/include/build_version.h#2 integrate
.. //depot/projects/xen31/usr.sbin/amd/include/config.h#2 integrate
.. //depot/projects/xen31/usr.sbin/amd/include/newvers.sh#2 integrate
.. //depot/projects/xen31/usr.sbin/amd/libamu/Makefile#2 integrate
.. //depot/projects/xen31/usr.sbin/amd/mk-amd-map/Makefile#2 integrate
.. //depot/projects/xen31/usr.sbin/syslogd/syslogd.c#2 integrate

Differences ...

==== //depot/projects/xen31/bin/sh/sh.1#2 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.125 2007/10/04 16:14:48 stefanf Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.126 2007/12/05 12:29:26 ru Exp $
 .\"
 .Dd October 7, 2006
 .Dt SH 1
@@ -57,9 +57,12 @@
 This version has many features which make
 it appear
 similar in some respects to the Korn shell, but it is not a Korn
-shell clone like pdksh.
+shell clone like
+.Nm pdksh .
 Only features
-designated by POSIX, plus a few Berkeley extensions, are being
+designated by
+.Tn POSIX ,
+plus a few Berkeley extensions, are being
 incorporated into this shell.
 This man page is not intended to be a tutorial nor a complete
 specification of the shell.
@@ -107,6 +110,7 @@
 .Pa /etc/profile
 and then
 .Pa .profile
+in a user's home directory,
 if they exist.
 If the environment variable
 .Ev ENV
@@ -129,13 +133,15 @@
 .Pa .shinit
 the filename desired:
 .Pp
-.Dl ENV=$HOME/.shinit; export ENV
+.Dl "ENV=$HOME/.shinit; export ENV"
 .Pp
 The first non-option argument specified on the command line
 will be treated as the
 name of a file from which to read commands (a shell script), and
 the remaining arguments are set as the positional parameters
-of the shell ($1, $2, etc).
+of the shell
+.Li ( $1 , $2 ,
+etc.).
 Otherwise, the shell reads commands
 from its standard input.
 .Pp
@@ -180,7 +186,7 @@
 A
 .Dq Li --
 or plain
-.Dq Ql -
+.Ql -
 will stop option processing and will force the remaining
 words on the command line to be treated as arguments.
 The
@@ -198,7 +204,7 @@
 (UNIMPLEMENTED)
 .It Fl C Li noclobber
 Do not overwrite existing files with
-.Dq Li > .
+.Ql > .
 .It Fl E Li emacs
 Enable the built-in
 .Xr emacs 1
@@ -228,7 +234,7 @@
 Disable pathname expansion.
 .It Fl I Li ignoreeof
 Ignore
-.Dv EOF Ns ' Ns s
+.Dv EOF Ap s
 from input when in interactive mode.
 .It Fl i Li interactive
 Force the shell to behave interactively.
@@ -253,10 +259,10 @@
 .It Fl p Li privileged
 Turn on privileged mode.
 This mode is enabled on startup
-if either the effective user or group id is not equal to the
-real user or group id.
+if either the effective user or group ID is not equal to the
+real user or group ID.
 Turning this mode off sets the
-effective user and group ids to the real user and group ids.
+effective user and group IDs to the real user and group IDs.
 When this mode is enabled for interactive shells, the file
 .Pa /etc/suid_profile
 is sourced instead of
@@ -288,7 +294,6 @@
 .Bd -literal -offset indent
 sh -T -c "trap 'exit 1' 2 ; some-blocking-program"
 .Ed
-.Pp
 .It Fl u Li nounset
 Write a message to standard error when attempting
 to expand a variable that is not set, and if the
@@ -306,7 +311,7 @@
 .It Fl x Li xtrace
 Write each command
 (preceded by the value of the
-.Ev PS4
+.Va PS4
 variable)
 to standard error before it is executed.
 Useful for debugging.
@@ -384,7 +389,7 @@
 it impossible to put single-quotes in a single-quoted string).
 .It Double Quotes
 Enclosing characters within double quotes preserves the literal
-meaning of all characters except dollarsign
+meaning of all characters except dollar sign
 .Pq Ql $ ,
 backquote
 .Pq Ql ` ,
@@ -423,16 +428,14 @@
 For example, if there is an alias called
 .Dq Li lf
 with the value
-.Dq Li ls -F ,
+.Dq Li "ls -F" ,
 then the input
-.Bd -literal -offset indent
-lf foobar
-.Ed
+.Pp
+.Dl "lf foobar"
 .Pp
 would become
-.Bd -literal -offset indent
-ls -F foobar
-.Ed
+.Pp
+.Dl "ls -F foobar"
 .Pp
 Aliases provide a convenient way for naive users to
 create shorthands for commands without having to learn how
@@ -498,10 +501,10 @@
 The overall format
 used for redirection is:
 .Pp
-.Dl [n] redir-op file
+.D1 Oo Ar n Oc Ar redir-op file
 .Pp
 The
-.Ql redir-op
+.Ar redir-op
 is one of the redirection operators mentioned
 previously.
 The following gives some examples of how these
@@ -509,42 +512,66 @@
 Note that stdin and stdout are commonly used abbreviations
 for standard input and standard output respectively.
 .Bl -tag -width "1234567890XX" -offset indent
-.It Li [n]> file
-redirect stdout (or file descriptor n) to file
-.It Li [n]>| file
+.It Oo Ar n Oc Ns Li > Ar file
+redirect stdout (or file descriptor
+.Ar n )
+to
+.Ar file
+.It Oo Ar n Oc Ns Li >| Ar file
 same as above, but override the
 .Fl C
 option
-.It Li [n]>> file
-append stdout (or file descriptor n) to file
-.It Li [n]< file
-redirect stdin (or file descriptor n) from file
-.It Li [n]<> file
-redirect stdin (or file descriptor n) to and from file
-.It Li [n1]<&n2
-duplicate stdin (or file descriptor n1) from file descriptor n2
-.It Li [n]<&-
-close stdin (or file descriptor n)
-.It Li [n1]>&n2
-duplicate stdout (or file descriptor n1) to file descriptor n2
-.It Li [n]>&-
-close stdout (or file descriptor n)
+.It Oo Ar n Oc Ns Li >> Ar file
+append stdout (or file descriptor
+.Ar n )
+to
+.Ar file
+.It Oo Ar n Oc Ns Li < Ar file
+redirect stdin (or file descriptor
+.Ar n )
+from
+.Ar file
+.It Oo Ar n Oc Ns Li <> Ar file
+redirect stdin (or file descriptor
+.Ar n )
+to and from
+.Ar file
+.It Oo Ar n1 Oc Ns Li <& Ns Ar n2
+duplicate stdin (or file descriptor
+.Ar n1 )
+from file descriptor
+.Ar n2
+.It Oo Ar n Oc Ns Li <&-
+close stdin (or file descriptor
+.Ar n )
+.It Oo Ar n1 Oc Ns Li >& Ns Ar n2
+duplicate stdout (or file descriptor
+.Ar n1 )
+to file descriptor
+.Ar n2
+.It Oo Ar n Oc Ns Li >&-
+close stdout (or file descriptor
+.Ar n )
 .El
 .Pp
 The following redirection is often called a
 .Dq here-document .
-.Bd -literal -offset indent
-[n]<< delimiter
-	here-doc-text
-	...
-delimiter
+.Bd -unfilled -offset indent
+.Oo Ar n Oc Ns Li << Ar delimiter
+.D1 Ar here-doc-text
+.D1 ...
+.Ar delimiter
 .Ed
 .Pp
 All the text on successive lines up to the delimiter is
 saved away and made available to the command on standard
-input, or file descriptor n if it is specified.
-If the delimiter
-as specified on the initial line is quoted, then the here-doc-text
+input, or file descriptor
+.Ar n
+if it is specified.
+If the
+.Ar delimiter
+as specified on the initial line is quoted, then the
+.Ar here-doc-text
 is treated literally, otherwise the text is subjected to
 parameter expansion, command substitution, and arithmetic
 expansion (as described in the section on
@@ -554,7 +581,9 @@
 instead of
 .Dq Li << ,
 then leading tabs
-in the here-doc-text are stripped.
+in the
+.Ar here-doc-text
+are stripped.
 .Ss Search and Execution
 There are three types of commands: shell functions,
 built-in commands, and normal programs.
@@ -562,7 +591,9 @@
 The three types of commands are all executed in a different way.
 .Pp
 When a shell function is executed, all of the shell positional
-parameters (except $0, which remains unchanged) are
+parameters (except
+.Li $0 ,
+which remains unchanged) are
 set to the arguments of the shell function.
 The variables which are explicitly placed in the environment of
 the command (by placing assignments to them before the
@@ -583,11 +614,11 @@
 passing the arguments and the environment to the program.
 If the program is not a normal executable file
 (i.e., if it does not begin with the
-.Qq magic number
+.Dq "magic number"
 whose
 .Tn ASCII
 representation is
-.Qq #! ,
+.Dq Li #! ,
 resulting in an
 .Er ENOEXEC
 return value from
@@ -597,13 +628,16 @@
 so that the effect will be
 as if a new shell had been invoked to handle the ad-hoc shell script,
 except that the location of hashed commands located in
-the parent shell will be remembered by the child.
+the parent shell will be remembered by the child
+(see the description of the
+.Ic hash
+built-in command below).
 .Pp
 Note that previous versions of this document
 and the source code itself misleadingly and sporadically
 refer to a shell script without a magic number
 as a
-.Qq shell procedure .
+.Dq "shell procedure" .
 .Ss Path Search
 When locating a command, the shell first looks to see if
 it has a shell function by that name.
@@ -616,8 +650,9 @@
 Command names containing a slash are simply executed without
 performing any searches.
 .It
-The shell searches each entry in
+The shell searches each entry in the
 .Ev PATH
+environment variable
 in turn for the command.
 The value of the
 .Ev PATH
@@ -666,7 +701,8 @@
 that of the last simple command executed by the command.
 .Ss Pipelines
 A pipeline is a sequence of one or more commands separated
-by the control operator |.
+by the control operator
+.Ql \&| .
 The standard output of all but
 the last command is connected to the standard input
 of the next command.
@@ -675,10 +711,12 @@
 .Pp
 The format for a pipeline is:
 .Pp
-.Dl [!] command1 [ | command2 ...]
+.D1 Oo Li \&! Oc Ar command1 Op Li \&| Ar command2 ...
 .Pp
-The standard output of command1 is connected to the standard
-input of command2.
+The standard output of
+.Ar command1
+is connected to the standard input of
+.Ar command2 .
 The standard input, standard output, or
 both of a command is considered to be assigned by the
 pipeline before any redirection specified by redirection
@@ -704,22 +742,22 @@
 modified by redirection.
 For example:
 .Pp
-.Dl $ command1 2>&1 | command2
+.Dl "command1 2>&1 | command2"
 .Pp
 sends both the standard output and standard error of
-.Ql command1
+.Ar command1
 to the standard input of
-.Ql command2 .
+.Ar command2 .
 .Pp
 A
-.Dq Li \&;
+.Ql \&;
 or newline terminator causes the preceding
 AND-OR-list
 (described below in the section called
 .Sx Short-Circuit List Operators )
 to be executed sequentially;
 an
-.Dq Li &
+.Ql &
 causes asynchronous execution of the preceding AND-OR-list.
 .Pp
 Note that unlike some other shells,
@@ -738,12 +776,12 @@
 before executing the next command.
 .Pp
 The format for running a command in background is:
-.Bd -literal -offset indent
-command1 & [command2 & ...]
-.Ed
+.Pp
+.D1 Ar command1 Li & Op Ar command2 Li & Ar ...
 .Pp
 If the shell is not interactive, the standard input of an
-asynchronous command is set to /dev/null.
+asynchronous command is set to
+.Pa /dev/null .
 .Ss Lists (Generally Speaking)
 A list is a sequence of zero or more commands separated by
 newlines, semicolons, or ampersands,
@@ -773,22 +811,23 @@
 The syntax of the
 .Ic if
 command is:
-.\"
-.\" XXX Use .Dl to work around broken handling of .Ic inside .Bd and .Ed .
-.\"
-.Dl Ic if Ar list
-.Dl Ic then Ar list
-.Dl [ Ic elif Ar list
-.Dl Ic then Ar list ] ...
-.Dl [ Ic else Ar list ]
-.Dl Ic fi
+.Bd -unfilled -offset indent -compact
+.Ic if Ar list
+.Ic then Ar list
+.Oo Ic elif Ar list
+.Ic then Ar list Oc Ar ...
+.Op Ic else Ar list
+.Ic fi
+.Ed
 .Pp
 The syntax of the
 .Ic while
 command is:
-.Dl Ic while Ar list
-.Dl Ic do Ar list
-.Dl Ic done
+.Bd -unfilled -offset indent -compact
+.Ic while Ar list
+.Ic do Ar list
+.Ic done
+.Ed
 .Pp
 The two lists are executed repeatedly while the exit status of the
 first list is zero.
@@ -804,9 +843,11 @@
 The syntax of the
 .Ic for
 command is:
-.Dl Ic for Ar variable Op Ic in Ar word ...
-.Dl Ic do Ar list
-.Dl Ic done
+.Bd -unfilled -offset indent -compact
+.Ic for Ar variable Op Ic in Ar word ...
+.Ic do Ar list
+.Ic done
+.Ed
 .Pp
 If
 .Ic in
@@ -820,17 +861,17 @@
 and
 .Ic done
 commands may be replaced with
-.Dq Li {
+.Ql {
 and
-.Dq Li } .
+.Ql } .
 .Pp
 The syntax of the
 .Ic break
 and
 .Ic continue
 commands is:
-.Dl Ic break Op Ar num
-.Dl Ic continue Op Ar num
+.D1 Ic break Op Ar num
+.D1 Ic continue Op Ar num
 .Pp
 The
 .Ic break
@@ -848,18 +889,20 @@
 .Pp
 The syntax of the
 .Ic case
-command is
-.Dl Ic case Ar word Ic in
-.Dl pattern) list ;;
-.Dl ...
-.Dl Ic esac
+command is:
+.Bd -unfilled -offset indent -compact
+.Ic case Ar word Ic in
+.Ar pattern Ns Li ) Ar list Li ;;
+.Ar ...
+.Ic esac
+.Ed
 .Pp
 The pattern can actually be one or more patterns
 (see
 .Sx Shell Patterns
 described later),
 separated by
-.Dq Li \&|
+.Ql \&|
 characters.
 The exit code of the
 .Ic case
@@ -867,14 +910,12 @@
 zero if no patterns were matched.
 .Ss Grouping Commands Together
 Commands may be grouped by writing either
-.Bd -literal -offset indent
-(list)
-.Ed
+.Pp
+.D1 Li \&( Ns Ar list Ns Li \%)
 .Pp
 or
-.Bd -literal -offset indent
-{ list; }
-.Ed
+.Pp
+.D1 Li { Ar list Ns Li \&; }
 .Pp
 The first form executes the commands in a subshell.
 Note that built-in commands thus executed do not affect the current shell.
@@ -887,18 +928,21 @@
 .Ed
 .Ss Functions
 The syntax of a function definition is
-.Bd -literal -offset indent
-name ( ) command
-.Ed
+.Pp
+.D1 Ar name Li \&( \&) Ar command
 .Pp
 A function definition is an executable statement; when
-executed it installs a function named name and returns an
+executed it installs a function named
+.Ar name
+and returns an
 exit status of zero.
-The command is normally a list
+The
+.Ar command
+is normally a list
 enclosed between
-.Dq Li {
+.Ql {
 and
-.Dq Li } .
+.Ql } .
 .Pp
 Variables may be declared to be local to a function by
 using the
@@ -906,11 +950,8 @@
 command.
 This should appear as the first statement of a function,
 and the syntax is:
-.Bd -ragged -offset indent
-.Ic local
-.Op Ar variable ...
-.Op Fl
-.Ed
+.Pp
+.D1 Ic local Oo Ar variable ... Oc Op Fl
 .Pp
 The
 .Ic local
@@ -923,38 +964,38 @@
 Otherwise, the variable is initially unset.
 The shell
 uses dynamic scoping, so that if the variable
-.Em x
+.Va x
 is made local to function
 .Em f ,
 which then calls function
 .Em g ,
 references to the variable
-.Em x
+.Va x
 made inside
 .Em g
 will refer to the variable
-.Em x
+.Va x
 declared inside
 .Em f ,
 not to the global variable named
-.Em x .
+.Va x .
 .Pp
 The only special parameter that can be made local is
-.Dq Li - .
+.Ql - .
 Making
-.Dq Li -
+.Ql -
 local causes any shell options that are
-changed via the set command inside the function to be
+changed via the
+.Ic set
+command inside the function to be
 restored to their original values when the function
 returns.
 .Pp
 The syntax of the
 .Ic return
 command is
-.Bd -ragged -offset indent
-.Ic return
-.Op Ar exitstatus
-.Ed
+.Pp
+.D1 Ic return Op Ar exitstatus
 .Pp
 It terminates the current executional scope, returning from the previous
 nested function, sourced script, or shell instance, in that order.
@@ -969,9 +1010,8 @@
 the shell turns all the environment variables into shell
 variables.
 New variables can be set using the form
-.Bd -literal -offset indent
-name=value
-.Ed
+.Pp
+.D1 Ar name Ns = Ns Ar value
 .Pp
 Variables set by the user must have a name consisting solely
 of alphabetics, numerics, and underscores.
@@ -1001,12 +1041,10 @@
 the expansion occurs within a double-quoted string
 it expands to a single field with the value of each parameter
 separated by the first character of the
-.Ev IFS
+.Va IFS
 variable,
-or by a
-.Aq space
-if
-.Ev IFS
+or by a space if
+.Va IFS
 is unset.
 .It Li $@
 Expands to the positional parameters, starting from one.
@@ -1020,12 +1058,16 @@
 .Li @
 is double-quoted.
 What this basically means, for example, is
-if $1 is
-.Dq abc
-and $2 is
-.Dq def ghi ,
+if
+.Li $1
+is
+.Dq Li abc
+and
+.Li $2
+is
+.Dq Li "def ghi" ,
 then
-.Qq Li $@
+.Dq Li $@
 expands to
 the two arguments:
 .Bd -literal -offset indent
@@ -1033,18 +1075,22 @@
 .Ed
 .It Li $#
 Expands to the number of positional parameters.
-.It Li $\&?
+.It Li $?
 Expands to the exit status of the most recent pipeline.
 .It Li $-
 (hyphen) Expands to the current option flags (the single-letter
 option names concatenated into a string) as specified on
-invocation, by the set built-in command, or implicitly
+invocation, by the
+.Ic set
+built-in command, or implicitly
 by the shell.
 .It Li $$
 Expands to the process ID of the invoked shell.
 A subshell
-retains the same value of $ as its parent.
-.It Li $\&!
+retains the same value of
+.Va $
+as its parent.
+.It Li $!
 Expands to the process ID of the most recent background
 command executed from the current shell.
 For a
@@ -1067,7 +1113,7 @@
 fields from a single word.
 The single exception to this rule is
 the expansion of the special parameter
-.Li @
+.Va @
 within double-quotes,
 as was described above.
 .Pp
@@ -1079,7 +1125,7 @@
 .It
 Field Splitting is performed on fields generated by step (1)
 unless the
-.Ev IFS
+.Va IFS
 variable is null.
 .It
 Pathname Expansion (unless the
@@ -1090,7 +1136,7 @@
 .El
 .Pp
 The
-.Dq Li $
+.Ql $
 character is used to introduce parameter expansion, command
 substitution, or arithmetic evaluation.
 .Ss Tilde Expansion (substituting a user's home directory)
@@ -1103,30 +1149,34 @@
 or the end of the word are treated as a username
 and are replaced with the user's home directory.
 If the
-username is missing (as in ~/foobar), the tilde is replaced
-with the value of the HOME variable (the current user's
-home directory).
+username is missing (as in
+.Pa ~/foobar ) ,
+the tilde is replaced with the value of the
+.Ev HOME
+variable (the current user's home directory).
 .Ss Parameter Expansion
 The format for parameter expansion is as follows:
-.Bd -literal -offset indent
-${expression}
-.Ed
+.Pp
+.D1 Li ${ Ns Ar expression Ns Li }
 .Pp
-where expression consists of all characters until the matching
-.Dq Li } .
+where
+.Ar expression
+consists of all characters until the matching
+.Ql } .
 Any
-.Dq Li }
+.Ql }
 escaped by a backslash or within a quoted string, and characters in
 embedded arithmetic expansions, command substitutions, and variable
 expansions, are not examined in determining the matching
-.Dq Li } .
+.Ql } .
 .Pp
 The simplest form for parameter expansion is:
-.Bd -literal -offset indent
-${parameter}
-.Ed
+.Pp
+.D1 Li ${ Ns Ar parameter Ns Li }
 .Pp
-The value, if any, of parameter is substituted.
+The value, if any, of
+.Ar parameter
+is substituted.
 .Pp
 The parameter name or symbol can be enclosed in braces, which are
 optional except for positional parameters with more than one digit or
@@ -1140,57 +1190,71 @@
 .It
 Field splitting is not performed on the results of the
 expansion, with the exception of the special parameter
-.Li @ .
+.Va @ .
 .El
 .Pp
 In addition, a parameter expansion can be modified by using one of the
 following formats.
 .Bl -tag -width indent
-.It Li ${parameter:-word}
+.It Li ${ Ns Ar parameter Ns Li :- Ns Ar word Ns Li }
 Use Default Values.
-If parameter is unset or
-null, the expansion of word is
-substituted; otherwise, the value of
-parameter is substituted.
-.It Li ${parameter:=word}
+If
+.Ar parameter
+is unset or null, the expansion of
+.Ar word
+is substituted; otherwise, the value of
+.Ar parameter
+is substituted.
+.It Li ${ Ns Ar parameter Ns Li := Ns Ar word Ns Li }
 Assign Default Values.
-If parameter is unset
-or null, the expansion of word is
-assigned to parameter.
+If
+.Ar parameter
+is unset or null, the expansion of
+.Ar word
+is assigned to

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu Dec  6 05:06:46 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DA4E516A41A; Thu,  6 Dec 2007 05:06: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 81A4316A418
	for ; Thu,  6 Dec 2007 05:06:45 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 55B7713C455
	for ; Thu,  6 Dec 2007 05:06:45 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB656iNI046147
	for ; Thu, 6 Dec 2007 05:06:44 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB656icB046144
	for perforce@freebsd.org; Thu, 6 Dec 2007 05:06:44 GMT
	(envelope-from kmacy@freebsd.org)
Date: Thu, 6 Dec 2007 05:06:44 GMT
Message-Id: <200712060506.lB656icB046144@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130313 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 06 Dec 2007 05:06:46 -0000

http://perforce.freebsd.org/chv.cgi?CH=130313

Change 130313 by kmacy@entropy_kmacy_xen31 on 2007/12/06 05:06:21

	remaining fixes to make pmap.c and locore.s compile

Affected files ...

.. //depot/projects/xen31/sys/i386/include/pmap.h#5 edit
.. //depot/projects/xen31/sys/i386/xen/locore.s#2 edit
.. //depot/projects/xen31/sys/i386/xen/pmap.c#3 edit

Differences ...

==== //depot/projects/xen31/sys/i386/include/pmap.h#5 (text+ko) ====

@@ -249,6 +249,7 @@
 }
 
 #define	pte_store(ptep, pte)	pte_load_store((ptep), (pt_entry_t)pte)
+#define	pte_clear(ptep)	pte_load_store((ptep), (pt_entry_t)0ULL)
 
 #else
 /*

==== //depot/projects/xen31/sys/i386/xen/locore.s#2 (text+ko) ====

@@ -83,16 +83,6 @@
 	.set	PTD,PTmap + (PTDPTDI * PAGE_SIZE)
 	.set	PTDpde,PTD + (PTDPTDI * PDESIZE)
 
-#ifdef SMP
-/*
- * Define layout of per-cpu address space.
- * This is "constructed" in locore.s on the BSP and in mp_machdep.c
- * for each AP.  DO NOT REORDER THESE WITHOUT UPDATING THE REST!
- */
-	.globl	SMP_prvspace
-	.set	SMP_prvspace,(MPPTDI << PDRSHIFT)
-#endif /* SMP */
-
 /*
  * Compiled KERNBASE location and the kernel load address
  */

==== //depot/projects/xen31/sys/i386/xen/pmap.c#3 (text+ko) ====

@@ -1394,13 +1394,16 @@
 	/*
 	 * allocate the page directory page(s)
 	 */
-	for (i = 0; i < NPGPTD;) {
+	for (i = 0; i < npgptd;) {
 		m = vm_page_alloc(NULL, color++,
 		    VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ | VM_ALLOC_WIRED |
 		    VM_ALLOC_ZERO);
 		if (m == NULL)
 			VM_WAIT;
 		else {
+#ifdef XEN
+		        pmap_zero_page(m); /* is this really needed? */
+#endif
 			ptdpg[i++] = m;
 		}
 	}
@@ -1416,7 +1419,7 @@
 	LIST_INSERT_HEAD(&allpmaps, pmap, pm_list);
 	mtx_unlock_spin(&allpmaps_lock);
 	/* Wire in kernel global address entries. */
-	/* XXX copies current process, does not fill in MPPTDI */
+	/* XXX copies current process */
 	bcopy(kernel_pmap->pm_pdir + KPTDI, pmap->pm_pdir + KPTDI, 
 	       nkpt * sizeof(pd_entry_t));
 	/* XXX need to copy global address entries to page directory's L1 shadow */
@@ -1429,10 +1432,6 @@
 		xen_pt_pin(ma);
 	}
 
-#ifdef SMP
-	pmap->pm_pdir[MPPTDI] = kernel_pmap->pm_pdir[MPPTDI];
-#endif
-
 	/* pin and install L1 shadow */
 	for (i = 0; i < NPGPTD; i++) {
 		ma = xpmap_ptom(VM_PAGE_TO_PHYS(ptdpg[i]));
@@ -1692,9 +1691,6 @@
 	
 	bzero(pmap->pm_pdir + PTDPTDI, (nkpt + NPGPTD) *
 	    sizeof(*pmap->pm_pdir));
-#ifdef SMP
-	PD_CLEAR_VA(pmap, &pmap->pm_pdir[MPPTDI], FALSE);
-#endif
 
 	pmap_qremove((vm_offset_t)pmap->pm_pdir, NPGPTD);
 
@@ -3778,7 +3774,7 @@
 		opte = PT_GET(pte);
 		npte = opte & ~(PG_PTE_PAT | PG_NC_PCD | PG_NC_PWT);
 		npte |= pmap_cache_bits(mode, 0);
-		PD_SET(tmpva, npte, FALSE);
+		PT_SET_VA(tmpva, npte, FALSE);
 #endif
 		tmpva += PAGE_SIZE;
 		size -= PAGE_SIZE;

From owner-p4-projects@FreeBSD.ORG  Thu Dec  6 05:53:36 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4FA2F16A473; Thu,  6 Dec 2007 05:53: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 D217516A417
	for ; Thu,  6 Dec 2007 05:53:35 +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 BC8AC13C467
	for ; Thu,  6 Dec 2007 05:53:35 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB65rZU8053267
	for ; Thu, 6 Dec 2007 05:53:35 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB65rZLM053264
	for perforce@freebsd.org; Thu, 6 Dec 2007 05:53:35 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Thu, 6 Dec 2007 05:53:35 GMT
Message-Id: <200712060553.lB65rZLM053264@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 130318 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 06 Dec 2007 05:53:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=130318

Change 130318 by pgj@disznohal on 2007/12/06 05:52:59

	Add initial Hungarian translation of Chapter 7: Multimedia.

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/multimedia/chapter.sgml#2 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/multimedia/chapter.sgml#2 (text+ko) ====

@@ -4,104 +4,144 @@
      $FreeBSD: doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.128 2007/08/09 09:09:26 blackend Exp $
 -->
 
-
+
+
+
  
   
    
     Ross
     Lippert
-    Edited by 
+    Szerkesztette: 
    
   
  
 
- Multimedia
+ Multimédia
   
-  Synopsis
+  Áttekintés
 
-    FreeBSD supports a wide variety of sound cards, allowing you
-      to enjoy high fidelity output from your computer.  This includes
-      the ability to record and playback audio in the MPEG Audio Layer
-      3 (MP3), WAV, and Ogg Vorbis formats as well as many other
-      formats.  The FreeBSD Ports Collection also contains
-      applications allowing you to edit your recorded audio, add sound
-      effects, and control attached MIDI devices.
+    A &os; a hangkártyák széles
+      választékát ismeri, ami által
+      képesek vagyunk
+      számítógépünkkel hi-fi
+      minõségû hangzást létrehozni.
+      Ennek részeként tudunk rögzíteni
+      és visszajátszani többek közt MPEG Audio
+      Layer 3 (MP3), WAV és Ogg Vorbis formátumokban.  A
+      &os; Portgyûjteménye ezenkívül tartalmaz
+      még olyan alkalmazásokat is, amelyekkel szerkeszteni
+      lehet a felvett hangokat, effekteket hozzátenni és
+      vezérelni a hangkártyánkhoz csatlakoztatott
+      MIDI eszközöket.
 
-    With some experimentation, &os; can support
-      playback of video files and DVD's.  The number of applications
-      to encode, convert, and playback various video media is more
-      limited than the number of sound applications.  For example as
-      of this writing, there is no good re-encoding application in the
-      FreeBSD Ports Collection that could be used to convert
-      between formats, as there is with audio/sox.  However, the software
-      landscape in this area is changing rapidly.
+    Némi kísérletezéssel a &os;
+      még videóállományok és DVD-k
+      lejátszására is rávehetõ.  A
+      különféle videóanyagok
+      kódolására,
+      konvertálására és
+      visszajátszására alkalmas programok
+      száma azonban jóval kisebb, mint a hanganyagok
+      esetén.  Például az írás
+      pillanatában nincs a &os;
+      Portgyûjteményében a formátumok
+      közti konvertálásra alkalmas, a videókat
+      olyan jól újrakódolni tudó
+      alkalmazás, amilyen az audio esetén az audio/sox.  Azonban ezen a
+      területen a szoftverek palettája gyorsan
+      változik.
 
-    This chapter will describe the necessary steps to configure
-      your sound card.  The configuration and installation of X11
-      () has already taken care of the
-      hardware issues for your video card, though there may be some
-      tweaks to apply for better playback.
+    Ebben a fejezetben bemutatjuk a hangkártyánk
+      beállításához szükséges
+      lépéseket.  Az X11 telepítése
+      és beállítása ()
+      során ugyan már intéztük a
+      videókártyánkkal kapcsolatos hardveres
+      problémákat, azonban a jobb
+      visszajátszás érdekében további
+      cselfogásokat is be kell majd vetnünk.
 
-    After reading this chapter, you will know:
+    A fejezet elolvasása során
+      megismerjük:
 
     
       
-        How to configure your system so that your sound card is
-          recognized.
+	hogyan állítsuk be úgy a
+	  rendszerünket, hogy felismerje a
+	  hangkártyánkat
       
 
       
-        Methods to test whether your card is working.
+	hogyan bizonyosodjuk meg róla, hogy a
+	  kártyánk mûködik
       
 
       
-        How to troubleshoot your sound setup.
+	hogyan oldjuk meg a hangkártya
+	  beállítása során felmerülõ
+	  problémákat
       
 
       
-        How to playback and encode MP3s and other audio.
+	hogyan játsszunk le és kódoljunk
+	  MP3-at vagy más egyéb hangformátumot
       
 
       
-        How video is supported by the X server.
+	hogyan támogatja a videókat az X
+	  szerver
       
 
       
-        Some video player/encoder ports which give good results.
+	hogyan adnak az egyes
+	  lejátszók/kódolók még jobb
+	  eredményt
       
 
       
-        How to playback DVD's, .mpg and
-          .avi files.
+	hogyan játsszunk le DVD-ket,
+	  .mpg és .avi
+	  állományokat
       
 
       
-        How to rip CD and DVD content into files.
+	hogyan mentsük a CD-k és DVD-k
+	  tartalmát állományokba
       
 
       
-	How to configure a TV card.
+	hogyan állítsuk be a TV
+	  kártyánkat
       
 
       
-	How to configure an image scanner.
+	hogyan állítsuk be egy
+	  képbeolvasót
       
     
 
-    Before reading this chapter, you should:
+    A fejezet elolvasásához ajánlott:
 
     
-      Know how to configure and install a new kernel ().
+      
+	egy új rendszermag
+	  beállításának és
+	  telepítésének ismerete ()
     
 
     
-      Trying to mount audio CDs
-        with the &man.mount.8; command will
-        result in an error, at least, and a kernel
-        panic, at worst.  These media have specialized
-        encodings which differ from the usual ISO-filesystem.
+      Ha zenei CD-ket próbálunk meg a &man.mount.8;
+	paranccsal csatlakoztatni, akkor hibákat, vagy a
+	legrosszabb esetben akár teljes
+	rendszerösszeomlást kaphatunk.  Az ilyen
+	típusú lemezeknek az ISO szabványú
+	állományrendszerekétõl
+	eltérõ kódolása van.
     
 
   
@@ -112,120 +152,162 @@
         
 	 Moses
 	 Moore
-	 Contributed by 
-	 
+	 Írta: 
         
       
       
         
 	 Marc
 	 Fonvieille
-	 Enhanced for &os; 5.X by 
-	 
+	 A &os; 5.X verziójára
+	  továbbvitte: 
         
       
     
 
-    Setting Up the Sound Card
-    
+    A hangkártya beállítása
+
   
-    Configuring the System
+    A rendszer beállítása
 
     PCI
     ISA
-    sound cards
-    Before you begin, you should know the model of the card you
-      have, the chip it uses, and whether it is a PCI or ISA card.
-      FreeBSD supports a wide variety of both PCI and ISA cards.
-      Check the supported audio devices list of the Hardware Notes to see if
-      your card is supported.  The Hardware Notes will also mention which
-      driver supports your card.
+    hangkártya
+    A mûvelet megkezdése elõtt ki kell
+      derítenünk, milyen típusú
+      hangkártyánk van, milyen chip van rajta, PCI vagy
+      ISA buszon csatlakozik-e.  A &os; egyaránt rengeteg PCI
+      és ISA buszos kártyát ismer.  A
+      sajátunk beazonosításához a
+      támogatott hangeszközök listáját a
+      Hardware Notes
+      (Hardverjegyzék) oldalán találhatjuk meg.
+      Ebbõl a jegyzékbõl mellesleg azt is megtudhatjuk,
+      hogy melyik meghajtó kezeli a
+      kártyánkat.
 
     
-      kernel
-      configuration
+      rendszermag
+      beállítás
     
 
-    To use your sound device, you will need to load the proper
-      device driver.  This may be accomplished in one of two ways.
-      The easiest way is to simply load a kernel module for your sound
-      card with &man.kldload.8; which can either be done from the
-      command line:
+    A hangeszközünk használatához be kell
+      töltenünk a neki megfelelõ meghajtót.  Ez
+      két módon is megtehetõ.  Ezek közül
+      az a legkönnyebb, ha a &man.kldload.8; paranccsal
+      egyszerûen betöltjük a rendszermag
+      hangkártyánkhoz tartozó modulját.  Ezt
+      megtehetjük közvetlenül
+      parancssorból:
 
     &prompt.root; kldload snd_emu10k1
 
-    or by adding the appropriate line to the file
-      /boot/loader.conf like this:
+    vagy a /boot/loader.conf
+      állományból az alábbihoz hasonló
+      sor hozzáadásával:
 
     snd_emu10k1_load="YES"
 
-    These examples are for a Creative &soundblaster; Live! sound
-      card.  Other available loadable sound modules are listed in
-      /boot/defaults/loader.conf.
-      If you are not sure which driver to use, you may try to load
-      the snd_driver module:
+    A fenti példák a Creative &soundblaster; Live!
+      hangkártyára vonatkoznak.  A többi
+      betölthetõ hangkártya modul felsorolása a
+      /boot/defaults/loader.conf
+      állományban található.  Ha nem vagyunk
+      benne biztosak, hogy melyik meghajtót is akarjuk pontosan
+      használni, akkor próbálkozzunk az
+      snd_driver modul
+      betöltésével:
 
     &prompt.root; kldload snd_driver
 
-    This is a metadriver loading the most common device drivers
-      at once.  This speeds up the search for the correct driver.  It
-      is also possible to load all sound drivers via the
-      /boot/loader.conf facility.
+    Ez egy olyan álmeghajtó, ami egyszerre
+      betölti az összes érintett
+      eszközmeghajtót, és
+      segítségével felgyorsíthatjuk a
+      megfelelõ meghajtó megtalálását.
+      A /boot/loader.conf
+      használatával is be tudjuk ugyanígy
+      tölteni az összes meghajtót.
 
-    If you wish to find out the driver selected for your
-      soundcard after loading the snd_driver
-      metadriver, you may check the /dev/sndstat
-      file with the cat /dev/sndstat
-      command.
+    Az snd_driver álmeghajtó
+      betöltése után úgy kereshetjük meg a
+      ténylegesen használatban levõ meghajtót,
+      ha megnézzük a /dev/sndstat
+      állományt a cat /dev/sndstat
+      paranccsal.
 
-    A second method is to statically
-      compile in support for your sound card in your kernel.  The
-      section below provides the information you need to add support
-      for your hardware in this manner.  For more information about
-      recompiling your kernel, please see .
+    A második módszer szerint a
+      hangkártyánk támogatását
+      statikusan beépítjük a rendszermagba.  A lentebb
+      található szakaszban olvashatjuk mindazok az
+      információkat, amikre szükségünk
+      lehet ennek elvégzésése közben.  A
+      rendszermag újrafordításával
+      kapcsolatban forduljunk a hez.
 
     
-      Configuring a Custom Kernel with Sound Support
+      A hangkártya támogatásával
+	rendelkezõ saját rendszermag
+	összeállítása
 
-      The first thing to do is add the audio framework driver
-	&man.sound.4; to the kernel; for that you will need to
-	add the following line to the kernel configuration file:
+      Elsõként hozzá kell adnunk a
+	rendszermaghoz a hangeszközök
+	alapmeghajtóját, a &man.sound.4; eszközt.
+	Ezt a rendszermag beállításait
+	tartalmazó állományban az alábbi sor
+	felvételével tehetjük meg:
 
       device sound
 
-      Next, you have to add the support for your sound card.
-	Therefore, you need to know which driver supports the card.
-	Check the supported audio devices list of the Hardware Notes, to
-	determine the correct driver for your sound card.  For
-	example, a Creative &soundblaster; Live! sound card is
-	supported by the &man.snd.emu10k1.4; driver.  To add the support
-	for this card, use the following:
+      Ezután tegyük még hozzá a
+	hangkártyánkhoz kapcsolódó
+	támogatást is.  Ehhez viszont pontosan tudunk
+	kell, melyik meghajtó képes mûködtetni a
+	kártyát.  A hangkártyához
+	tartozó meghajtót a Hardware Notes
+	(Hardverjegyzék)-ben található
+	eszközök listájából
+	deríthetjük ki.  Például a Creative
+	&soundblaster; Live!  hangkártyát a
+	&man.snd.emu10k1.4; meghajtó kezeli.  Ennek a
+	hangkártyának a támogatását
+	az alábbi sorral állíthatjuk be:
 
       device snd_emu10k1
 
-      Be sure to read the manual page of the driver for the
-	syntax to use.  The explicit syntax for the kernel configuration
-	of every supported sound driver can also be found in the
-	/usr/src/sys/conf/NOTES file.
+      Az itt használatos szintaxist a meghajtó man
+	oldalának átolvasásából
+	tudhatjuk meg.  Azonban az összes támogatott
+	hangkártya meghajtó kifejtett szintaxisa
+	megtalálható a
+	/usr/src/sys/conf/NOTES
+	állományban is.
 
-      Non-PnP ISA sound cards may require you to provide the kernel
-	with information on the card settings (IRQ, I/O port,
-	etc), as is true of all non-PnP ISA cards.  This is done via the
-	/boot/device.hints file.  During the boot process,
-	the &man.loader.8; will read this file and pass the settings
-	to the kernel.  For example, an old
-	Creative &soundblaster; 16 ISA non-PnP card will use the
-	&man.snd.sbc.4; driver in conjunction with snd_sb16.  For this card the following lines must be added to
-	the kernel configuration file:
+      A PnP (Plug n Play)-t nem ismerõ ISA
+	kártyák esetén az összes többi nem
+	PnP-s ISA kártyához hasonlóan
+	szükséges lehet a rendszermag számára
+	megadnunk a kártya hardveres
+	beállításait (IRQ, I/O port stb).  Ezt a
+	/boot/device.hints állományon
+	keresztül tehetjük meg.  A
+	rendszerindítási folyamat során a
+	&man.loader.8; beolvassa ezt az állományt majd
+	átadja a benne szereplõ információkat
+	a rendszermagnak.  Például a Creative
+	&soundblaster; 16, nem PnP-s ISA kártya az
+	snd_sb16 meghajtóval együtt az
+	&man.snd.sbc.4; meghajtót használja.  A
+	kártya használatához a rendszermag
+	beállításait tartalmazó
+	állományba ezeket a sorokat kell megadni:
 
       device snd_sbc
 device snd_sb16
 
-      and these to
-	/boot/device.hints:
+      valamint a /boot/device.hints
+	állományba ezeket:
 
       hint.sbc.0.at="isa"
 hint.sbc.0.port="0x220"
@@ -233,34 +315,44 @@
 hint.sbc.0.drq="1"
 hint.sbc.0.flags="0x15"
 
-      In this case, the card uses the 0x220
-	I/O port and the IRQ 5.
+      Ekkor a kártya a 0x220 I/O portot
+	és 5 IRQ-t használja.
 
-      The syntax used in the
-	/boot/device.hints file is covered in the
-	&man.sound.4; driver manual page and the manual page
-	for the driver in question.
+      A /boot/device.hints
+	állományban alkalmazott szintaxisról
+	bõvebben a &man.sound.4;, valamint a kérdéses
+	meghajtó man oldalán
+	tájékozódhatunk.
 
-      The settings shown above are the defaults.  In some
-	cases, you may need to change the IRQ or the other settings to
-	match your card.  See the &man.snd.sbc.4; manual page for more
-	information about this card.
+      A fentiekben bemutatott beállítások
+	alapértelmezettek, néhány esetben azonban a
+	kártyánknak megfelelõen meg kell
+	változtatnunk az IRQ és egyéb
+	értékeket.  Errõl a
+	kártyáról konkrétan a
+	&man.snd.sbc.4; man oldalon olvashatunk
+	részletesebben.
     
   
 
   
-    Testing the Sound Card
+    A hangkártya kipróbálása
 
-    After rebooting with the modified kernel, or after loading
-      the required module, the sound card should appear in your system
-      message buffer (&man.dmesg.8;) as something like:
+    Miután újraindítottuk a
+      számítógépünket a
+      módosított rendszermaggal, vagy miután
+      betöltöttük a szükséges modult, a
+      hangkártyának valahogy így kell megjelennie a
+      rendszerünk üzenetpufferében
+      (&man.dmesg.8;):
 
     pcm0: <Intel ICH3 (82801CA)> port 0xdc80-0xdcbf,0xd800-0xd8ff irq 5 at device 31.5 on pci0
 pcm0: [GIANT-LOCKED]
 pcm0: <Cirrus Logic CS4205 AC97 Codec>
 
-    The status of the sound card may be checked via the
-      /dev/sndstat file:
+    A hangkártyánk állapota a
+      /dev/sndstat állományon
+      keresztül ellenõrizhetõ:
 
     &prompt.root; cat /dev/sndstat
 FreeBSD Audio Driver (newpcm)
@@ -268,84 +360,107 @@
 pcm0: <Intel ICH3 (82801CA)> at io 0xd800, 0xdc80 irq 5 bufsz 16384
 kld snd_ich (1p/2r/0v channels duplex default)
 
-    The output from your system may vary.  If no
-      pcm devices are listed, go back and review
-      what was done earlier.  Go through your kernel
-      configuration file again and make sure the correct
-      device driver was chosen.  Common problems are listed in .
+    Ez a kiírás rendszerünként
+      eltérhet.  Ha nem látunk semmilyen
+      pcm0 eszközt, akkor menjünk
+      vissza és nézzük át újra,
+      pontosan mit is csináltunk.  Vizsgáljuk át a
+      rendszermagunk beállításait tartalmazó
+      állományt és gyõzõdjünk meg
+      róla, hogy a megfelelõ meghajtót adtuk meg.  Az
+      itt gyakorta felbukkanó gondokkal a  foglalkozik.
 
-    If all goes well, you should now have a functioning sound
-      card.  If your CD-ROM or DVD-ROM drive's audio-out pins are properly connected to
-      your sound card, you can put a CD in the drive and play it
-      with &man.cdcontrol.1;:
+    Azonban ha minden remekül haladt, akkor most már
+      van egy mûködõ hangkártyánk.  Ha
+      rendesen összekapcsoltuk hangkártyánkat a CD-
+      vagy DVD-meghajtónk audio csatlakozásával,
+      akkor tegyünk egy CD-t a meghajtóba és
+      kezdjük el játszani a &man.cdcontrol.1;
+      paranccsal:
 
       &prompt.user; cdcontrol -f /dev/acd0 play 1
 
-    Various applications, such as audio/workman can provide a friendlier
-      interface.  You may want to install an application such as
-      audio/mpg123 to listen to
-      MP3 audio files.
+    Az olyan alkalmazások, mint mondjuk a audio/workman, ehhez egy sokkalta
+      barátságosabb felületet nyújtanak.  Az
+      MP3 formátumú állományok
+      meghallgatásához pedig minden bizonnyal jól
+      fog egy olyan alkalmazás is, mint mondjuk a audio/mpg123.
 
-    Another quick way to test the card is sending data
-      to /dev/dsp, like this:
+    A kártyát úgy is tesztelhetjük, ha
+      az alábbihoz hasonló módon adatokat
+      küldünk a /dev/dsp
+      állományba:
 
-    &prompt.user; cat filename > /dev/dsp
+    &prompt.user; cat állománynév > /dev/dsp
 
-    where filename can be any file.
-      This command line should produce some noise, confirming the
-      sound card is actually working.
+    ahol az
+      állománynév
+      tetszõleges állomány neve lehet.  A parancs
+      hatására valamilyen zajt kell hallanunk, és
+      ez egyben meg is erõsíti, hogy a
+      hangkártyánk mûködik.
 
-    Sound card mixer levels can be changed via the &man.mixer.8;
-      command.  More details can be found in the &man.mixer.8; manual
-      page.
+    A hangkártyánk csatornáinak
+      jellemzõit a &man.mixer.8; paranccsal
+      állíthatjuk.  Errõl további
+      részleteket a &man.mixer.8; man oldalon olvashatunk.
 
     
-      Common Problems
+      Gyakori problémák
 
-      device nodes
+      eszközleíró
       I/O port
       IRQ
       DSP
 
-      
-         
-  	  
+	
+	 
+	  
 	    
-	     Error
-	      Solution
+	     Hiba
+	      Megoldás
 	    
-          
+	  
 
 	  
-            
-              sb_dspwr(XX) timed out
-              The I/O port is not set correctly.
-            
+	    
+	      sb_dspwr(XX) timed out
+	      Nem állítottuk be jól az I/O
+		portot.
+	    
 
-            
-              bad irq XX
-	      The IRQ is set incorrectly.  Make sure that
-  	        the set IRQ and the sound IRQ are the same.
-            
+	    
+	      bad irq XX
+	      Nem állítottuk be jól az IRQ
+		értékét.  Gondoskodjunk róla,
+		hogy a beállított érték
+		megegyezik a
+		hangkártyánkéval.
+	    
 
-            
-              xxx: gus pcm not attached, out of memory
-              There is not enough available memory to use
-                the device.
-            
+	    
+	      xxx: gus pcm not attached, out of
+		memory
+	      Nincs elég memória az eszköz
+		használatához.
+	    
 
-            
-              xxx: can't open /dev/dsp!
-              Check with fstat | grep dsp
-                if another application is holding the device open.
-                Noteworthy troublemakers are esound and KDE's sound
-                support.
-            
-          
-        
-      
+	    
+	      xxx: can't open /dev/dsp!
+	      A fstat | grep dsp parancs
+		kiadásával ellenõrizzük, hogy
+		valamelyik alkalmazás használja-e
+		már az eszközt.  Gyakori bajkeverõk az
+		esound és a
+		KDE
+		hangtámogatása.
+	    
+	  
+	
+	
     
   
 
@@ -355,55 +470,83 @@
       
        Munish
        Chopra
-       Contributed by 
+       Írta: 
       
      
     
-    Utilizing Multiple Sound Sources
+    Több hangforrás
+      kihasználása
+
+    Gyakorta szükségünk lehet több
+      hangforrás egyidejû használatára,
+      fõleg olyankor, amikor az esound
+      vagy az artsd bizonyos
+      alkalmazásokkal nem hajlandó megosztani a
+      hangeszközt.
 
-    It is often desirable to have multiple sources of sound that
-      are able to play simultaneously, such as when
-      esound or
-      artsd do not support sharing of the
-      sound device with a certain application.
+    A &os; ezt a virtuális
+      hangcsatornák használatával oldja
+      meg, melyet a &man.sysctl.8; eszközön keresztül
+      tudunk engedélyezni.  A virtuális csatornák a
+      hangok rendszermagban történõ
+      keverésével képesek
+      megtöbbszörözni a hangkártyánk
+      által egyszerre játsztható hangok
+      számát.
 
-    FreeBSD lets you do this through Virtual Sound
-      Channels, which can be enabled with the &man.sysctl.8;
-      facility.  Virtual channels allow you to multiplex your sound
-      card's playback by mixing sound in the kernel.
+    A virtuális csatornák számának
+      beállításához a sysctl két
+      paraméterét kell módosítanunk, amelyet
+      root felhasználóként
+      így tehetünk meg:
 
-    To set the number of virtual channels, there are two sysctl
-      knobs which, if you are the root user, can
-      be set like this:
     &prompt.root; sysctl hw.snd.pcm0.vchans=4
 &prompt.root; sysctl hw.snd.maxautovchans=4
 
-    The above example allocates four virtual channels, which is a
-      practical number for everyday use.  hw.snd.pcm0.vchans
-      is the number of virtual channels pcm0 has, and is configurable
-      once a device has been attached.
-      hw.snd.maxautovchans is the number of virtual channels
-      a new audio device is given when it is attached using
-      &man.kldload.8;.  Since the pcm module
-      can be loaded independently of the hardware drivers,
-      hw.snd.maxautovchans can store how many
-      virtual channels any devices which are attached later will be
-      given.
+    A fenti példa négy virtuális
+      csatornát hoz létre, ami egészen jellemzõ
+      a mindennapi használatban.  A
+      hw.snd.pcm0.vchans
+      pcm0 virtuális csatornáinak
+      számát adja meg, amelyet az eszköz
+      csatlakoztatása után tudunk
+      beállítani.  A
+      hw.snd.maxautovchans az új
+      eszközhöz tartozó virtuális
+      csatornákat adja meg, amely &man.kldload.8; paranccsal
+      történõ csatlakoztatásakor
+      állítódik be.  Mivel a
+      pcm modul a többi
+      eszközmeghajtótól függetlenül
+      töltõdik be, ezért a
+      hw.snd.maxautovchans azt tárolja, hogy a
+      késõbb hozzá csatlakozó
+      eszközök mennyi virtuális csatornát fognak
+      majd kapni.
 
     
-      You cannot change the number of virtual channels for a
-	device while it is in use.  First close any programs using the
-	device, such as music players or sound daemons.
+      A használatban levõ eszközöknél
+	nem tudjuk megváltoztatni a virtuális
+	csatornák számát.  Ehhez elõször
+	le kell állítanunk az eszközt
+	használó összes programot, tehát a
+	zenelejátszókat és
+	hangdémonokat.
     
 
-    If you are not using &man.devfs.5;, you will have to point
-      your applications at
-      /dev/dsp0.x,
-      where x is 0 to 3 if
-      hw.snd.pcm.0.vchans is set to 4 as in the
-      above example.  On a system using &man.devfs.5;, the above will
-      automatically be allocated transparently to a program
-      that requests /dev/dsp0.
+    Amennyiben nem használjuk a &man.devfs.5;-t, az
+      összes alkalmazásnak a
+      /dev/dsp0.x
+      eszközre kell mutatnia, ahol a x
+      értéke 0-tól 3-ig terjedhet attól
+      függõen, hogy a hw.snd.pcm.0.vchans
+      értékét a fenti példához
+      hasonlóan 4-re állítottuk-e.  A
+      &man.devfs.5;-t használó rendszerek esetén ez
+      a folyamat automatikusan lezajlik, tehát az összes
+      /dev/dsp eszközre irányuló
+      kérés magától
+      átirányítódik.
    
 
   
@@ -412,26 +555,33 @@
 	
 	  Josef
 	  El-Rayes
-	  Contributed by 
+	  Írta: 
 	
       
     
 
-    Setting Default Values for Mixer Channels
+    A keverõ alapértelmezett értékeinek
+      beállítása
 
-    The default values for the different mixer channels are
-      hardcoded in the sourcecode of the &man.pcm.4; driver.  There are
-      many different applications and daemons that allow
-      you to set values for the mixer that are remembered between
-      invocations, but this is not a clean solution.  It is possible
-      to set default mixer values at the driver level — this
-      is accomplished by defining the appropriate
-      values in /boot/device.hints, e.g.:
+    A keverõben megjelenõ különbözõ
+      csatornák alapértékei a &man.pcm.4;
+      meghajtó forráskódjában huzalozottan
+      találhatóak meg.  Számos alkalmazás
+      és démon segít két hívás
+      közt megõrizni a keverõben beállított
+      értékeket, azonban ez nem teljesen egy tiszta
+      megoldás.  A meghajtó szintjén is be tudjuk
+      állítani a keverõ alapértékeit
+      — ezt a /boot/device.hints
+      állomány megfelelõ
+      módosításával érhetjük el,
+      pl.:
 
 hint.pcm.0.vol="50"
 
-    This will set the volume channel to a default value of
-      50 when the &man.pcm.4; module is loaded.
+    Ezzel a &man.pcm.4; modul betöltése során a
+      hangerõ (volume) csatorna alapértelmezett
+      értéket 50-re állítjuk.
   
 
 
@@ -441,44 +591,60 @@
 	
 	  Chern
 	  Lee
-	  Contributed by 
+	  Írta: 
 	
       
-      
     
 
     MP3 Audio
 
-    MP3 (MPEG Layer 3 Audio) accomplishes near CD-quality sound,
-      leaving no reason to let your FreeBSD workstation fall short of
-      its offerings.
+    Az MP3 (MPEG Layer 3 Audio) használatával
+      közel CD minõségû hangot lehet elérni,
+      ezért a mi &os; munkaállomásunk sem maradhat
+      ki elõnyeinek élvezetébõl.
 
     
-      MP3 Players
+      MP3 lejátszók
 
-      By far, the most popular X11 MP3 player is
-	XMMS (X Multimedia System).  
-	Winamp
-	skins can be used with XMMS since the
-	GUI is almost identical to that of Nullsoft's 
-	Winamp.
-	XMMS also has native plug-in
-	support.
+      Az XMMS (X Multimedia System)
+	kiemelkedõen a legnépszerûbb X11-es MP3
+	lejátszó.  Mivel az
+	XMMS grafikus
+	felhasználói felülete szinte teljesen
+	megegyezik a Nullsoft
+	Winampjának
+	felületével, ezért még a
+	Winamp skinjeit is
+	használhatjuk vele.  Az
+	XMMS-ben ezenkívül
+	még a natív bõvítmények
+	támogatását is
+	megtalálhatjuk.
 
-      XMMS can be installed from the
-	multimedia/xmms port or package.
+      Az XMMS a multimedia/xmms portból vagy
+	csomagból telepíthetõ.
 
-      XMMS's interface is intuitive,
-	with a playlist, graphic equalizer, and more.  Those familiar
-	with Winamp will find
-	XMMS simple to use.
+      Az XMMS
+	használatára könnyû
+	ráérezni, megtaláljuk benne a
+	lejátszandó számok listáját,
+	egy grafikus hangszínszabályzót és
+	még sok minden mást.  Akik már ismerik a
+	Winamp
+	mûködését, az
+	XMMS-t is egyszerûnek
+	érzik majd.
 
-      The audio/mpg123 port is an alternative,
-	command-line MP3 player.
+      Mellette az audio/mpg123
+	port egy másik, parancssoros MP3 lejátszót
+	kínál fel.
 
-      mpg123 can be run by specifying
-	the sound device and the MP3 file on the command line, as
-	shown below:
+      Az mpg123
+	futtatásához paraméterként meg kell
+	adnunk a hangeszközt és lejátszandó
+	MP3 állományt, ahogy ez a példában
+	is látható:
 
       &prompt.root; mpg123 -a /dev/dsp1.0 Foobar-GreatestHits.mp3
 High Performance MPEG 1.0/2.0/2.5 Audio Player for Layer 1, 2 and 3.
@@ -494,176 +660,234 @@
 MPEG 1.0 layer III, 128 kbit/s, 44100 Hz joint-stereo
 
 
-      /dev/dsp1.0 should be replaced with the
-	dsp device entry on your system.
+      Itt a /dev/dsp1.0 eszköznevet ne
+	felejtsük el kicserélni a rendszerünkben
+	található dsp eszköz
+	nevével.
 
     
 
     
-      Ripping CD Audio Tracks
+      Sávok lementése CD-rõl
 
-      Before encoding a CD or CD track to MP3, the audio data on
-	the CD must be ripped onto the hard drive.  This is done by
-	copying the raw CDDA (CD Digital Audio) data to WAV
-	files.
+      Mielõtt MP3 formátumba
+	tömörítenénk egy CD-t vagy annak egy
+	sávját, a CD-n található audio
+	adatot valahogy le kell tudnunk szedni a merevlemezre.  Ezt
+	úgy tehetjük meg, ha a nyers CDDA (CD
+	Digitális Audio) adatot WAV formátumú
+	állományokba mentjük.
 
-      The cdda2wav tool, which is a part of
-	the sysutils/cdrtools
-	suite, is used for ripping audio information from CDs and the
-	information associated with them.
+      A sysutils/cdrtools
+	csomag részeként elérhetõ
+	cdda2wav segédprogrammal tudjuk a
+	CD-ken levõ audio és a hozzájuk
+	tartozó egyéb információkat
+	leszedni.
 
-      With the audio CD in the drive, the following command can
-	be issued (as root) to rip an entire CD
-	into individual (per track) WAV files:
+      A meghajtóban levõ CD teljes tartalmát
+	(root felhasználóként) a
+	következõ parancs kiadásával lehet
+	(sávonként) különálló WAV
+	állományokba menteni:
 
       &prompt.root; cdda2wav -D 0,1,0 -B
 
-      cdda2wav will support
-	ATAPI (IDE) CDROM drives.  To rip from an IDE drive, specify
-	the device name in place of the SCSI unit numbers.  For
-	example, to rip track 7 from an IDE drive:
+      A cdda2wav ismeri az ATAPI (IDE)
+	CD-meghajtókat, használatukhoz a SCSI
+	egység sorszáma helyett az eszköz
+	nevét kell megadni.  Tehát például
+	így szedjük le egy IDE meghajtóról a
+	7.  sávot:
 
       &prompt.root; cdda2wav -D /dev/acd0 -t 7
 
-      The 
-	indicates the SCSI device 0,1,0,
-	which corresponds to the output of cdrecord
-	-scanbus.
+      A  a
+	0,1,0 sorszámú SCSI
+	eszközre utal, ami megfelel cdrecord
+	-scanbus parancs eredményének.
 
-      To rip individual tracks, make use of the
-	 option as shown:
+      Az egyes sávok lementéséhez a
+	 kapcsoló
+	használható:
 
       &prompt.root; cdda2wav -D 0,1,0 -t 7
 
-      This example rips track seven of the audio CDROM.  To rip
-	a range of tracks, for example, track one to seven, specify a
-	range:
+      A példa szerint a zenei CD-rõl a hetedik
+	sávot szedjük le.  Egyszerre több sávot,

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu Dec  6 07:00:50 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CCF2016A473; Thu,  6 Dec 2007 07:00: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 5A6CB16A46E
	for ; Thu,  6 Dec 2007 07:00:49 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4248413C468
	for ; Thu,  6 Dec 2007 07:00:49 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB670nFB063762
	for ; Thu, 6 Dec 2007 07:00:49 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB670nwC063759
	for perforce@freebsd.org; Thu, 6 Dec 2007 07:00:49 GMT
	(envelope-from kmacy@freebsd.org)
Date: Thu, 6 Dec 2007 07:00:49 GMT
Message-Id: <200712060700.lB670nwC063759@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130323 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 06 Dec 2007 07:00:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=130323

Change 130323 by kmacy@entropy_kmacy_xen31 on 2007/12/06 07:00:01

	import xenbus (may move later) - resolve most link time errors

Affected files ...

.. //depot/projects/xen31/sys/conf/files#7 edit
.. //depot/projects/xen31/sys/conf/files.i386#6 edit
.. //depot/projects/xen31/sys/i386/xen/pmap.c#4 edit
.. //depot/projects/xen31/sys/libkern/strcspn.c#1 add
.. //depot/projects/xen31/sys/sys/libkern.h#2 edit
.. //depot/projects/xen31/sys/xen/evtchn.c#1 add
.. //depot/projects/xen31/sys/xen/gnttab.h#1 add

Differences ...

==== //depot/projects/xen31/sys/conf/files#7 (text+ko) ====

@@ -1585,6 +1585,7 @@
 libkern/strcat.c		standard
 libkern/strcmp.c		standard
 libkern/strcpy.c		standard
+libkern/strcspn.c		standard
 libkern/strdup.c		standard
 libkern/strlcat.c		standard
 libkern/strlcpy.c		standard
@@ -2106,6 +2107,8 @@
 vm/vm_unix.c			standard
 vm/vm_zeroidle.c		standard
 vm/vnode_pager.c		standard
+xen/gnttab.c			optional xen
+xen/evtchn.c			optional xen
 #
 gnu/fs/xfs/xfs_alloc.c		optional xfs \
 	compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" \

==== //depot/projects/xen31/sys/conf/files.i386#6 (text+ko) ====

@@ -244,6 +244,11 @@
 dev/syscons/scvtb.c		optional sc
 dev/uart/uart_cpu_i386.c	optional uart
 dev/acpica/acpi_if.m		standard
+dev/xen/xenbus/xenbus_client.c	optional xen
+dev/xen/xenbus/xenbus_comms.c	optional xen
+dev/xen/xenbus/xenbus_dev.c	optional xen
+dev/xen/xenbus/xenbus_probe.c	optional xen
+dev/xen/xenbus/xenbus_xs.c	optional xen
 dev/wpi/if_wpi.c		optional wpi
 i386/acpica/OsdEnvironment.c	optional acpi
 i386/acpica/acpi_machdep.c	optional acpi

==== //depot/projects/xen31/sys/i386/xen/pmap.c#4 (text+ko) ====

@@ -3247,6 +3247,37 @@
 	return (FALSE);
 }
 
+/* 
+ *      pmap_page_wired_mappings: 
+ * 
+ *      Return the number of managed mappings to the given physical page 
+ *      that are wired. 
+ */ 
+int 
+pmap_page_wired_mappings(vm_page_t m) 
+{ 
+        pv_entry_t pv; 
+        pt_entry_t *pte; 
+        pmap_t pmap; 
+        int count; 
+ 
+        count = 0; 
+        if ((m->flags & PG_FICTITIOUS) != 0) 
+                return (count); 
+        mtx_assert(&vm_page_queue_mtx, MA_OWNED); 
+        sched_pin(); 
+        TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { 
+                pmap = PV_PMAP(pv); 
+                PMAP_LOCK(pmap); 
+                pte = pmap_pte_quick(pmap, pv->pv_va); 
+                if ((*pte & PG_W) != 0) 
+                        count++; 
+                PMAP_UNLOCK(pmap); 
+        } 
+        sched_unpin(); 
+        return (count); 
+} 
+
 /*
  * Remove all pages from specified address space
  * this aids process exit speeds.  Also, this code

==== //depot/projects/xen31/sys/sys/libkern.h#2 (text+ko) ====

@@ -101,6 +101,7 @@
 char	*strcat(char * __restrict, const char * __restrict);
 int	 strcmp(const char *, const char *);
 char	*strcpy(char * __restrict, const char * __restrict);
+size_t	strcspn(const char *s, const char *charset);
 char	*strdup(const char *__restrict, struct malloc_type *);
 size_t	 strlcat(char *, const char *, size_t);
 size_t	 strlcpy(char *, const char *, size_t);

From owner-p4-projects@FreeBSD.ORG  Thu Dec  6 14:58:56 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E761D16A469; Thu,  6 Dec 2007 14:58:55 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 982D416A421
	for ; Thu,  6 Dec 2007 14:58:55 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 876D813C447
	for ; Thu,  6 Dec 2007 14:58:50 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB6EwnCR067952
	for ; Thu, 6 Dec 2007 14:58:49 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB6EwneL067949
	for perforce@freebsd.org; Thu, 6 Dec 2007 14:58:49 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Thu, 6 Dec 2007 14:58:49 GMT
Message-Id: <200712061458.lB6EwneL067949@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 130349 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 06 Dec 2007 14:58:56 -0000

http://perforce.freebsd.org/chv.cgi?CH=130349

Change 130349 by hselasky@hselasky_laptop001 on 2007/12/06 14:58:34

	
	Spell correction. 
	
	Substitute "MBps" by "Mbps".
	
	USB is fast, but not that fast ;-)

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#24 edit
.. //depot/projects/usb/src/sys/dev/usb/usb.c#26 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/if_zyd.c#24 (text+ko) ====

@@ -2063,7 +2063,7 @@
 	    IEEE80211_C_HOSTAP | IEEE80211_C_SHPREAMBLE | IEEE80211_C_PMGT |
 	    IEEE80211_C_TXPMGT | IEEE80211_C_WEP;
 
-	/* Rates are in 0,5 MBps units */
+	/* Rates are in 0,5 Mbps units */
 	ic->ic_sup_rates[IEEE80211_MODE_11B] = zyd_rateset_11b;
 	ic->ic_sup_rates[IEEE80211_MODE_11G] = zyd_rateset_11g;
 

==== //depot/projects/usb/src/sys/dev/usb/usb.c#26 (text+ko) ====

@@ -312,22 +312,22 @@
 	switch (bus->usbrev) {
 	case USBREV_1_0:
 		speed = USB_SPEED_FULL;
-		device_printf(bus->bdev, "12MBps Full Speed USB v1.0\n");
+		device_printf(bus->bdev, "12Mbps Full Speed USB v1.0\n");
 		break;
 
 	case USBREV_1_1:
 		speed = USB_SPEED_FULL;
-		device_printf(bus->bdev, "12MBps Full Speed USB v1.1\n");
+		device_printf(bus->bdev, "12Mbps Full Speed USB v1.1\n");
 		break;
 
 	case USBREV_2_0:
 		speed = USB_SPEED_HIGH;
-		device_printf(bus->bdev, "480MBps High Speed USB v2.0\n");
+		device_printf(bus->bdev, "480Mbps High Speed USB v2.0\n");
 		break;
 
 	case USBREV_2_5:
 		speed = USB_SPEED_VARIABLE;
-		device_printf(bus->bdev, "480MBps Wireless USB v2.5\n");
+		device_printf(bus->bdev, "480Mbps Wireless USB v2.5\n");
 		break;
 
 	default:

From owner-p4-projects@FreeBSD.ORG  Thu Dec  6 16:37:38 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D01BE16A418; Thu,  6 Dec 2007 16:37: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 60F1B16A420
	for ; Thu,  6 Dec 2007 16:37:37 +0000 (UTC)
	(envelope-from thioretic@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4FE1613C46E
	for ; Thu,  6 Dec 2007 16:37:37 +0000 (UTC)
	(envelope-from thioretic@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB6GbbQI084629
	for ; Thu, 6 Dec 2007 16:37:37 GMT
	(envelope-from thioretic@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB6GbW3A084626
	for perforce@freebsd.org; Thu, 6 Dec 2007 16:37:32 GMT
	(envelope-from thioretic@FreeBSD.org)
Date: Thu, 6 Dec 2007 16:37:32 GMT
Message-Id: <200712061637.lB6GbW3A084626@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thioretic@FreeBSD.org using -f
From: Maxim Zhuravlev 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130352 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 06 Dec 2007 16:37:38 -0000

http://perforce.freebsd.org/chv.cgi?CH=130352

Change 130352 by thioretic@thioretic on 2007/12/06 16:36:57

	IFC

Affected files ...

.. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/busdma_machdep.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/interrupt.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/pmap.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/alpha/include/elf.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/alpha/isa/isa.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/alpha/pci/pcibus.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/db_trace.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/exception.S#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/intr_machdep.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/local_apic.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/machdep.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/msi.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/pmap.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/trap.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/amd64/include/elf.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/amd64/include/pci_cfgreg.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_proto.h#4 integrate
.. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_syscall.h#4 integrate
.. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_sysent.c#4 integrate
.. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/syscalls.master#4 integrate
.. //depot/projects/soc2007/thioretic_gidl/amd64/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/arm/arm/busdma_machdep.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/arm/arm/mem.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/arm/arm/pmap.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/arm/arm/vm_machdep.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91rm92reg.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/arm/at91/if_ate.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/arm/at91/kb920x_machdep.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/arm/at91/std.at91#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/arm/at91/std.kb920x#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/arm/conf/HL200#1 branch
.. //depot/projects/soc2007/thioretic_gidl/arm/include/elf.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/arm/include/pmap.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/arm/include/sf_buf.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/arm/include/vmparam.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/i80321_timer.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/iq31244_machdep.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/std.iq31244#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/files.ixp425#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/if_npe.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/ixp425_npe.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/ixp425_npevar.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/boot/common/ufsread.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/boot/ficl/Makefile#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/boot/i386/boot2/boot2.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/boot/i386/cdboot/cdboot.s#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/bioscd.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/biosdisk.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/boot/i386/loader/main.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/boot/pc98/Makefile.inc#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/boot/pc98/boot2/boot.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/boot/pc98/cdboot/cdboot.s#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/boot/pc98/libpc98/bioscd.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/boot/pc98/libpc98/biosdisk.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/boot/pc98/loader/main.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/bsm/audit.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/bsm/audit_internal.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/bsm/audit_kevents.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/bsm/audit_record.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/compat/freebsd32/freebsd32_misc.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/compat/linux/linux_ipc.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/compat/svr4/svr4_ipc.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/compat/svr4/svr4_proto.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/compat/svr4/svr4_syscall.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/compat/svr4/svr4_syscallnames.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/compat/svr4/svr4_sysent.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/compat/svr4/syscalls.master#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/conf/newvers.sh#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/conf/options.arm#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/dev/npe/IxNpeMicrocode.dat.uu#1 branch
.. //depot/projects/soc2007/thioretic_gidl/contrib/dev/npe/LICENSE#1 branch
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/fil.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_auth.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_auth.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_compat.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_fil.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_frag.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_frag.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_htable.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_htable.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_ipsec_pxy.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_irc_pxy.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_log.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_lookup.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_lookup.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_nat.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_nat.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_pool.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_pool.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_proxy.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_proxy.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_scan.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_scan.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_state.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_state.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_sync.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ip_sync.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/ipl.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/contrib/pf/net/pf.c#4 integrate
.. //depot/projects/soc2007/thioretic_gidl/ddb/db_command.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/acpi_support/acpi_ibm.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/acpica/acpi.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/acpica/acpi_battery.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/acpica/acpi_cpu.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/acpica/acpi_hpet.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/acpica/acpi_pci.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/acpica/acpi_pci_link.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/acpica/acpi_timer.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/acpica/acpivar.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/an/if_an.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/an/if_anreg.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/ata/ata-all.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/ata/ata-all.h#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/ata/ata-chipset.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/ata/ata-dma.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/ata/ata-pci.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/ata/ata-pci.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/ata/atapi-cd.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/ata/atapi-cd.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/ata/atapi-fd.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/ata/atapi-tape.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/ath/if_ath.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/cxgb/common/cxgb_common.h#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/cxgb/common/cxgb_ctl_defs.h#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/cxgb/common/cxgb_sge_defs.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/cxgb/common/cxgb_t3_hw.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/cxgb/common/cxgb_vsc7323.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/cxgb/common/cxgb_xgmac.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/cxgb/cxgb_adapter.h#4 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/cxgb/cxgb_include.h#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/cxgb/cxgb_main.c#4 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/cxgb/cxgb_offload.h#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/cxgb/cxgb_osdep.h#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/cxgb/cxgb_sge.c#4 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/cxgb/t3fw-4.5.0.bin.gz.uu#2 delete
.. //depot/projects/soc2007/thioretic_gidl/dev/cxgb/t3fw-4.7.0.bin.gz.uu#1 branch
.. //depot/projects/soc2007/thioretic_gidl/dev/em/if_em.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/em/if_em.h#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/firewire/fwohci.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/hwpmc/hwpmc_x86.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/ichsmb/ichsmb_pci.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/ipw/if_ipw.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/iwi/if_iwi.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/mii/e1000phy.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/mii/e1000phyreg.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/mii/miidevs#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/mii/rgephy.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/mii/rgephyreg.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/pccard/pccard_cis_quirks.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/pccard/pccarddevs#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/pci/pci_pci.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/pci/pcireg.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/random/yarrow.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/re/if_re.c#4 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/sound/pci/atiixp.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/sound/pci/atiixp.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/sound/pci/hda/hdac.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/sound/pci/t4dwave.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/sound/pcm/ac97.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/sound/pcm/ac97_patch.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/syscons/syscons.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/syscons/syscons.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/twa/tw_cl_init.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/twa/tw_cl_intr.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/twa/tw_cl_io.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/twa/tw_cl_misc.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/twa/tw_cl_share.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/twa/tw_osl.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/twa/tw_osl_cam.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/twa/tw_osl_freebsd.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/twa/tw_osl_share.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/usb/ukbd.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/usb/usbdevs#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/usb/uscanner.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/dev/utopia/utopia.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/fs/nullfs/null_subr.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/fs/nullfs/null_vnops.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/fs/pseudofs/pseudofs_vnops.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/fs/unionfs/union.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/fs/unionfs/union_subr.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/fs/unionfs/union_vfsops.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/fs/unionfs/union_vnops.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/i386/i386/geode.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/i386/i386/intr_machdep.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/i386/i386/msi.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/i386/i386/pmap.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/i386/ibcs2/ibcs2_ipc.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/i386/include/bootinfo.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/i386/include/elf.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/i386/linux/linux_proto.h#4 integrate
.. //depot/projects/soc2007/thioretic_gidl/i386/linux/linux_syscall.h#4 integrate
.. //depot/projects/soc2007/thioretic_gidl/i386/linux/linux_sysent.c#4 integrate
.. //depot/projects/soc2007/thioretic_gidl/i386/linux/syscalls.master#4 integrate
.. //depot/projects/soc2007/thioretic_gidl/i386/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/ia64/ia64/interrupt.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/ia64/ia64/pmap.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/ia64/include/elf.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/kern/kern_fork.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/kern/kern_intr.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/kern/kern_linker.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/kern/kern_mbuf.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/kern/kern_proc.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/kern/kern_sig.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/kern/kern_thread.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/kern/subr_bus.c#26 integrate
.. //depot/projects/soc2007/thioretic_gidl/kern/subr_rman.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/kern/sys_pipe.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/kern/sysv_sem.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/kern/sysv_shm.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/kern/tty_pty.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/modules/Makefile#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/modules/cxgb/Makefile#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/net/bpf.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/net/bpf_filter.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/net/if_lagg.c#5 integrate
.. //depot/projects/soc2007/thioretic_gidl/net/if_lagg.h#5 integrate
.. //depot/projects/soc2007/thioretic_gidl/net/route.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/net80211/ieee80211_input.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/net80211/ieee80211_node.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/netgraph/netgraph.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/netgraph/ng_base.c#4 integrate
.. //depot/projects/soc2007/thioretic_gidl/netgraph/ng_socket.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/netinet6/nd6.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/nfsclient/bootp_subr.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/nfsclient/nfs_diskless.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/nfsclient/nfs_socket.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/nfsclient/nfs_subs.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/nfsclient/nfs_vfsops.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/nfsclient/nfsdiskless.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/nfsserver/nfs_serv.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/pc98/pc98/machdep.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/pci/agp.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/pci/agp_ali.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/pci/agp_amd.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/pci/agp_amd64.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/pci/agp_ati.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/pci/agp_i810.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/pci/agp_intel.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/pci/agp_nvidia.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/pci/agp_sis.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/pci/agp_via.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/pci/agppriv.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/pci/if_rl.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/pci/if_rlreg.h#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/pci/if_sis.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/pci/if_sisreg.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/pci/if_vr.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/pci/if_vrreg.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/pci/nfsmb.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/powerpc/include/elf.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/powerpc/powerpc/db_interface.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/powerpc/powerpc/pmap.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/security/audit/audit.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/security/audit/audit.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/security/audit/audit_arg.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/security/audit/audit_bsm.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/security/audit/audit_bsm_klib.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/security/audit/audit_bsm_token.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/security/audit/audit_ioctl.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/security/audit/audit_pipe.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/security/audit/audit_private.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/security/audit/audit_syscalls.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/security/audit/audit_trigger.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/security/audit/audit_worker.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/sparc64/conf/DEFAULTS#1 branch
.. //depot/projects/soc2007/thioretic_gidl/sparc64/conf/GENERIC#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/sparc64/include/elf.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/sparc64/sparc64/db_interface.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/sparc64/sparc64/elf_machdep.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/sparc64/sparc64/pmap.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/sys/bus.h#10 integrate
.. //depot/projects/soc2007/thioretic_gidl/sys/elf32.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/sys/elf64.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/sys/elf_common.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/sys/elf_generic.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/sys/linker.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/sys/param.h#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/sys/proc.h#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/sys/rman.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/sys/syscallsubr.h#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/vm/phys_pager.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/vm/pmap.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/vm/uma_core.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl/vm/vm_fault.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl/vm/vm_map.c#3 integrate

Differences ...

==== //depot/projects/soc2007/thioretic_gidl/alpha/alpha/busdma_machdep.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.51.2.1 2005/09/26 19:35:33 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.51.2.2 2007/11/27 17:43:49 jhb Exp $");
 
 #include 
 #include 
@@ -128,8 +128,8 @@
 
 	retval = 0;
 	do {
-		if (paddr > dmat->lowaddr
-		 && paddr <= dmat->highaddr
+		if (((paddr > dmat->lowaddr && paddr <= dmat->highaddr)
+		 || ((paddr & (dmat->alignment - 1)) != 0))
 		 && (dmat->filter == NULL
 		  || (*dmat->filter)(dmat->filterarg, paddr) != 0))
 			retval = 1;
@@ -179,7 +179,8 @@
 #endif
 }
 
-#define BUS_DMA_MIN_ALLOC_COMP BUS_DMA_BUS4
+#define BUS_DMA_COULD_BOUNCE	BUS_DMA_BUS3
+#define BUS_DMA_MIN_ALLOC_COMP	BUS_DMA_BUS4
 /*
  * Allocate a device specific dma_tag.
  */
@@ -194,10 +195,15 @@
 	bus_dma_tag_t newtag;
 	int error = 0;
 
+	/* Basic sanity checking */
+	if (boundary != 0 && boundary < maxsegsz)
+		maxsegsz = boundary;
+
 	/* Return a NULL tag on failure */
 	*dmat = NULL;
 
-	newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_DEVBUF, M_NOWAIT);
+	newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_DEVBUF,
+	    M_ZERO | M_NOWAIT);
 	if (newtag == NULL)
 		return (ENOMEM);
 
@@ -221,7 +227,6 @@
 		newtag->lockfunc = dflt_lock;
 		newtag->lockfuncarg = NULL;
 	}
-
 	newtag->segments = NULL;
 
 	/* Take into account any restrictions imposed by our parent tag */
@@ -245,8 +250,12 @@
 		if (newtag->parent != NULL)
 			atomic_add_int(&parent->ref_count, 1);
 	}
-	
-	if (newtag->lowaddr < ptoa(Maxmem) && (flags & BUS_DMA_ALLOCNOW) != 0) {
+
+	if (newtag->lowaddr < ptoa(Maxmem) || newtag->alignment > 1)
+		newtag->flags |= BUS_DMA_COULD_BOUNCE;
+
+	if (((newtag->flags & BUS_DMA_COULD_BOUNCE) != 0) &&
+	    (flags & BUS_DMA_ALLOCNOW) != 0) {
 		/* Must bounce */
 
 		if (ptoa(total_bpages) < maxsize) {
@@ -261,7 +270,7 @@
 		/* Performed initial allocation */
 		newtag->flags |= BUS_DMA_MIN_ALLOC_COMP;
 	}
-	
+
 	if (error != 0) {
 		free(newtag, M_DEVBUF);
 	} else {
@@ -336,7 +345,13 @@
 			return (ENOMEM);
 	}
 
-	if (dmat->lowaddr < ptoa(Maxmem)) {
+	/*
+	 * Bouncing might be required if the driver asks for an active
+	 * exclusion region, a data alignment that is stricter than 1, and/or
+	 * an active address boundary.
+	 */
+	if (dmat->flags & BUS_DMA_COULD_BOUNCE) {
+
 		/* Must bounce */
 		int maxpages;
 
@@ -352,18 +367,21 @@
 		 * Attempt to add pages to our pool on a per-instance
 		 * basis up to a sane limit.
 		 */
-		maxpages = MIN(MAX_BPAGES, Maxmem - atop(dmat->lowaddr));
+		if (dmat->alignment > 1)
+			maxpages = MAX_BPAGES;
+		else
+			maxpages = MIN(MAX_BPAGES,
+			    Maxmem - atop(dmat->lowaddr));
 		if ((dmat->flags & BUS_DMA_MIN_ALLOC_COMP) == 0
-		 || (dmat->map_count > 0
-		  && total_bpages < maxpages)) {
+		 || (dmat->map_count > 0 && total_bpages < maxpages)) {
 			int pages;
 
-			pages = atop(dmat->maxsize) + 1;
+			pages = MAX(atop(dmat->maxsize), 1);
 			pages = MIN(maxpages - total_bpages, pages);
-
+			pages = MAX(pages, 1);
 			if (alloc_bounce_pages(dmat, pages) < pages)
 				error = ENOMEM;
-			
+
 			if ((dmat->flags & BUS_DMA_MIN_ALLOC_COMP) == 0) {
 				if (error == 0)
 					dmat->flags |= BUS_DMA_MIN_ALLOC_COMP;
@@ -429,7 +447,9 @@
 			return (ENOMEM);
 	}
 
-	if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) {
+	if ((dmat->maxsize <= PAGE_SIZE) &&
+	   (dmat->alignment < dmat->maxsize) &&
+	    dmat->lowaddr >= ptoa(Maxmem)) {
 		*vaddr = malloc(dmat->maxsize, M_DEVBUF, mflags);
 	} else {
 		/*
@@ -459,7 +479,9 @@
 	 */
 	if (map != &nobounce_dmamap)
 		panic("bus_dmamem_free: Invalid map freed\n");
-	if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem))
+	if ((dmat->maxsize <= PAGE_SIZE) &&
+	   (dmat->alignment < dmat->maxsize) &&
+	    dmat->lowaddr >= ptoa(Maxmem))
 		free(vaddr, M_DEVBUF);
 	else {
 		contigfree(vaddr, dmat->maxsize, M_DEVBUF);
@@ -468,55 +490,37 @@
 
 #define BUS_DMAMAP_NSEGS ((64 * 1024 / PAGE_SIZE) + 1)
 
+vm_offset_t alpha_XXX_dmamap_or = 1024UL*1024UL*1024UL;  /*XXX */
+
 /*
- * Map the buffer buf into bus space using the dmamap map.
+ * Utility function to load a linear buffer.  lastaddrp holds state
+ * between invocations (for multiple-buffer loads).  segp contains
+ * the starting segment on entrace, and the ending segment on exit.
+ * first indicates if this is the first invocation of this function.
  */
-
-vm_offset_t alpha_XXX_dmamap_or = 1024UL*1024UL*1024UL;  /*XXX */
-
-int
-bus_dmamap_load(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
-		bus_size_t buflen, bus_dmamap_callback_t *callback,
-		void *callback_arg, int flags)
+static int
+_bus_dmamap_load_buffer(bus_dma_tag_t dmat,
+			bus_dmamap_t map,
+			void *buf, bus_size_t buflen,
+			pmap_t pmap,
+			int flags,
+			bus_addr_t *lastaddrp,
+			bus_dma_segment_t *segs,
+			int *segp,
+			int first)
 {
-	bus_dma_segment_t	segment;
-	vm_offset_t		vaddr;
-	vm_offset_t		paddr;
-	bus_dma_segment_t      *sg;
-	int			seg;
-	int			error;
-	vm_offset_t		nextpaddr;
-
-	error = 0;
-
-	if ((dmat->flags & BUS_DMA_ISA) && chipset.sgmap != NULL) {
-		/*
-		 * For ISA dma, we use the chipset's scatter-gather
-		 * map to map the tranfer into the ISA reachable range
-		 * of the bus address space.
-		 */
-		vaddr = trunc_page((vm_offset_t) buf);
-		dmat->segments = &segment;
-		dmat->segments[0].ds_addr =
-			map->busaddress + (vm_offset_t) buf - vaddr;
-		dmat->segments[0].ds_len = buflen;
-		buflen = round_page((vm_offset_t) buf + buflen) - vaddr;
-		sgmap_load_region(chipset.sgmap,
-				  map->busaddress,
-				  vaddr,
-				  buflen);
-		map->buflen = buflen;
-		(*callback)(callback_arg, dmat->segments, 1, error);
-		dmat->segments = NULL;
-
-		return (0);
-	}
+	bus_size_t sgsize;
+	bus_addr_t curaddr, lastaddr, baddr, bmask;
+	vm_offset_t vaddr;
+	bus_addr_t paddr;
+	int seg;
 
 	/*
 	 * If we are being called during a callback, pagesneeded will
 	 * be non-zero, so we can avoid doing the work twice.
 	 */
-	if (dmat->lowaddr < ptoa(Maxmem) && map->pagesneeded == 0) {
+	if ((map != &nobounce_dmamap && map->pagesneeded == 0)
+	 && ((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0)) {
 		vm_offset_t	vendaddr;
 
 		/*
@@ -527,11 +531,12 @@
 		vendaddr = (vm_offset_t)buf + buflen;
 
 		while (vaddr < vendaddr) {
-			paddr = pmap_kextract(vaddr);
-			if (run_filter(dmat, paddr) != 0) {
-
+			if (pmap)
+				paddr = pmap_extract(pmap, vaddr);
+			else
+				paddr = pmap_kextract(vaddr);
+			if (run_filter(dmat, paddr) != 0)
 				map->pagesneeded++;
-			}
 			vaddr += PAGE_SIZE;
 		}
 	}
@@ -550,8 +555,6 @@
 				map->dmat = dmat;
 				map->buf = buf;
 				map->buflen = buflen;
-				map->callback = callback;
-				map->callback_arg = callback_arg;
 				STAILQ_INSERT_TAIL(&bounce_map_waitinglist,
 				    map, links);
 				mtx_unlock(&bounce_lock);
@@ -562,82 +565,6 @@
 	}
 
 	vaddr = (vm_offset_t)buf;
-	sg = &dmat->segments[0];
-	seg = 1;
-	sg->ds_len = 0;
-
-	nextpaddr = 0;
-
-	do {
-		bus_size_t	size;
-
-		paddr = pmap_kextract(vaddr);
-		size = PAGE_SIZE - (paddr & PAGE_MASK);
-		if (size > buflen)
-			size = buflen;
-
-		if (map->pagesneeded != 0 && run_filter(dmat, paddr)) {
-			paddr = add_bounce_page(dmat, map, vaddr, size);
-		}
-
-		if (sg->ds_len == 0) {
-			sg->ds_addr = paddr | alpha_XXX_dmamap_or;
-			sg->ds_len = size;
-		} else if (paddr == nextpaddr) {
-			sg->ds_len += size;
-		} else {
-			/* Go to the next segment */
-			sg++;
-			seg++;
-			if (seg > dmat->nsegments)
-				break;
-			sg->ds_addr = paddr | alpha_XXX_dmamap_or;
-			sg->ds_len = size;
-		}
-		vaddr += size;
-		nextpaddr = paddr + size;
-		buflen -= size;
-
-	} while (buflen > 0);
-
-	if (buflen != 0) {
-		printf("bus_dmamap_load: Too many segs! buf_len = 0x%lx\n",
-		       buflen);
-		error = EFBIG;
-	}
-
-	(*callback)(callback_arg, dmat->segments, seg, error);
-
-	return (0);
-}
-
-/*
- * Utility function to load a linear buffer.  lastaddrp holds state
- * between invocations (for multiple-buffer loads).  segp contains
- * the starting segment on entrace, and the ending segment on exit.
- * first indicates if this is the first invocation of this function.
- */
-static int
-_bus_dmamap_load_buffer(bus_dma_tag_t dmat,
-			void *buf, bus_size_t buflen,
-			struct thread *td,
-			int flags,
-			vm_offset_t *lastaddrp,
-			bus_dma_segment_t *segs,
-			int *segp,
-			int first)
-{
-	bus_size_t sgsize;
-	bus_addr_t curaddr, lastaddr, baddr, bmask;
-	vm_offset_t vaddr = (vm_offset_t)buf;
-	int seg;
-	pmap_t pmap;
-
-	if (td != NULL)
-		pmap = vmspace_pmap(td->td_proc->p_vmspace);
-	else
-		pmap = NULL;
-
 	lastaddr = *lastaddrp;
 	bmask = ~(dmat->boundary - 1);
 
@@ -666,12 +593,20 @@
 				sgsize = (baddr - curaddr);
 		}
 
+		if (map->pagesneeded != 0 && run_filter(dmat, curaddr))
+			curaddr = add_bounce_page(dmat, map, vaddr, sgsize);
+
+		/*
+		 * Convert the physical address into an IO address.
+		 */
+		curaddr |= alpha_XXX_dmamap_or;
+
 		/*
 		 * Insert chunk into a segment, coalescing with
 		 * previous segment if possible.
 		 */
 		if (first) {
-			segs[seg].ds_addr = curaddr | alpha_XXX_dmamap_or;
+			segs[seg].ds_addr = curaddr;
 			segs[seg].ds_len = sgsize;
 			first = 0;
 		} else {
@@ -683,7 +618,7 @@
 			else {
 				if (++seg >= dmat->nsegments)
 					break;
-				segs[seg].ds_addr = curaddr | alpha_XXX_dmamap_or;
+				segs[seg].ds_addr = curaddr;
 				segs[seg].ds_len = sgsize;
 			}
 		}
@@ -703,6 +638,71 @@
 }
 
 /*
+ * Map the buffer buf into bus space using the dmamap map.
+ */
+int
+bus_dmamap_load(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
+		bus_size_t buflen, bus_dmamap_callback_t *callback,
+		void *callback_arg, int flags)
+{
+	bus_addr_t		lastaddr = 0;
+	int			error, nsegs = 0;
+
+	if ((dmat->flags & BUS_DMA_ISA) && chipset.sgmap != NULL) {
+		bus_dma_segment_t segment;
+		vm_offset_t vaddr;
+		
+		/*
+		 * For ISA dma, we use the chipset's scatter-gather
+		 * map to map the tranfer into the ISA reachable range
+		 * of the bus address space.
+		 */
+		vaddr = trunc_page((vm_offset_t) buf);
+		dmat->segments = &segment;
+		dmat->segments[0].ds_addr =
+			map->busaddress + (vm_offset_t) buf - vaddr;
+		dmat->segments[0].ds_len = buflen;
+		buflen = round_page((vm_offset_t) buf + buflen) - vaddr;
+		sgmap_load_region(chipset.sgmap,
+				  map->busaddress,
+				  vaddr,
+				  buflen);
+		map->buflen = buflen;
+		(*callback)(callback_arg, dmat->segments, 1, 0);
+		dmat->segments = NULL;
+
+		return (0);
+	}
+
+	if (map != &nobounce_dmamap) {
+		flags |= BUS_DMA_WAITOK;
+		map->callback = callback;
+		map->callback_arg = callback_arg;
+	}
+
+	error = _bus_dmamap_load_buffer(dmat, map, buf, buflen, NULL, flags,
+	     &lastaddr, dmat->segments, &nsegs, 1);
+
+	if (error == EINPROGRESS) {
+		return (error);
+	}
+
+	if (error)
+		(*callback)(callback_arg, dmat->segments, 0, error);
+	else
+		(*callback)(callback_arg, dmat->segments, nsegs + 1, 0);
+
+	/*
+	 * Return ENOMEM to the caller so that it can pass it up the stack.
+	 * This error only happens when NOWAIT is set, so deferal is disabled.
+	 */
+	if (error == ENOMEM)
+		return (error);
+
+	return (0);
+}
+
+/*
  * Like _bus_dmamap_load(), but for mbufs.
  */
 int
@@ -713,10 +713,9 @@
 {
 	int nsegs, error;
 
-	KASSERT(dmat->lowaddr >= ptoa(Maxmem) || map != NULL,
-		("bus_dmamap_load_mbuf: No support for bounce pages!"));
 	M_ASSERTPKTHDR(m0);
 
+	flags |= BUS_DMA_NOWAIT;
 	nsegs = 0;
 	error = 0;
 	if (m0->m_pkthdr.len <= dmat->maxsize) {
@@ -726,7 +725,7 @@
 
 		for (m = m0; m != NULL && error == 0; m = m->m_next) {
 			if (m->m_len > 0) {
-				error = _bus_dmamap_load_buffer(dmat,
+				error = _bus_dmamap_load_buffer(dmat, map,
 						m->m_data, m->m_len,
 						NULL, flags, &lastaddr,
 						dmat->segments, &nsegs, first);
@@ -754,10 +753,9 @@
 {
 	int error;
 
-	KASSERT(dmat->lowaddr >= ptoa(Maxmem) || map != NULL,
-		("bus_dmamap_load_mbuf: No support for bounce pages!"));
 	M_ASSERTPKTHDR(m0);
 
+	flags |= BUS_DMA_NOWAIT;
 	*nsegs = 0;
 	error = 0;
 	if (m0->m_pkthdr.len <= dmat->maxsize) {
@@ -767,7 +765,7 @@
 
 		for (m = m0; m != NULL && error == 0; m = m->m_next) {
 			if (m->m_len > 0) {
-				error = _bus_dmamap_load_buffer(dmat,
+				error = _bus_dmamap_load_buffer(dmat, map,
 						m->m_data, m->m_len,
 						NULL, flags, &lastaddr,
 						segs, nsegs, first);
@@ -795,19 +793,18 @@
 	int nsegs, error, first, i;
 	bus_size_t resid;
 	struct iovec *iov;
-	struct thread *td = NULL;
+	pmap_t pmap;
 
-	KASSERT(dmat->lowaddr >= ptoa(Maxmem) || map != NULL,
-		("bus_dmamap_load_uio: No support for bounce pages!"));
-
+	flags |= BUS_DMA_NOWAIT;
 	resid = uio->uio_resid;
 	iov = uio->uio_iov;
 
 	if (uio->uio_segflg == UIO_USERSPACE) {
-		td = uio->uio_td;
-		KASSERT(td != NULL,
+		KASSERT(uio->uio_td != NULL,
 			("bus_dmamap_load_uio: USERSPACE but no proc"));
-	}
+		pmap = vmspace_pmap(uio->uio_td->td_proc->p_vmspace);
+	} else
+		pmap = NULL;
 
 	nsegs = 0;
 	error = 0;
@@ -822,9 +819,9 @@
 		caddr_t addr = (caddr_t) iov[i].iov_base;
 
 		if (minlen > 0) {
-			error = _bus_dmamap_load_buffer(dmat, addr, minlen,
-					td, flags, &lastaddr, dmat->segments,
-					&nsegs, first);
+			error = _bus_dmamap_load_buffer(dmat, map,
+			    addr, minlen, pmap, flags, &lastaddr,
+			    dmat->segments, &nsegs, first);
 			first = 0;
 
 			resid -= minlen;

==== //depot/projects/soc2007/thioretic_gidl/alpha/alpha/interrupt.c#2 (text+ko) ====

@@ -33,7 +33,7 @@
 
 #include 			/* RCS ID & Copyright macro defns */
 /* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.86.2.2 2006/03/10 19:37:30 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.86.2.3 2007/11/27 17:45:06 jhb Exp $");
 
 #include 
 #include 
@@ -452,7 +452,6 @@
 		    ih->ih_handler, ih->ih_argument, ih->ih_name);
 		ih->ih_handler(ih->ih_argument);
 	}
-	critical_exit();
 
 	/*
 	 * If the ithread needs to run, disable the source and schedule the
@@ -468,6 +467,7 @@
 		error = intr_event_schedule_thread(ie);
 		KASSERT(error == 0, ("got an impossible stray interrupt"));
 	}
+	critical_exit();
 	sched_unpin();
 }
 

==== //depot/projects/soc2007/thioretic_gidl/alpha/alpha/pmap.c#3 (text+ko) ====

@@ -148,7 +148,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.178.2.7 2007/09/15 09:40:38 wilko Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.178.2.8 2007/11/05 16:17:58 ups Exp $");
 
 #include 
 #include 
@@ -1889,15 +1889,13 @@
  * but is *MUCH* faster than pmap_enter...
  */
 
-vm_page_t
-pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
-    vm_page_t mpte)
+void
+pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot)
 {
 
 	PMAP_LOCK(pmap);
-	mpte = pmap_enter_quick_locked(pmap, va, m, prot, mpte);
+	(void) pmap_enter_quick_locked(pmap, va, m, prot, NULL);
 	PMAP_UNLOCK(pmap);
-	return (mpte);
 }
 
 static vm_page_t

==== //depot/projects/soc2007/thioretic_gidl/alpha/include/elf.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/alpha/include/elf.h,v 1.14 2003/09/25 01:10:22 peter Exp $
+ * $FreeBSD: src/sys/alpha/include/elf.h,v 1.14.10.1 2007/12/03 21:30:34 marius Exp $
  */
 
 #ifndef _MACHINE_ELF_H_
@@ -94,39 +94,6 @@
 
 #define	AT_COUNT	15	/* Count of defined aux entry types. */
 
-/*
- * Relocation types.
- */
-
-#define	R_ALPHA_NONE		0	/* No reloc */
-#define	R_ALPHA_REFLONG		1	/* Direct 32 bit */
-#define	R_ALPHA_REFQUAD		2	/* Direct 64 bit */
-#define	R_ALPHA_GPREL32		3	/* GP relative 32 bit */
-#define	R_ALPHA_LITERAL		4	/* GP relative 16 bit w/optimization */
-#define	R_ALPHA_LITUSE		5	/* Optimization hint for LITERAL */
-#define	R_ALPHA_GPDISP		6	/* Add displacement to GP */
-#define	R_ALPHA_BRADDR		7	/* PC+4 relative 23 bit shifted */
-#define	R_ALPHA_HINT		8	/* PC+4 relative 16 bit shifted */
-#define	R_ALPHA_SREL16		9	/* PC relative 16 bit */
-#define	R_ALPHA_SREL32		10	/* PC relative 32 bit */
-#define	R_ALPHA_SREL64		11	/* PC relative 64 bit */
-#define	R_ALPHA_OP_PUSH		12	/* OP stack push */
-#define	R_ALPHA_OP_STORE	13	/* OP stack pop and store */
-#define	R_ALPHA_OP_PSUB		14	/* OP stack subtract */
-#define	R_ALPHA_OP_PRSHIFT	15	/* OP stack right shift */
-#define	R_ALPHA_GPVALUE		16
-#define	R_ALPHA_GPRELHIGH	17
-#define	R_ALPHA_GPRELLOW	18
-#define	R_ALPHA_IMMED_GP_16	19
-#define	R_ALPHA_IMMED_GP_HI32	20
-#define	R_ALPHA_IMMED_SCN_HI32	21
-#define	R_ALPHA_IMMED_BR_HI32	22
-#define	R_ALPHA_IMMED_LO32	23
-#define	R_ALPHA_COPY		24	/* Copy symbol at runtime */
-#define	R_ALPHA_GLOB_DAT	25	/* Create GOT entry */
-#define	R_ALPHA_JMP_SLOT	26	/* Create PLT entry */
-#define	R_ALPHA_RELATIVE	27	/* Adjust by program base */
-
 #define R_ALPHA_COUNT		28
 
 /* Define "machine" characteristics */

==== //depot/projects/soc2007/thioretic_gidl/alpha/isa/isa.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.36.8.2 2007/10/03 20:41:32 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.36.8.3 2007/11/02 21:40:04 wilko Exp $");
 
 #define __RMAN_RESOURCE_VISIBLE
 #include 
@@ -232,7 +232,8 @@
 	    res = rman_reserve_resource(&isa_drq_rman, start, start, 1,
 					0, child);
 	    
-	rman_set_rid(res, *rid);
+	if (res)
+		rman_set_rid(res, *rid);
 	if (res && !passthrough) {
 		rle = resource_list_find(rl, type, *rid);
 		rle->start = rman_get_start(res);

==== //depot/projects/soc2007/thioretic_gidl/alpha/pci/pcibus.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.36.2.1 2007/10/03 20:41:33 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.36.2.2 2007/10/24 12:36:25 jhb Exp $");
 
 #include "opt_isa.h"
 
@@ -97,12 +97,7 @@
 alpha_platform_alloc_ide_intr(int chan)
 {
 	int irqs[2] = { 14, 15 };
-	struct resource *rv;
-
-	rv = isa_alloc_intr(0, 0, irqs[chan]);
-	if (rv != NULL)
-		rman_set_rid(rv, *rid);
-	return (rv);
+	return (isa_alloc_intr(0, 0, irqs[chan]));
 }
 
 int

==== //depot/projects/soc2007/thioretic_gidl/amd64/amd64/db_trace.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.66.2.2 2006/03/13 03:03:51 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.66.2.3 2007/11/21 16:41:51 jhb Exp $");
 
 #include 
 #include 
@@ -318,7 +318,8 @@
 	if (name != NULL) {
 		if (strcmp(name, "calltrap") == 0 ||
 		    strcmp(name, "fork_trampoline") == 0 ||
-		    strcmp(name, "nmi_calltrap") == 0)
+		    strcmp(name, "nmi_calltrap") == 0 ||
+		    strcmp(name, "Xdblfault") == 0)
 			frame_type = TRAP;

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu Dec  6 17:02:09 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 77D1016A421; Thu,  6 Dec 2007 17:02: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 1592716A41A
	for ; Thu,  6 Dec 2007 17:02:09 +0000 (UTC)
	(envelope-from thioretic@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0431813C447
	for ; Thu,  6 Dec 2007 17:02:09 +0000 (UTC)
	(envelope-from thioretic@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB6H28JV097484
	for ; Thu, 6 Dec 2007 17:02:08 GMT
	(envelope-from thioretic@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB6H23re097416
	for perforce@freebsd.org; Thu, 6 Dec 2007 17:02:03 GMT
	(envelope-from thioretic@FreeBSD.org)
Date: Thu, 6 Dec 2007 17:02:03 GMT
Message-Id: <200712061702.lB6H23re097416@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thioretic@FreeBSD.org using -f
From: Maxim Zhuravlev 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130353 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 06 Dec 2007 17:02:10 -0000

http://perforce.freebsd.org/chv.cgi?CH=130353

Change 130353 by thioretic@thioretic on 2007/12/06 17:01:57

	IFC

Affected files ...

.. //depot/projects/soc2007/thioretic_gidl2/alpha/alpha/busdma_machdep.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/alpha/alpha/interrupt.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/alpha/alpha/pmap.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/alpha/include/elf.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/alpha/isa/isa.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/alpha/pci/pcibus.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/db_trace.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/exception.S#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/intr_machdep.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/local_apic.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/machdep.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/msi.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/pmap.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/trap.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/amd64/include/elf.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/amd64/include/pci_cfgreg.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/amd64/linux32/linux32_proto.h#4 integrate
.. //depot/projects/soc2007/thioretic_gidl2/amd64/linux32/linux32_syscall.h#4 integrate
.. //depot/projects/soc2007/thioretic_gidl2/amd64/linux32/linux32_sysent.c#4 integrate
.. //depot/projects/soc2007/thioretic_gidl2/amd64/linux32/syscalls.master#4 integrate
.. //depot/projects/soc2007/thioretic_gidl2/amd64/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/arm/arm/busdma_machdep.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/arm/arm/mem.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/arm/arm/pmap.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/arm/arm/vm_machdep.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/arm/at91/at91rm92reg.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/arm/at91/if_ate.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/arm/at91/kb920x_machdep.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/arm/at91/std.at91#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/arm/at91/std.kb920x#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/arm/conf/HL200#1 branch
.. //depot/projects/soc2007/thioretic_gidl2/arm/include/elf.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/arm/include/pmap.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/arm/include/sf_buf.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/arm/include/vmparam.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/arm/xscale/i80321/i80321_timer.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/arm/xscale/i80321/iq31244_machdep.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/arm/xscale/i80321/std.iq31244#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/arm/xscale/ixp425/files.ixp425#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/arm/xscale/ixp425/if_npe.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/arm/xscale/ixp425/ixp425_npe.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/arm/xscale/ixp425/ixp425_npevar.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/boot/common/ufsread.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/boot/ficl/Makefile#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/boot/i386/boot2/boot2.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/boot/i386/cdboot/cdboot.s#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/boot/i386/libi386/bioscd.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/boot/i386/libi386/biosdisk.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/boot/i386/loader/main.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/boot/pc98/Makefile.inc#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/boot/pc98/boot2/boot.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/boot/pc98/cdboot/cdboot.s#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/boot/pc98/libpc98/bioscd.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/boot/pc98/libpc98/biosdisk.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/boot/pc98/loader/main.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/bsm/audit.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/bsm/audit_internal.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/bsm/audit_kevents.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/bsm/audit_record.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/compat/freebsd32/freebsd32_misc.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/compat/linux/linux_ipc.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/compat/svr4/svr4_ipc.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/compat/svr4/svr4_proto.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/compat/svr4/svr4_syscall.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/compat/svr4/svr4_syscallnames.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/compat/svr4/svr4_sysent.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/compat/svr4/syscalls.master#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/conf/newvers.sh#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/conf/options.arm#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/dev/npe/IxNpeMicrocode.dat.uu#1 branch
.. //depot/projects/soc2007/thioretic_gidl2/contrib/dev/npe/LICENSE#1 branch
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/fil.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_auth.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_auth.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_compat.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_fil.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_frag.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_frag.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_htable.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_htable.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_ipsec_pxy.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_irc_pxy.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_log.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_lookup.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_lookup.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_nat.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_nat.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_pool.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_pool.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_proxy.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_proxy.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_scan.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_scan.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_state.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_state.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_sync.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ip_sync.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/ipl.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/contrib/pf/net/pf.c#4 integrate
.. //depot/projects/soc2007/thioretic_gidl2/ddb/db_command.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/acpi_support/acpi_ibm.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/acpica/acpi.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/acpica/acpi_battery.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/acpica/acpi_cpu.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/acpica/acpi_hpet.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/acpica/acpi_pci.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/acpica/acpi_pci_link.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/acpica/acpi_timer.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/acpica/acpivar.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/an/if_an.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/an/if_anreg.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/ata/ata-all.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/ata/ata-all.h#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/ata/ata-chipset.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/ata/ata-dma.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/ata/ata-pci.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/ata/ata-pci.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/ata/atapi-cd.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/ata/atapi-cd.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/ata/atapi-fd.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/ata/atapi-tape.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/ath/if_ath.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/cxgb/common/cxgb_common.h#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/cxgb/common/cxgb_ctl_defs.h#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/cxgb/common/cxgb_sge_defs.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/cxgb/common/cxgb_t3_hw.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/cxgb/common/cxgb_vsc7323.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/cxgb/common/cxgb_xgmac.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/cxgb/cxgb_adapter.h#4 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/cxgb/cxgb_include.h#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/cxgb/cxgb_main.c#4 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/cxgb/cxgb_offload.h#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/cxgb/cxgb_osdep.h#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/cxgb/cxgb_sge.c#4 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/cxgb/t3fw-4.5.0.bin.gz.uu#2 delete
.. //depot/projects/soc2007/thioretic_gidl2/dev/cxgb/t3fw-4.7.0.bin.gz.uu#1 branch
.. //depot/projects/soc2007/thioretic_gidl2/dev/em/if_em.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/em/if_em.h#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/firewire/fwohci.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/hwpmc/hwpmc_x86.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/ichsmb/ichsmb_pci.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/ipw/if_ipw.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/iwi/if_iwi.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/mii/e1000phy.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/mii/e1000phyreg.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/mii/miidevs#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/mii/rgephy.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/mii/rgephyreg.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/pccard/pccard_cis_quirks.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/pccard/pccarddevs#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/pci/pci_pci.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/pci/pcireg.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/random/yarrow.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/re/if_re.c#4 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/sound/pci/atiixp.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/sound/pci/atiixp.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/sound/pci/hda/hdac.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/sound/pci/t4dwave.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/sound/pcm/ac97.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/sound/pcm/ac97_patch.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/syscons/syscons.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/syscons/syscons.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/twa/tw_cl_init.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/twa/tw_cl_intr.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/twa/tw_cl_io.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/twa/tw_cl_misc.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/twa/tw_cl_share.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/twa/tw_osl.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/twa/tw_osl_cam.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/twa/tw_osl_freebsd.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/twa/tw_osl_share.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/usb/ukbd.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/usb/usbdevs#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/usb/uscanner.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/dev/utopia/utopia.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/fs/nullfs/null_subr.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/fs/nullfs/null_vnops.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/fs/pseudofs/pseudofs_vnops.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/fs/unionfs/union.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/fs/unionfs/union_subr.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/fs/unionfs/union_vfsops.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/fs/unionfs/union_vnops.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/i386/i386/geode.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/i386/i386/intr_machdep.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/i386/i386/msi.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/i386/i386/pmap.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/i386/ibcs2/ibcs2_ipc.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/i386/include/bootinfo.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/i386/include/elf.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/i386/linux/linux_proto.h#4 integrate
.. //depot/projects/soc2007/thioretic_gidl2/i386/linux/linux_syscall.h#4 integrate
.. //depot/projects/soc2007/thioretic_gidl2/i386/linux/linux_sysent.c#4 integrate
.. //depot/projects/soc2007/thioretic_gidl2/i386/linux/syscalls.master#4 integrate
.. //depot/projects/soc2007/thioretic_gidl2/i386/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/ia64/ia64/interrupt.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/ia64/ia64/pmap.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/ia64/include/elf.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/kern/kern_fork.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/kern/kern_intr.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/kern/kern_linker.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/kern/kern_mbuf.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/kern/kern_proc.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/kern/kern_sig.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/kern/kern_thread.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/kern/subr_bus.c#8 integrate
.. //depot/projects/soc2007/thioretic_gidl2/kern/subr_rman.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/kern/sys_pipe.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/kern/sysv_sem.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/kern/sysv_shm.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/kern/tty_pty.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/modules/Makefile#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/modules/cxgb/Makefile#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/net/bpf.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/net/bpf_filter.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/net/if_lagg.c#5 integrate
.. //depot/projects/soc2007/thioretic_gidl2/net/if_lagg.h#5 integrate
.. //depot/projects/soc2007/thioretic_gidl2/net/route.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/net80211/ieee80211_input.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/net80211/ieee80211_node.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/netgraph/netgraph.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/netgraph/ng_base.c#4 integrate
.. //depot/projects/soc2007/thioretic_gidl2/netgraph/ng_socket.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/netinet6/nd6.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/nfsclient/bootp_subr.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/nfsclient/nfs_diskless.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/nfsclient/nfs_socket.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/nfsclient/nfs_subs.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/nfsclient/nfs_vfsops.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/nfsclient/nfsdiskless.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/nfsserver/nfs_serv.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/pc98/pc98/machdep.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/pci/agp.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/pci/agp_ali.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/pci/agp_amd.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/pci/agp_amd64.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/pci/agp_ati.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/pci/agp_i810.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/pci/agp_intel.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/pci/agp_nvidia.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/pci/agp_sis.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/pci/agp_via.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/pci/agppriv.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/pci/if_rl.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/pci/if_rlreg.h#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/pci/if_sis.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/pci/if_sisreg.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/pci/if_vr.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/pci/if_vrreg.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/pci/nfsmb.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/powerpc/include/elf.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/powerpc/powerpc/db_interface.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/powerpc/powerpc/pmap.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/security/audit/audit.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/security/audit/audit.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/security/audit/audit_arg.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/security/audit/audit_bsm.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/security/audit/audit_bsm_klib.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/security/audit/audit_bsm_token.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/security/audit/audit_ioctl.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/security/audit/audit_pipe.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/security/audit/audit_private.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/security/audit/audit_syscalls.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/security/audit/audit_trigger.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/security/audit/audit_worker.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/sparc64/conf/DEFAULTS#1 branch
.. //depot/projects/soc2007/thioretic_gidl2/sparc64/conf/GENERIC#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/sparc64/include/elf.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/sparc64/sparc64/db_interface.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/sparc64/sparc64/elf_machdep.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/sparc64/sparc64/pmap.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/sys/bus.h#5 integrate
.. //depot/projects/soc2007/thioretic_gidl2/sys/elf32.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/sys/elf64.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/sys/elf_common.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/sys/elf_generic.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/sys/linker.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/sys/param.h#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/sys/proc.h#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/sys/rman.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/sys/syscallsubr.h#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/vm/phys_pager.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/vm/pmap.h#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/vm/uma_core.c#2 integrate
.. //depot/projects/soc2007/thioretic_gidl2/vm/vm_fault.c#3 integrate
.. //depot/projects/soc2007/thioretic_gidl2/vm/vm_map.c#3 integrate

Differences ...

==== //depot/projects/soc2007/thioretic_gidl2/alpha/alpha/busdma_machdep.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.51.2.1 2005/09/26 19:35:33 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.51.2.2 2007/11/27 17:43:49 jhb Exp $");
 
 #include 
 #include 
@@ -128,8 +128,8 @@
 
 	retval = 0;
 	do {
-		if (paddr > dmat->lowaddr
-		 && paddr <= dmat->highaddr
+		if (((paddr > dmat->lowaddr && paddr <= dmat->highaddr)
+		 || ((paddr & (dmat->alignment - 1)) != 0))
 		 && (dmat->filter == NULL
 		  || (*dmat->filter)(dmat->filterarg, paddr) != 0))
 			retval = 1;
@@ -179,7 +179,8 @@
 #endif
 }
 
-#define BUS_DMA_MIN_ALLOC_COMP BUS_DMA_BUS4
+#define BUS_DMA_COULD_BOUNCE	BUS_DMA_BUS3
+#define BUS_DMA_MIN_ALLOC_COMP	BUS_DMA_BUS4
 /*
  * Allocate a device specific dma_tag.
  */
@@ -194,10 +195,15 @@
 	bus_dma_tag_t newtag;
 	int error = 0;
 
+	/* Basic sanity checking */
+	if (boundary != 0 && boundary < maxsegsz)
+		maxsegsz = boundary;
+
 	/* Return a NULL tag on failure */
 	*dmat = NULL;
 
-	newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_DEVBUF, M_NOWAIT);
+	newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_DEVBUF,
+	    M_ZERO | M_NOWAIT);
 	if (newtag == NULL)
 		return (ENOMEM);
 
@@ -221,7 +227,6 @@
 		newtag->lockfunc = dflt_lock;
 		newtag->lockfuncarg = NULL;
 	}
-
 	newtag->segments = NULL;
 
 	/* Take into account any restrictions imposed by our parent tag */
@@ -245,8 +250,12 @@
 		if (newtag->parent != NULL)
 			atomic_add_int(&parent->ref_count, 1);
 	}
-	
-	if (newtag->lowaddr < ptoa(Maxmem) && (flags & BUS_DMA_ALLOCNOW) != 0) {
+
+	if (newtag->lowaddr < ptoa(Maxmem) || newtag->alignment > 1)
+		newtag->flags |= BUS_DMA_COULD_BOUNCE;
+
+	if (((newtag->flags & BUS_DMA_COULD_BOUNCE) != 0) &&
+	    (flags & BUS_DMA_ALLOCNOW) != 0) {
 		/* Must bounce */
 
 		if (ptoa(total_bpages) < maxsize) {
@@ -261,7 +270,7 @@
 		/* Performed initial allocation */
 		newtag->flags |= BUS_DMA_MIN_ALLOC_COMP;
 	}
-	
+
 	if (error != 0) {
 		free(newtag, M_DEVBUF);
 	} else {
@@ -336,7 +345,13 @@
 			return (ENOMEM);
 	}
 
-	if (dmat->lowaddr < ptoa(Maxmem)) {
+	/*
+	 * Bouncing might be required if the driver asks for an active
+	 * exclusion region, a data alignment that is stricter than 1, and/or
+	 * an active address boundary.
+	 */
+	if (dmat->flags & BUS_DMA_COULD_BOUNCE) {
+
 		/* Must bounce */
 		int maxpages;
 
@@ -352,18 +367,21 @@
 		 * Attempt to add pages to our pool on a per-instance
 		 * basis up to a sane limit.
 		 */
-		maxpages = MIN(MAX_BPAGES, Maxmem - atop(dmat->lowaddr));
+		if (dmat->alignment > 1)
+			maxpages = MAX_BPAGES;
+		else
+			maxpages = MIN(MAX_BPAGES,
+			    Maxmem - atop(dmat->lowaddr));
 		if ((dmat->flags & BUS_DMA_MIN_ALLOC_COMP) == 0
-		 || (dmat->map_count > 0
-		  && total_bpages < maxpages)) {
+		 || (dmat->map_count > 0 && total_bpages < maxpages)) {
 			int pages;
 
-			pages = atop(dmat->maxsize) + 1;
+			pages = MAX(atop(dmat->maxsize), 1);
 			pages = MIN(maxpages - total_bpages, pages);
-
+			pages = MAX(pages, 1);
 			if (alloc_bounce_pages(dmat, pages) < pages)
 				error = ENOMEM;
-			
+
 			if ((dmat->flags & BUS_DMA_MIN_ALLOC_COMP) == 0) {
 				if (error == 0)
 					dmat->flags |= BUS_DMA_MIN_ALLOC_COMP;
@@ -429,7 +447,9 @@
 			return (ENOMEM);
 	}
 
-	if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) {
+	if ((dmat->maxsize <= PAGE_SIZE) &&
+	   (dmat->alignment < dmat->maxsize) &&
+	    dmat->lowaddr >= ptoa(Maxmem)) {
 		*vaddr = malloc(dmat->maxsize, M_DEVBUF, mflags);
 	} else {
 		/*
@@ -459,7 +479,9 @@
 	 */
 	if (map != &nobounce_dmamap)
 		panic("bus_dmamem_free: Invalid map freed\n");
-	if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem))
+	if ((dmat->maxsize <= PAGE_SIZE) &&
+	   (dmat->alignment < dmat->maxsize) &&
+	    dmat->lowaddr >= ptoa(Maxmem))
 		free(vaddr, M_DEVBUF);
 	else {
 		contigfree(vaddr, dmat->maxsize, M_DEVBUF);
@@ -468,55 +490,37 @@
 
 #define BUS_DMAMAP_NSEGS ((64 * 1024 / PAGE_SIZE) + 1)
 
+vm_offset_t alpha_XXX_dmamap_or = 1024UL*1024UL*1024UL;  /*XXX */
+
 /*
- * Map the buffer buf into bus space using the dmamap map.
+ * Utility function to load a linear buffer.  lastaddrp holds state
+ * between invocations (for multiple-buffer loads).  segp contains
+ * the starting segment on entrace, and the ending segment on exit.
+ * first indicates if this is the first invocation of this function.
  */
-
-vm_offset_t alpha_XXX_dmamap_or = 1024UL*1024UL*1024UL;  /*XXX */
-
-int
-bus_dmamap_load(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
-		bus_size_t buflen, bus_dmamap_callback_t *callback,
-		void *callback_arg, int flags)
+static int
+_bus_dmamap_load_buffer(bus_dma_tag_t dmat,
+			bus_dmamap_t map,
+			void *buf, bus_size_t buflen,
+			pmap_t pmap,
+			int flags,
+			bus_addr_t *lastaddrp,
+			bus_dma_segment_t *segs,
+			int *segp,
+			int first)
 {
-	bus_dma_segment_t	segment;
-	vm_offset_t		vaddr;
-	vm_offset_t		paddr;
-	bus_dma_segment_t      *sg;
-	int			seg;
-	int			error;
-	vm_offset_t		nextpaddr;
-
-	error = 0;
-
-	if ((dmat->flags & BUS_DMA_ISA) && chipset.sgmap != NULL) {
-		/*
-		 * For ISA dma, we use the chipset's scatter-gather
-		 * map to map the tranfer into the ISA reachable range
-		 * of the bus address space.
-		 */
-		vaddr = trunc_page((vm_offset_t) buf);
-		dmat->segments = &segment;
-		dmat->segments[0].ds_addr =
-			map->busaddress + (vm_offset_t) buf - vaddr;
-		dmat->segments[0].ds_len = buflen;
-		buflen = round_page((vm_offset_t) buf + buflen) - vaddr;
-		sgmap_load_region(chipset.sgmap,
-				  map->busaddress,
-				  vaddr,
-				  buflen);
-		map->buflen = buflen;
-		(*callback)(callback_arg, dmat->segments, 1, error);
-		dmat->segments = NULL;
-
-		return (0);
-	}
+	bus_size_t sgsize;
+	bus_addr_t curaddr, lastaddr, baddr, bmask;
+	vm_offset_t vaddr;
+	bus_addr_t paddr;
+	int seg;
 
 	/*
 	 * If we are being called during a callback, pagesneeded will
 	 * be non-zero, so we can avoid doing the work twice.
 	 */
-	if (dmat->lowaddr < ptoa(Maxmem) && map->pagesneeded == 0) {
+	if ((map != &nobounce_dmamap && map->pagesneeded == 0)
+	 && ((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0)) {
 		vm_offset_t	vendaddr;
 
 		/*
@@ -527,11 +531,12 @@
 		vendaddr = (vm_offset_t)buf + buflen;
 
 		while (vaddr < vendaddr) {
-			paddr = pmap_kextract(vaddr);
-			if (run_filter(dmat, paddr) != 0) {
-
+			if (pmap)
+				paddr = pmap_extract(pmap, vaddr);
+			else
+				paddr = pmap_kextract(vaddr);
+			if (run_filter(dmat, paddr) != 0)
 				map->pagesneeded++;
-			}
 			vaddr += PAGE_SIZE;
 		}
 	}
@@ -550,8 +555,6 @@
 				map->dmat = dmat;
 				map->buf = buf;
 				map->buflen = buflen;
-				map->callback = callback;
-				map->callback_arg = callback_arg;
 				STAILQ_INSERT_TAIL(&bounce_map_waitinglist,
 				    map, links);
 				mtx_unlock(&bounce_lock);
@@ -562,82 +565,6 @@
 	}
 
 	vaddr = (vm_offset_t)buf;
-	sg = &dmat->segments[0];
-	seg = 1;
-	sg->ds_len = 0;
-
-	nextpaddr = 0;
-
-	do {
-		bus_size_t	size;
-
-		paddr = pmap_kextract(vaddr);
-		size = PAGE_SIZE - (paddr & PAGE_MASK);
-		if (size > buflen)
-			size = buflen;
-
-		if (map->pagesneeded != 0 && run_filter(dmat, paddr)) {
-			paddr = add_bounce_page(dmat, map, vaddr, size);
-		}
-
-		if (sg->ds_len == 0) {
-			sg->ds_addr = paddr | alpha_XXX_dmamap_or;
-			sg->ds_len = size;
-		} else if (paddr == nextpaddr) {
-			sg->ds_len += size;
-		} else {
-			/* Go to the next segment */
-			sg++;
-			seg++;
-			if (seg > dmat->nsegments)
-				break;
-			sg->ds_addr = paddr | alpha_XXX_dmamap_or;
-			sg->ds_len = size;
-		}
-		vaddr += size;
-		nextpaddr = paddr + size;
-		buflen -= size;
-
-	} while (buflen > 0);
-
-	if (buflen != 0) {
-		printf("bus_dmamap_load: Too many segs! buf_len = 0x%lx\n",
-		       buflen);
-		error = EFBIG;
-	}
-
-	(*callback)(callback_arg, dmat->segments, seg, error);
-
-	return (0);
-}
-
-/*
- * Utility function to load a linear buffer.  lastaddrp holds state
- * between invocations (for multiple-buffer loads).  segp contains
- * the starting segment on entrace, and the ending segment on exit.
- * first indicates if this is the first invocation of this function.
- */
-static int
-_bus_dmamap_load_buffer(bus_dma_tag_t dmat,
-			void *buf, bus_size_t buflen,
-			struct thread *td,
-			int flags,
-			vm_offset_t *lastaddrp,
-			bus_dma_segment_t *segs,
-			int *segp,
-			int first)
-{
-	bus_size_t sgsize;
-	bus_addr_t curaddr, lastaddr, baddr, bmask;
-	vm_offset_t vaddr = (vm_offset_t)buf;
-	int seg;
-	pmap_t pmap;
-
-	if (td != NULL)
-		pmap = vmspace_pmap(td->td_proc->p_vmspace);
-	else
-		pmap = NULL;
-
 	lastaddr = *lastaddrp;
 	bmask = ~(dmat->boundary - 1);
 
@@ -666,12 +593,20 @@
 				sgsize = (baddr - curaddr);
 		}
 
+		if (map->pagesneeded != 0 && run_filter(dmat, curaddr))
+			curaddr = add_bounce_page(dmat, map, vaddr, sgsize);
+
+		/*
+		 * Convert the physical address into an IO address.
+		 */
+		curaddr |= alpha_XXX_dmamap_or;
+
 		/*
 		 * Insert chunk into a segment, coalescing with
 		 * previous segment if possible.
 		 */
 		if (first) {
-			segs[seg].ds_addr = curaddr | alpha_XXX_dmamap_or;
+			segs[seg].ds_addr = curaddr;
 			segs[seg].ds_len = sgsize;
 			first = 0;
 		} else {
@@ -683,7 +618,7 @@
 			else {
 				if (++seg >= dmat->nsegments)
 					break;
-				segs[seg].ds_addr = curaddr | alpha_XXX_dmamap_or;
+				segs[seg].ds_addr = curaddr;
 				segs[seg].ds_len = sgsize;
 			}
 		}
@@ -703,6 +638,71 @@
 }
 
 /*
+ * Map the buffer buf into bus space using the dmamap map.
+ */
+int
+bus_dmamap_load(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
+		bus_size_t buflen, bus_dmamap_callback_t *callback,
+		void *callback_arg, int flags)
+{
+	bus_addr_t		lastaddr = 0;
+	int			error, nsegs = 0;
+
+	if ((dmat->flags & BUS_DMA_ISA) && chipset.sgmap != NULL) {
+		bus_dma_segment_t segment;
+		vm_offset_t vaddr;
+		
+		/*
+		 * For ISA dma, we use the chipset's scatter-gather
+		 * map to map the tranfer into the ISA reachable range
+		 * of the bus address space.
+		 */
+		vaddr = trunc_page((vm_offset_t) buf);
+		dmat->segments = &segment;
+		dmat->segments[0].ds_addr =
+			map->busaddress + (vm_offset_t) buf - vaddr;
+		dmat->segments[0].ds_len = buflen;
+		buflen = round_page((vm_offset_t) buf + buflen) - vaddr;
+		sgmap_load_region(chipset.sgmap,
+				  map->busaddress,
+				  vaddr,
+				  buflen);
+		map->buflen = buflen;
+		(*callback)(callback_arg, dmat->segments, 1, 0);
+		dmat->segments = NULL;
+
+		return (0);
+	}
+
+	if (map != &nobounce_dmamap) {
+		flags |= BUS_DMA_WAITOK;
+		map->callback = callback;
+		map->callback_arg = callback_arg;
+	}
+
+	error = _bus_dmamap_load_buffer(dmat, map, buf, buflen, NULL, flags,
+	     &lastaddr, dmat->segments, &nsegs, 1);
+
+	if (error == EINPROGRESS) {
+		return (error);
+	}
+
+	if (error)
+		(*callback)(callback_arg, dmat->segments, 0, error);
+	else
+		(*callback)(callback_arg, dmat->segments, nsegs + 1, 0);
+
+	/*
+	 * Return ENOMEM to the caller so that it can pass it up the stack.
+	 * This error only happens when NOWAIT is set, so deferal is disabled.
+	 */
+	if (error == ENOMEM)
+		return (error);
+
+	return (0);
+}
+
+/*
  * Like _bus_dmamap_load(), but for mbufs.
  */
 int
@@ -713,10 +713,9 @@
 {
 	int nsegs, error;
 
-	KASSERT(dmat->lowaddr >= ptoa(Maxmem) || map != NULL,
-		("bus_dmamap_load_mbuf: No support for bounce pages!"));
 	M_ASSERTPKTHDR(m0);
 
+	flags |= BUS_DMA_NOWAIT;
 	nsegs = 0;
 	error = 0;
 	if (m0->m_pkthdr.len <= dmat->maxsize) {
@@ -726,7 +725,7 @@
 
 		for (m = m0; m != NULL && error == 0; m = m->m_next) {
 			if (m->m_len > 0) {
-				error = _bus_dmamap_load_buffer(dmat,
+				error = _bus_dmamap_load_buffer(dmat, map,
 						m->m_data, m->m_len,
 						NULL, flags, &lastaddr,
 						dmat->segments, &nsegs, first);
@@ -754,10 +753,9 @@
 {
 	int error;
 
-	KASSERT(dmat->lowaddr >= ptoa(Maxmem) || map != NULL,
-		("bus_dmamap_load_mbuf: No support for bounce pages!"));
 	M_ASSERTPKTHDR(m0);
 
+	flags |= BUS_DMA_NOWAIT;
 	*nsegs = 0;
 	error = 0;
 	if (m0->m_pkthdr.len <= dmat->maxsize) {
@@ -767,7 +765,7 @@
 
 		for (m = m0; m != NULL && error == 0; m = m->m_next) {
 			if (m->m_len > 0) {
-				error = _bus_dmamap_load_buffer(dmat,
+				error = _bus_dmamap_load_buffer(dmat, map,
 						m->m_data, m->m_len,
 						NULL, flags, &lastaddr,
 						segs, nsegs, first);
@@ -795,19 +793,18 @@
 	int nsegs, error, first, i;
 	bus_size_t resid;
 	struct iovec *iov;
-	struct thread *td = NULL;
+	pmap_t pmap;
 
-	KASSERT(dmat->lowaddr >= ptoa(Maxmem) || map != NULL,
-		("bus_dmamap_load_uio: No support for bounce pages!"));
-
+	flags |= BUS_DMA_NOWAIT;
 	resid = uio->uio_resid;
 	iov = uio->uio_iov;
 
 	if (uio->uio_segflg == UIO_USERSPACE) {
-		td = uio->uio_td;
-		KASSERT(td != NULL,
+		KASSERT(uio->uio_td != NULL,
 			("bus_dmamap_load_uio: USERSPACE but no proc"));
-	}
+		pmap = vmspace_pmap(uio->uio_td->td_proc->p_vmspace);
+	} else
+		pmap = NULL;
 
 	nsegs = 0;
 	error = 0;
@@ -822,9 +819,9 @@
 		caddr_t addr = (caddr_t) iov[i].iov_base;
 
 		if (minlen > 0) {
-			error = _bus_dmamap_load_buffer(dmat, addr, minlen,
-					td, flags, &lastaddr, dmat->segments,
-					&nsegs, first);
+			error = _bus_dmamap_load_buffer(dmat, map,
+			    addr, minlen, pmap, flags, &lastaddr,
+			    dmat->segments, &nsegs, first);
 			first = 0;
 
 			resid -= minlen;

==== //depot/projects/soc2007/thioretic_gidl2/alpha/alpha/interrupt.c#2 (text+ko) ====

@@ -33,7 +33,7 @@
 
 #include 			/* RCS ID & Copyright macro defns */
 /* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.86.2.2 2006/03/10 19:37:30 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.86.2.3 2007/11/27 17:45:06 jhb Exp $");
 
 #include 
 #include 
@@ -452,7 +452,6 @@
 		    ih->ih_handler, ih->ih_argument, ih->ih_name);
 		ih->ih_handler(ih->ih_argument);
 	}
-	critical_exit();
 
 	/*
 	 * If the ithread needs to run, disable the source and schedule the
@@ -468,6 +467,7 @@
 		error = intr_event_schedule_thread(ie);
 		KASSERT(error == 0, ("got an impossible stray interrupt"));
 	}
+	critical_exit();
 	sched_unpin();
 }
 

==== //depot/projects/soc2007/thioretic_gidl2/alpha/alpha/pmap.c#3 (text+ko) ====

@@ -148,7 +148,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.178.2.7 2007/09/15 09:40:38 wilko Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.178.2.8 2007/11/05 16:17:58 ups Exp $");
 
 #include 
 #include 
@@ -1889,15 +1889,13 @@
  * but is *MUCH* faster than pmap_enter...
  */
 
-vm_page_t
-pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
-    vm_page_t mpte)
+void
+pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot)
 {
 
 	PMAP_LOCK(pmap);
-	mpte = pmap_enter_quick_locked(pmap, va, m, prot, mpte);
+	(void) pmap_enter_quick_locked(pmap, va, m, prot, NULL);
 	PMAP_UNLOCK(pmap);
-	return (mpte);
 }
 
 static vm_page_t

==== //depot/projects/soc2007/thioretic_gidl2/alpha/include/elf.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/alpha/include/elf.h,v 1.14 2003/09/25 01:10:22 peter Exp $
+ * $FreeBSD: src/sys/alpha/include/elf.h,v 1.14.10.1 2007/12/03 21:30:34 marius Exp $
  */
 
 #ifndef _MACHINE_ELF_H_
@@ -94,39 +94,6 @@
 
 #define	AT_COUNT	15	/* Count of defined aux entry types. */
 
-/*
- * Relocation types.
- */
-
-#define	R_ALPHA_NONE		0	/* No reloc */
-#define	R_ALPHA_REFLONG		1	/* Direct 32 bit */
-#define	R_ALPHA_REFQUAD		2	/* Direct 64 bit */
-#define	R_ALPHA_GPREL32		3	/* GP relative 32 bit */
-#define	R_ALPHA_LITERAL		4	/* GP relative 16 bit w/optimization */
-#define	R_ALPHA_LITUSE		5	/* Optimization hint for LITERAL */
-#define	R_ALPHA_GPDISP		6	/* Add displacement to GP */
-#define	R_ALPHA_BRADDR		7	/* PC+4 relative 23 bit shifted */
-#define	R_ALPHA_HINT		8	/* PC+4 relative 16 bit shifted */
-#define	R_ALPHA_SREL16		9	/* PC relative 16 bit */
-#define	R_ALPHA_SREL32		10	/* PC relative 32 bit */
-#define	R_ALPHA_SREL64		11	/* PC relative 64 bit */
-#define	R_ALPHA_OP_PUSH		12	/* OP stack push */
-#define	R_ALPHA_OP_STORE	13	/* OP stack pop and store */
-#define	R_ALPHA_OP_PSUB		14	/* OP stack subtract */
-#define	R_ALPHA_OP_PRSHIFT	15	/* OP stack right shift */
-#define	R_ALPHA_GPVALUE		16
-#define	R_ALPHA_GPRELHIGH	17
-#define	R_ALPHA_GPRELLOW	18
-#define	R_ALPHA_IMMED_GP_16	19
-#define	R_ALPHA_IMMED_GP_HI32	20
-#define	R_ALPHA_IMMED_SCN_HI32	21
-#define	R_ALPHA_IMMED_BR_HI32	22
-#define	R_ALPHA_IMMED_LO32	23
-#define	R_ALPHA_COPY		24	/* Copy symbol at runtime */
-#define	R_ALPHA_GLOB_DAT	25	/* Create GOT entry */
-#define	R_ALPHA_JMP_SLOT	26	/* Create PLT entry */
-#define	R_ALPHA_RELATIVE	27	/* Adjust by program base */
-
 #define R_ALPHA_COUNT		28
 
 /* Define "machine" characteristics */

==== //depot/projects/soc2007/thioretic_gidl2/alpha/isa/isa.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.36.8.2 2007/10/03 20:41:32 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.36.8.3 2007/11/02 21:40:04 wilko Exp $");
 
 #define __RMAN_RESOURCE_VISIBLE
 #include 
@@ -232,7 +232,8 @@
 	    res = rman_reserve_resource(&isa_drq_rman, start, start, 1,
 					0, child);
 	    
-	rman_set_rid(res, *rid);
+	if (res)
+		rman_set_rid(res, *rid);
 	if (res && !passthrough) {
 		rle = resource_list_find(rl, type, *rid);
 		rle->start = rman_get_start(res);

==== //depot/projects/soc2007/thioretic_gidl2/alpha/pci/pcibus.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.36.2.1 2007/10/03 20:41:33 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.36.2.2 2007/10/24 12:36:25 jhb Exp $");
 
 #include "opt_isa.h"
 
@@ -97,12 +97,7 @@
 alpha_platform_alloc_ide_intr(int chan)
 {
 	int irqs[2] = { 14, 15 };
-	struct resource *rv;
-
-	rv = isa_alloc_intr(0, 0, irqs[chan]);
-	if (rv != NULL)
-		rman_set_rid(rv, *rid);
-	return (rv);
+	return (isa_alloc_intr(0, 0, irqs[chan]));
 }
 
 int

==== //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/db_trace.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.66.2.2 2006/03/13 03:03:51 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.66.2.3 2007/11/21 16:41:51 jhb Exp $");
 
 #include 
 #include 
@@ -318,7 +318,8 @@
 	if (name != NULL) {
 		if (strcmp(name, "calltrap") == 0 ||
 		    strcmp(name, "fork_trampoline") == 0 ||
-		    strcmp(name, "nmi_calltrap") == 0)
+		    strcmp(name, "nmi_calltrap") == 0 ||
+		    strcmp(name, "Xdblfault") == 0)
 			frame_type = TRAP;

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu Dec  6 18:15:29 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0D9F416A421; Thu,  6 Dec 2007 18:15: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 922DA16A417
	for ; Thu,  6 Dec 2007 18:15:28 +0000 (UTC)
	(envelope-from thioretic@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 82ABA13C4D5
	for ; Thu,  6 Dec 2007 18:15:28 +0000 (UTC)
	(envelope-from thioretic@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB6IFSjE014253
	for ; Thu, 6 Dec 2007 18:15:28 GMT
	(envelope-from thioretic@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB6IFR7D014250
	for perforce@freebsd.org; Thu, 6 Dec 2007 18:15:27 GMT
	(envelope-from thioretic@FreeBSD.org)
Date: Thu, 6 Dec 2007 18:15:27 GMT
Message-Id: <200712061815.lB6IFR7D014250@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thioretic@FreeBSD.org using -f
From: Maxim Zhuravlev 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130355 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 06 Dec 2007 18:15:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=130355

Change 130355 by thioretic@thioretic on 2007/12/06 18:14:38

	Drivers should be able to specify whether newbus to enqueue incoming io requests
		for possible additional processing (like prioritization) for devices 
		controlled by the driver.

Affected files ...

.. //depot/projects/soc2007/thioretic_gidl2/kern/subr_bus.c#9 edit
.. //depot/projects/soc2007/thioretic_gidl2/kern/subr_busio.c#6 edit

Differences ...

==== //depot/projects/soc2007/thioretic_gidl2/kern/subr_bus.c#9 (text+ko) ====

@@ -1,5250 +1,5251 @@
-/*-
- * Copyright (c) 1997,1998,2003 Doug Rabson
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include 
-__FBSDID("$FreeBSD: src/sys/kern/subr_bus.c,v 1.184.2.5 2006/12/28 22:13:26 jhb Exp $");
-
-#include "opt_bus.h"
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-
-#include 
-
-SYSCTL_NODE(_hw, OID_AUTO, bus, CTLFLAG_RW, NULL, NULL);
-SYSCTL_NODE(, OID_AUTO, dev, CTLFLAG_RW, NULL, NULL);
-
-/*
- * Used to attach drivers to devclasses.
- */
-typedef struct driverlink *driverlink_t;
-struct driverlink {
-	kobj_class_t	driver;
-	TAILQ_ENTRY(driverlink) link;	/* list of drivers in devclass */
-};
-
-typedef struct driverinfo* driverinfo_t;
-struct driverinfo {
-	kobj_class_t	driver;	/**< kobj class, implementing driver 
-							& bus interface methods (from outer space)*/
-	kobj_class_t	drvops;	/**< kobj class, implementing driverops 
-							interface methods (from outer space)*/
-	kobj_t	topology_ops;	/**< object of class implemented by driver
-							(deeply internal:))*/
-	kobj_t	functional_ops;	/**< object of class implemented by driverops
-							(deeply internal:))*/
-	uint32_t flags;	/**< driver-specific flags (from outer space)*/
-	TAILQ_ENTRY(driverinfo) link;
-};
-
-typedef struct driverinfolink* driverinfolink_t;
-struct driverinfolink {
-	driverinfo_t pdriver;
-	void *ivars;
-	void *softc;
-#define	DF_EXTERNALSOFTC 1		/* softc not allocated by us */
-	int flags;
-	device_state_t state;
-	TAILQ_ENTRY(driverinfolink) link;
-};
-
-/*
- * Forward declarations
- */
-typedef TAILQ_HEAD(devclass_list, devclass) devclass_list_t;
-typedef TAILQ_HEAD(devclasslink_list, devclasslink) devclasslink_list_t;
-
-typedef TAILQ_HEAD(driver_list, driverlink) driver_list_t;
-
-typedef TAILQ_HEAD(device_list, device) device_list_t;
-typedef TAILQ_HEAD(devicelink_list, devicelink) devicelink_list_t;
-
-typedef TAILQ_HEAD(driverinfo_list, driverinfo) driverinfo_list_t;
-typedef TAILQ_HEAD(driverinfolink_list, driverinfolink) driverinfolink_list_t;
-
-typedef struct devclasslink* devclasslink_t;
-struct devclasslink{
-	devclass_t devclass_ptr;
-	TAILQ_ENTRY(devclasslink) link;
-};
-
-struct devclass {
-	TAILQ_ENTRY(devclass) link;
-	devclass_t	parent;		/* parent in devclass hierarchy */
-	devclasslink_list_t	filters;	/* these are used to hold information, 
-									used for non-DRL_LOWEST drivers' classes */
-	driver_list_t	drivers;     /* bus devclasses store drivers for bus */
-	char		*name;
-	device_t	*devices;	/* array of devices indexed by unit */
-	int		maxunit;	/* size of devices array */
-
-	struct sysctl_ctx_list sysctl_ctx;
+/*-
+ * Copyright (c) 1997,1998,2003 Doug Rabson
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include 
+__FBSDID("$FreeBSD: src/sys/kern/subr_bus.c,v 1.184.2.5 2006/12/28 22:13:26 jhb Exp $");
+
+#include "opt_bus.h"
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include 
+
+SYSCTL_NODE(_hw, OID_AUTO, bus, CTLFLAG_RW, NULL, NULL);
+SYSCTL_NODE(, OID_AUTO, dev, CTLFLAG_RW, NULL, NULL);
+
+/*
+ * Used to attach drivers to devclasses.
+ */
+typedef struct driverlink *driverlink_t;
+struct driverlink {
+	kobj_class_t	driver;
+	TAILQ_ENTRY(driverlink) link;	/* list of drivers in devclass */
+};
+
+typedef struct driverinfo* driverinfo_t;
+struct driverinfo {
+	kobj_class_t	driver;	/**< kobj class, implementing driver 
+							& bus interface methods (from outer space)*/
+	kobj_class_t	drvops;	/**< kobj class, implementing driverops 
+							interface methods (from outer space)*/
+	kobj_t	topology_ops;	/**< object of class implemented by driver
+							(deeply internal:))*/
+	kobj_t	functional_ops;	/**< object of class implemented by driverops
+							(deeply internal:))*/
+	uint32_t flags;	/**< driver-specific flags (from outer space)*/
+	TAILQ_ENTRY(driverinfo) link;
+};
+
+typedef struct driverinfolink* driverinfolink_t;
+struct driverinfolink {
+	driverinfo_t pdriver;
+	void *ivars;
+	void *softc;
+#define	DF_EXTERNALSOFTC 1		/* softc not allocated by us */
+	int flags;
+	device_state_t state;
+	TAILQ_ENTRY(driverinfolink) link;
+};
+
+/*
+ * Forward declarations
+ */
+typedef TAILQ_HEAD(devclass_list, devclass) devclass_list_t;
+typedef TAILQ_HEAD(devclasslink_list, devclasslink) devclasslink_list_t;
+
+typedef TAILQ_HEAD(driver_list, driverlink) driver_list_t;
+
+typedef TAILQ_HEAD(device_list, device) device_list_t;
+typedef TAILQ_HEAD(devicelink_list, devicelink) devicelink_list_t;
+
+typedef TAILQ_HEAD(driverinfo_list, driverinfo) driverinfo_list_t;
+typedef TAILQ_HEAD(driverinfolink_list, driverinfolink) driverinfolink_list_t;
+
+typedef struct devclasslink* devclasslink_t;
+struct devclasslink{
+	devclass_t devclass_ptr;
+	TAILQ_ENTRY(devclasslink) link;
+};
+
+struct devclass {
+	TAILQ_ENTRY(devclass) link;
+	devclass_t	parent;		/* parent in devclass hierarchy */
+	devclasslink_list_t	filters;	/* these are used to hold information, 
+									used for non-DRL_LOWEST drivers' classes */
+	driver_list_t	drivers;     /* bus devclasses store drivers for bus */
+	char		*name;
+	device_t	*devices;	/* array of devices indexed by unit */
+	int		maxunit;	/* size of devices array */
+
+	struct sysctl_ctx_list sysctl_ctx;
 	struct sysctl_oid *sysctl_tree;
 
 #define DC_ATTACHCHILDDEV (1<<0)
-	uint32_t flags;
-};
-
-/**
- * @brief Implementation of device.
- */
-struct device {
-	/*
-	 * A device is a kernel object. The first field must be the
-	 * current ops table for the object.
-	 */
-	KOBJ_FIELDS;	/**< !TRICK: will init it to drv_compat_ctrl_driver
-						which gonna work around stacked drivers*/
-
-	/*
-	 * Device hierarchy.
-	 */
-	TAILQ_ENTRY(device)	link;	/**< list of devices in parent */
-	TAILQ_ENTRY(device)	devlink; /**< global device list membership */
-	devicelink_list_t	parents;
-	devicelink_list_t	children;	/**< list of child devices */
-
-	/*
-	 * Details of this device.
-	 */
-	driverinfolink_t driver;	/**< current driver to be probed/attached/...*/
-	int driver_level;
-	driverinfolink_list_t drivers[DRL_LEVELS];
-	int driverinfo_flags;
-	devclass_t	devclass;	/**< current device class */
-	int		unit;		/**< current unit number */
-	char*		nameunit;	/**< name+unit e.g. foodev0 */
-	char*		desc;		/**< driver specific description */
-	int		busy;		/**< count of calls to device_busy() */
-	device_state_t	state;		/**< current device state  */
-	u_int32_t	devflags;	/**< api level flags for device_get_flags() */
-	u_short		flags;		/**< internal device flags  */
-#define	DF_ENABLED	1		/* device should be probed/attached */
-#define	DF_FIXEDCLASS	2		/* devclass specified at create time */
-#define	DF_WILDCARD	4		/* unit was originally wildcard */
-#define	DF_DESCMALLOCED	8		/* description was malloced */
-#define	DF_QUIET	16		/* don't print verbose attach message */
-#define	DF_DONENOMATCH	32		/* don't execute DEVICE_NOMATCH again */
-#define	DF_REBID	128		/* Can rebid after attach */
-#define DF_PERSISTENT	256		/* Should not delete when refs == 0*/
-	u_char	order;			/**< order from device_add_child_ordered() */
-	u_char	pad;
-	//void	*ivars;			/**< instance variables  */
-	//void	*softc;			/**< current driver's variables  */
-	u_long	refs;
-	int raw;
-
-	struct sysctl_ctx_list sysctl_ctx; /**< state for sysctl variables  */
-	struct sysctl_oid *sysctl_tree;	/**< state for sysctl variables */
-};
-
-typedef struct devicelink* devicelink_t;
-struct devicelink {
-	device_t device_ptr;
-#define DLF_ANCHOR	1
-	int flags;
-	TAILQ(devicelink) link;
-};
-
-static MALLOC_DEFINE(M_BUS, "bus", "Bus data structures");
-static MALLOC_DEFINE(M_BUS_SC, "bus-sc", "Bus data structures, softc");
-
-#ifdef BUS_DEBUG
-
-static int bus_debug = 1;
-TUNABLE_INT("bus.debug", &bus_debug);
-SYSCTL_INT(_debug, OID_AUTO, bus_debug, CTLFLAG_RW, &bus_debug, 0,
-    "Debug bus code");
-
-#define PDEBUG(a)	if (bus_debug) {printf("%s:%d: ", __func__, __LINE__), printf a; printf("\n");}
-#define DEVICENAME(d)	((d)? device_get_name(d): "no device")
-#define DRIVERNAME(d)	((d)? d->name : "no driver")
-#define DEVCLANAME(d)	((d)? d->name : "no devclass")
-
-/**
- * Produce the indenting, indent*2 spaces plus a '.' ahead of that to
- * prevent syslog from deleting initial spaces
- */
-#define indentprintf(p)	do { int iJ; printf("."); for (iJ=0; iJparent ? dc->parent->name : "";
-		break;
-	default:
-		return (EINVAL);
-	}
-	return (SYSCTL_OUT(req, value, strlen(value)));
-}
-
-static void
-devclass_sysctl_init(devclass_t dc)
-{
-
-	if (dc->sysctl_tree != NULL)
-		return;
-	sysctl_ctx_init(&dc->sysctl_ctx);
-	dc->sysctl_tree = SYSCTL_ADD_NODE(&dc->sysctl_ctx,
-	    SYSCTL_STATIC_CHILDREN(_dev), OID_AUTO, dc->name,
-	    CTLFLAG_RD, 0, "");
-	SYSCTL_ADD_PROC(&dc->sysctl_ctx, SYSCTL_CHILDREN(dc->sysctl_tree),
-	    OID_AUTO, "%parent", CTLFLAG_RD,
-	    dc, DEVCLASS_SYSCTL_PARENT, devclass_sysctl_handler, "A",
-	    "parent class");
-}
-
-enum {
-	DEVICE_SYSCTL_DESC,
-	DEVICE_SYSCTL_DRIVER,
-	DEVICE_SYSCTL_LOCATION,
-	DEVICE_SYSCTL_PNPINFO,
-	DEVICE_SYSCTL_PARENT,
-};
-
-static int
-device_sysctl_handler(SYSCTL_HANDLER_ARGS)
-{
-	device_t dev = (device_t)arg1;
-	const char *value;
-	char *buf;
-	int error;
-	int level;
-	driverinfolink_t dil;
-
-	buf = NULL;
-	switch (arg2) {
-	case DEVICE_SYSCTL_DESC:
-		value = dev->desc ? dev->desc : "";
-		break;
-	case DEVICE_SYSCTL_DRIVER:
-		value = buf = malloc(1024, M_BUS, M_WAITOK | M_ZERO);
-		buf[0]='\0';
-		for (level=DRL_LOWEST; level<=DRL_TOPMOST; level++){
-			switch(level){
-				case DRL_LOWEST:	tmpbuf="LOWEST:"; break;
-				case DRL_LOWER:	tmpbuf="LOWER:"; break;
-				case DRL_MIDDLE:	tmpbuf="MIDDLE:"; break;
-				case DRL_UPPER:	tmpbuf="UPPER:"; break;
-				case DRL_TOPMOST:	tmpbuf="TOPMOST:"; break;
-			}
-			if (strlen(tmpbuf)+strlen(buf)>1023) break;
-			TAILQ_FOREACH(dil, &((dev->drivers)[level]), link){
-				if(strlen(dil->pdriver->driver->name)+strlen(buf)>1022)
-					break;
-				strcat(buf,dil->pdriver->driver->name);
-				strcat(buf,",");
-			}
-			buf[strlen(buf)]='\0';
-			strcat(buf,"\n");
-		}
-		break;
-	case DEVICE_SYSCTL_LOCATION:
-		value = buf = malloc(1024, M_BUS, M_WAITOK | M_ZERO);
-		bus_child_location_str(dev, buf, 1024);
-		break;
-	case DEVICE_SYSCTL_PNPINFO:
-		value = buf = malloc(1024, M_BUS, M_WAITOK | M_ZERO);
-		bus_child_pnpinfo_str(dev, buf, 1024);
-		break;
-	case DEVICE_SYSCTL_PARENT:
-		value = dev->parent ? dev->parent->nameunit : "";
-		break;
-	default:
-		return (EINVAL);
-	}
-	error = SYSCTL_OUT(req, value, strlen(value));
-	if (buf != NULL)
-		free(buf, M_BUS);
-	return (error);
-}
-
-static void
-device_sysctl_init(device_t dev)
-{
-	devclass_t dc = dev->devclass;
-
-	if (dev->sysctl_tree != NULL)
-		return;
-	devclass_sysctl_init(dc);
-	sysctl_ctx_init(&dev->sysctl_ctx);
-	dev->sysctl_tree = SYSCTL_ADD_NODE(&dev->sysctl_ctx,
-	    SYSCTL_CHILDREN(dc->sysctl_tree), OID_AUTO,
-	    dev->nameunit + strlen(dc->name),
-	    CTLFLAG_RD, 0, "");
-	SYSCTL_ADD_PROC(&dev->sysctl_ctx, SYSCTL_CHILDREN(dev->sysctl_tree),
-	    OID_AUTO, "%desc", CTLFLAG_RD,
-	    dev, DEVICE_SYSCTL_DESC, device_sysctl_handler, "A",
-	    "device description");
-	SYSCTL_ADD_PROC(&dev->sysctl_ctx, SYSCTL_CHILDREN(dev->sysctl_tree),
-	    OID_AUTO, "%driver", CTLFLAG_RD,
-	    dev, DEVICE_SYSCTL_DRIVER, device_sysctl_handler, "A",
-	    "device drivers names");
-	SYSCTL_ADD_PROC(&dev->sysctl_ctx, SYSCTL_CHILDREN(dev->sysctl_tree),
-	    OID_AUTO, "%location", CTLFLAG_RD,
-	    dev, DEVICE_SYSCTL_LOCATION, device_sysctl_handler, "A",
-	    "device location relative to parent");
-	SYSCTL_ADD_PROC(&dev->sysctl_ctx, SYSCTL_CHILDREN(dev->sysctl_tree),
-	    OID_AUTO, "%pnpinfo", CTLFLAG_RD,
-	    dev, DEVICE_SYSCTL_PNPINFO, device_sysctl_handler, "A",
-	    "device identification");
-	SYSCTL_ADD_PROC(&dev->sysctl_ctx, SYSCTL_CHILDREN(dev->sysctl_tree),
-	    OID_AUTO, "%parent", CTLFLAG_RD,
-	    dev, DEVICE_SYSCTL_PARENT, device_sysctl_handler, "A",
-	    "parent device");
-}
-
-static void
-device_sysctl_fini(device_t dev)
-{
-	if (dev->sysctl_tree == NULL)
-		return;
-	sysctl_ctx_free(&dev->sysctl_ctx);
-	dev->sysctl_tree = NULL;
-}
-
-/*
- * /dev/devctl implementation
- */
-
-/*
- * This design allows only one reader for /dev/devctl.  This is not desirable
- * in the long run, but will get a lot of hair out of this implementation.
- * Maybe we should make this device a clonable device.
- *
- * Also note: we specifically do not attach a device to the device_t tree
- * to avoid potential chicken and egg problems.  One could argue that all
- * of this belongs to the root node.  One could also further argue that the
- * sysctl interface that we have not might more properly be an ioctl
- * interface, but at this stage of the game, I'm not inclined to rock that
- * boat.
- *
- * I'm also not sure that the SIGIO support is done correctly or not, as
- * I copied it from a driver that had SIGIO support that likely hasn't been
- * tested since 3.4 or 2.2.8!
- */
-
-static int sysctl_devctl_disable(SYSCTL_HANDLER_ARGS);
-static int devctl_disable = 0;
-TUNABLE_INT("hw.bus.devctl_disable", &devctl_disable);
-SYSCTL_PROC(_hw_bus, OID_AUTO, devctl_disable, CTLTYPE_INT | CTLFLAG_RW, 0, 0,
-    sysctl_devctl_disable, "I", "devctl disable");
-
-static d_open_t		devopen;
-static d_close_t	devclose;
-static d_read_t		devread;
-static d_ioctl_t	devioctl;
-static d_poll_t		devpoll;
-
-static struct cdevsw dev_cdevsw = {
-	.d_version =	D_VERSION,
-	.d_flags =	D_NEEDGIANT,
-	.d_open =	devopen,
-	.d_close =	devclose,
-	.d_read =	devread,
-	.d_ioctl =	devioctl,
-	.d_poll =	devpoll,
-	.d_name =	"devctl",
-};
-
-struct dev_event_info
-{
-	char *dei_data;
-	TAILQ_ENTRY(dev_event_info) dei_link;
-};
-
-TAILQ_HEAD(devq, dev_event_info);
-
-static struct dev_softc
-{
-	int	inuse;
-	int	nonblock;
-	struct mtx mtx;
-	struct cv cv;
-	struct selinfo sel;
-	struct devq devq;
-	struct proc *async_proc;
-} devsoftc;
-
-static struct cdev *devctl_dev;
-
-static void
-devinit(void)
-{
-	devctl_dev = make_dev(&dev_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600,
-	    "devctl");
-	mtx_init(&devsoftc.mtx, "dev mtx", "devd", MTX_DEF);
-	cv_init(&devsoftc.cv, "dev cv");
-	TAILQ_INIT(&devsoftc.devq);
-}
-
-static int
-devopen(struct cdev *dev, int oflags, int devtype, d_thread_t *td)
-{
-	if (devsoftc.inuse)
-		return (EBUSY);
-	/* move to init */
-	devsoftc.inuse = 1;
-	devsoftc.nonblock = 0;
-	devsoftc.async_proc = NULL;
-	return (0);
-}
-
-static int
-devclose(struct cdev *dev, int fflag, int devtype, d_thread_t *td)
-{
-	devsoftc.inuse = 0;
-	mtx_lock(&devsoftc.mtx);
-	cv_broadcast(&devsoftc.cv);
-	mtx_unlock(&devsoftc.mtx);
-
-	return (0);
-}
-
-/*
- * The read channel for this device is used to report changes to
- * userland in realtime.  We are required to free the data as well as
- * the n1 object because we allocate them separately.  Also note that
- * we return one record at a time.  If you try to read this device a
- * character at a time, you will loose the rest of the data.  Listening
- * programs are expected to cope.
- */
-static int
-devread(struct cdev *dev, struct uio *uio, int ioflag)
-{
-	struct dev_event_info *n1;
-	int rv;
-
-	mtx_lock(&devsoftc.mtx);
-	while (TAILQ_EMPTY(&devsoftc.devq)) {
-		if (devsoftc.nonblock) {
-			mtx_unlock(&devsoftc.mtx);
-			return (EAGAIN);
-		}
-		rv = cv_wait_sig(&devsoftc.cv, &devsoftc.mtx);
-		if (rv) {
-			/*
-			 * Need to translate ERESTART to EINTR here? -- jake
-			 */
-			mtx_unlock(&devsoftc.mtx);
-			return (rv);
-		}
-	}
-	n1 = TAILQ_FIRST(&devsoftc.devq);
-	TAILQ_REMOVE(&devsoftc.devq, n1, dei_link);
-	mtx_unlock(&devsoftc.mtx);
-	rv = uiomove(n1->dei_data, strlen(n1->dei_data), uio);
-	free(n1->dei_data, M_BUS);
-	free(n1, M_BUS);
-	return (rv);
-}
-
-static	int
-devioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, d_thread_t *td)
-{
-	switch (cmd) {
-
-	case FIONBIO:
-		if (*(int*)data)
-			devsoftc.nonblock = 1;
-		else
-			devsoftc.nonblock = 0;
-		return (0);
-	case FIOASYNC:
-		if (*(int*)data)
-			devsoftc.async_proc = td->td_proc;
-		else
-			devsoftc.async_proc = NULL;
-		return (0);
-
-		/* (un)Support for other fcntl() calls. */
-	case FIOCLEX:
-	case FIONCLEX:
-	case FIONREAD:
-	case FIOSETOWN:
-	case FIOGETOWN:
-	default:
-		break;
-	}
-	return (ENOTTY);
-}
-
-static	int
-devpoll(struct cdev *dev, int events, d_thread_t *td)
-{
-	int	revents = 0;
-
-	mtx_lock(&devsoftc.mtx);
-	if (events & (POLLIN | POLLRDNORM)) {
-		if (!TAILQ_EMPTY(&devsoftc.devq))
-			revents = events & (POLLIN | POLLRDNORM);
-		else
-			selrecord(td, &devsoftc.sel);
-	}
-	mtx_unlock(&devsoftc.mtx);
-
-	return (revents);
-}
-
-/**
- * @brief Queue data to be read from the devctl device
- *
- * Generic interface to queue data to the devctl device.  It is
- * assumed that @p data is properly formatted.  It is further assumed
- * that @p data is allocated using the M_BUS malloc type.
- */
-void
-devctl_queue_data(char *data)
-{
-	struct dev_event_info *n1 = NULL;
-	struct proc *p;
-
-	n1 = malloc(sizeof(*n1), M_BUS, M_NOWAIT);
-	if (n1 == NULL)
-		return;
-	n1->dei_data = data;
-	mtx_lock(&devsoftc.mtx);
-	TAILQ_INSERT_TAIL(&devsoftc.devq, n1, dei_link);
-	cv_broadcast(&devsoftc.cv);
-	mtx_unlock(&devsoftc.mtx);
-	selwakeup(&devsoftc.sel);
-	p = devsoftc.async_proc;
-	if (p != NULL) {
-		PROC_LOCK(p);
-		psignal(p, SIGIO);
-		PROC_UNLOCK(p);
-	}
-}
-
-/**
- * @brief Send a 'notification' to userland, using standard ways
- */
-void
-devctl_notify(const char *system, const char *subsystem, const char *type,
-    const char *data)
-{
-	int len = 0;
-	char *msg;
-
-	if (system == NULL)
-		return;		/* BOGUS!  Must specify system. */
-	if (subsystem == NULL)
-		return;		/* BOGUS!  Must specify subsystem. */
-	if (type == NULL)
-		return;		/* BOGUS!  Must specify type. */
-	len += strlen(" system=") + strlen(system);
-	len += strlen(" subsystem=") + strlen(subsystem);
-	len += strlen(" type=") + strlen(type);
-	/* add in the data message plus newline. */
-	if (data != NULL)
-		len += strlen(data);
-	len += 3;	/* '!', '\n', and NUL */
-	msg = malloc(len, M_BUS, M_NOWAIT);
-	if (msg == NULL)
-		return;		/* Drop it on the floor */
-	if (data != NULL)
-		snprintf(msg, len, "!system=%s subsystem=%s type=%s %s\n",
-		    system, subsystem, type, data);
-	else
-		snprintf(msg, len, "!system=%s subsystem=%s type=%s\n",
-		    system, subsystem, type);
-	devctl_queue_data(msg);
-}
-
-/*
- * Common routine that tries to make sending messages as easy as possible.
- * We allocate memory for the data, copy strings into that, but do not
- * free it unless there's an error.  The dequeue part of the driver should
- * free the data.  We don't send data when the device is disabled.  We do
- * send data, even when we have no listeners, because we wish to avoid
- * races relating to startup and restart of listening applications.
- *
- * devaddq is designed to string together the type of event, with the
- * object of that event, plus the plug and play info and location info
- * for that event.  This is likely most useful for devices, but less
- * useful for other consumers of this interface.  Those should use
- * the devctl_queue_data() interface instead.
- */
-static void
-devaddq(const char *type, const char *what, device_t dev)
-{
-	char *data = NULL;
-	char *loc = NULL;
-	char *pnp = NULL;
-	const char *parstr;
-
-	if (devctl_disable)
-		return;
-	data = malloc(1024, M_BUS, M_NOWAIT);
-	if (data == NULL)
-		goto bad;
-
-	/* get the bus specific location of this device */
-	loc = malloc(1024, M_BUS, M_NOWAIT);
-	if (loc == NULL)
-		goto bad;
-	*loc = '\0';
-	bus_child_location_str(dev, loc, 1024);
-
-	/* Get the bus specific pnp info of this device */
-	pnp = malloc(1024, M_BUS, M_NOWAIT);
-	if (pnp == NULL)
-		goto bad;
-	*pnp = '\0';
-	bus_child_pnpinfo_str(dev, pnp, 1024);
-
-	/* Get the parent of this device, or / if high enough in the tree. */
-	if (device_get_parent(dev) == NULL)
-		parstr = ".";	/* Or '/' ? */
-	else
-		parstr = device_get_nameunit(device_get_parent(dev));
-	/* String it all together. */
-	snprintf(data, 1024, "%s%s at %s %s on %s\n", type, what, loc, pnp,
-	  parstr);
-	free(loc, M_BUS);
-	free(pnp, M_BUS);
-	devctl_queue_data(data);
-	return;
-bad:
-	free(pnp, M_BUS);
-	free(loc, M_BUS);
-	free(data, M_BUS);
-	return;
-}
-
-/*
- * A device was added to the tree.  We are called just after it successfully
- * attaches (that is, probe and attach success for this device).  No call
- * is made if a device is merely parented into the tree.  See devnomatch
- * if probe fails.  If attach fails, no notification is sent (but maybe
- * we should have a different message for this).
- */
-static void
-devadded(device_t dev)
-{
-	char *pnp = NULL;
-	char *tmp = NULL;
-
-	pnp = malloc(1024, M_BUS, M_NOWAIT);
-	if (pnp == NULL)
-		goto fail;
-	tmp = malloc(1024, M_BUS, M_NOWAIT);
-	if (tmp == NULL)
-		goto fail;
-	*pnp = '\0';
-	bus_child_pnpinfo_str(dev, pnp, 1024);
-	snprintf(tmp, 1024, "%s %s", device_get_nameunit(dev), pnp);
-	devaddq("+", tmp, dev);
-fail:
-	if (pnp != NULL)
-		free(pnp, M_BUS);
-	if (tmp != NULL)
-		free(tmp, M_BUS);
-	return;
-}
-
-/*
- * A device was removed from the tree.  We are called just before this
- * happens.
- */
-static void
-devremoved(device_t dev)
-{
-	char *pnp = NULL;
-	char *tmp = NULL;
-
-	pnp = malloc(1024, M_BUS, M_NOWAIT);
-	if (pnp == NULL)
-		goto fail;
-	tmp = malloc(1024, M_BUS, M_NOWAIT);
-	if (tmp == NULL)
-		goto fail;
-	*pnp = '\0';
-	bus_child_pnpinfo_str(dev, pnp, 1024);
-	snprintf(tmp, 1024, "%s %s", device_get_nameunit(dev), pnp);
-	devaddq("-", tmp, dev);
-fail:
-	if (pnp != NULL)
-		free(pnp, M_BUS);
-	if (tmp != NULL)
-		free(tmp, M_BUS);
-	return;
-}
-
-/*
- * Called when there's no match for this device.  This is only called
- * the first time that no match happens, so we don't keep getitng this
- * message.  Should that prove to be undesirable, we can change it.
- * This is called when all drivers that can attach to a given bus
- * decline to accept this device.  Other errrors may not be detected.
- */
-static void
-devnomatch(device_t dev)
-{
-	devaddq("?", "", dev);
-}
-
-static int
-sysctl_devctl_disable(SYSCTL_HANDLER_ARGS)
-{
-	struct dev_event_info *n1;
-	int dis, error;
-
-	dis = devctl_disable;
-	error = sysctl_handle_int(oidp, &dis, 0, req);
-	if (error || !req->newptr)
-		return (error);
-	mtx_lock(&devsoftc.mtx);
-	devctl_disable = dis;
-	if (dis) {
-		while (!TAILQ_EMPTY(&devsoftc.devq)) {
-			n1 = TAILQ_FIRST(&devsoftc.devq);
-			TAILQ_REMOVE(&devsoftc.devq, n1, dei_link);
-			free(n1->dei_data, M_BUS);
-			free(n1, M_BUS);
-		}
-	}
-	mtx_unlock(&devsoftc.mtx);
-	return (0);
-}
-
-/* End of /dev/devctl code */
-
-TAILQ_HEAD(,device)	bus_data_devices;
-static int bus_data_generation = 1;
-
-kobj_method_t null_methods[] = {
-	{ 0, 0 }
-};
-
-DEFINE_CLASS(null, null_methods, 0);
-
-/*
- * Driver compatibility layer implementation
- */
-
-static driverinfo_list_t driverinfos = TAILQ_HEAD_INITIALIZER(driverinfos);
-
-/**
- * @internal
- * 
- * Is used, when a driver s used in an API function, 
- * but is not in driverinfos. Eg. may happen, if 
- * device_set_driver is called by a bus with driver, set
- * to kobj_class, which wasn't registered by DRIVER_MODULE(). 
- */
-static drv_internal_t
-driverinfo_create_driver_drv_internal (driver_t *driver){
-	drv_internal_t new_drv;
-
-	new_drv = malloc (sizeof(struct drv_internal), M_TEMP, M_NOWAIT|M_ZERO);
-	if (new_drv){
-		new_drv.devops = driver;
-		new_drv.flags = DR_LOWEST;
-	}
-	return (new_drv);
-}
-/**
- * @internal
- * @brief Find or add driver compatibility settings
- * 
- * If a driver is already present in compatibility layer
- * return it, else, if @p add non-zero, add it.
- * 
- * @param driver	the device class and flags
- * @param add	non-zero to add driver to layer
- */
-static driverinfo_t
-driverinfo_find_internal (drv_internal_t driver, int add) {
-	driverinfo_t di;
-	
-	PDEBUG(("looking for driver %s to compatibility layer", driver->devops->name));
-	if (!driver)
-		return (NULL);
-	
-	TAILQ_FOREACH(di, &driverinfos, link){
-		if (driver->devops == di->driver)
-			break;
-	}
-	
-	if (!di && add){

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu Dec  6 19:09:28 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 84E4616A421; Thu,  6 Dec 2007 19:09: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 102E116A418
	for ; Thu,  6 Dec 2007 19:09:28 +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 0202913C442
	for ; Thu,  6 Dec 2007 19:09:28 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB6J9R11026986
	for ; Thu, 6 Dec 2007 19:09:27 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB6J9R9D026983
	for perforce@freebsd.org; Thu, 6 Dec 2007 19:09:27 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Thu, 6 Dec 2007 19:09:27 GMT
Message-Id: <200712061909.lB6J9R9D026983@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 130358 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 06 Dec 2007 19:09:28 -0000

http://perforce.freebsd.org/chv.cgi?CH=130358

Change 130358 by hselasky@hselasky_laptop001 on 2007/12/06 19:09:06

	
	Some steps closer to full USB device side support.
	
	o Internal flag "is_dci" was renamed "usb_mode".
	o Reworked "usbd_get_pipe()" to support new flag: "no_pipe_ok".
	o Updated documentation.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/README#24 edit
.. //depot/projects/usb/src/sys/dev/usb/usb.h#21 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#66 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#62 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/README#24 (text+ko) ====

@@ -135,21 +135,20 @@
  *                     n_setup, priv_sc, priv_mtx)
  *------------------------------------------------------------------------*/
 
-- "udev" is a pointer to "struct usbd_device"
+- "udev" is a pointer to "struct usbd_device".
 
-- "iface_index" is the interface index number
+- "iface_index" is the interface index number.
 
 - "pxfer" is a pointer to an array of USB transfer pointers that are
-  initialized to NULL, and then pointed to the allocated DMA-able USB
-  transfers
+  initialized to NULL, and then pointed to allocated USB transfers.
 
-- "setup_start" is a pointer to an array of USB config structures
+- "setup_start" is a pointer to an array of USB config structures.
 
 - "n_setup" is a number telling the USB system how many USB transfers
-  should be setup
+  should be setup.
 
 - "priv_sc" is the private softc pointer, which will be used to
-  initialize "xfer->priv_sc"
+  initialize "xfer->priv_sc".
 
 - "priv_mtx" is the private mutex protecting the transfer structure and
   the softc. This pointer is used to initialize "xfer->priv_mtx".
@@ -206,9 +205,14 @@
   0xFF, "-1" or "UE_ADDR_ANY" will select the first matching endpoint.
   This field is mandatory.
 
-- The "direction" field selects the USB endpoint direction. A value of 0xFF,
-  "-1" or "UE_DIR_ANY" will select the first matching endpoint. Else valid
-  values are: "UE_DIR_IN" and "UE_DIR_OUT". This field is mandatory.
+- The "direction" field selects the USB endpoint direction. A value of
+  "UE_DIR_ANY" will select the first matching endpoint. Else valid
+  values are: "UE_DIR_IN" and "UE_DIR_OUT". "UE_DIR_IN" and
+  "UE_DIR_OUT" can be binary ORed by "UE_DIR_SID" which means that the
+  direction will be swapped in case of USB_MODE_DEVICE. Note that
+  "UE_DIR_IN" refers to the data transfer direction of the "IN" tokens
+  and "UE_DIR_OUT" refers to the data transfer direction of the "OUT"
+  tokens. This field is mandatory.
 
 - The "interval" field selects the interrupt interval. The value of this 
   field is given in milliseconds and is independent of device speed. Depending
@@ -310,8 +314,8 @@
 	during operation.
 
   ext_buffer
-	Setting this flag will cause that no DMA data buffer will be
-	allocated. Instead the USB client can use its own DMA buffer.
+	Setting this flag will cause that no data buffer will be
+	allocated. Instead the USB client must supply a data buffer.
 	This flag can not be changed during operation.
 
   manual_status
@@ -321,6 +325,10 @@
 	transfers. This flag is mostly useful for the USB device side.
 	This flag can be changed during operation.
 
+  no_pipe_ok
+	Setting this flag causes the USBD_NO_PIPE error to be
+	ignored. This flag can not be changed during operation.
+
 - The "bufsize" field sets the total buffer size in bytes. If
   this field is zero, "wMaxPacketSize" will be used, multiplied by the
   "frames" field if the transfer type is ISOCHRONOUS. This is useful for

==== //depot/projects/usb/src/sys/dev/usb/usb.h#21 (text+ko) ====

@@ -253,6 +253,8 @@
 #define	UE_SET_DIR(a,d)	((a) | (((d)&1) << 7))
 #define	UE_DIR_IN	0x80
 #define	UE_DIR_OUT	0x00
+#define	UE_DIR_SID	0x40		/* Swap If Device - for internal use
+					 * only! */
 #define	UE_DIR_ANY	0xff		/* for internal use only! */
 #define	UE_ADDR		0x0f
 #define	UE_ADDR_ANY	0xff		/* for internal use only! */

==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#66 (text+ko) ====

@@ -72,8 +72,8 @@
     N_USBD_STATUS);
 
 #define	USBD_GET_STATE(xfer) ((xfer)->usb_state)
-#define	USBD_GET_DATA_ISREAD(xfer) ((xfer)->flags_int.is_dci ?	\
-	((xfer->endpoint & UE_DIR_IN) ? 0 : 1) :		\
+#define	USBD_GET_DATA_ISREAD(xfer) (((xfer)->flags_int.usb_mode == \
+	USB_MODE_DEVICE) ? ((xfer->endpoint & UE_DIR_IN) ? 0 : 1) : \
 	((xfer->endpoint & UE_DIR_IN) ? 1 : 0))
 
 #undef LIST_PREV
@@ -114,6 +114,13 @@
 
 typedef void (usbd_std_root_transfer_func_t)(struct usbd_xfer *, struct usbd_std_root_transfer *);
 
+/* USB modes */
+
+enum {
+	USB_MODE_HOST = 0,		/* default */
+	USB_MODE_DEVICE = 1,
+};
+
 /* Standard root transfer function state argument values */
 
 enum {
@@ -336,6 +343,8 @@
 	uint8_t	hs_hub_addr;		/* high-speed HUB address */
 	uint8_t	hs_port_no;		/* high-speed HUB port number */
 	uint8_t	driver_added_refcount;
+	uint8_t	usb_mode:1;		/* USB mode (see USB_MODE_XXX) */
+	uint8_t	unused:7;
 
 	usb_endpoint_descriptor_t default_ep_desc;	/* for pipe 0 */
 	usb_device_descriptor_t ddesc;	/* device descriptor */
@@ -374,6 +383,8 @@
 	uint8_t	ext_buffer:1;		/* uses external DMA buffer */
 	uint8_t	manual_status:1;	/* non automatic status stage on
 					 * control transfers */
+	uint8_t	no_pipe_ok:1;		/* set if "USBD_NO_PIPE" error can be
+					 * ignored */
 };
 
 struct usbd_xfer_flags_int {
@@ -397,8 +408,7 @@
 					 * should not do the BUS-DMA post sync
 					 * operation */
 	uint8_t	isochronous_xfr:1;	/* set if isochronous transfer */
-	uint8_t	is_dci:1;		/* set if hardware is a device
-					 * controller interface */
+	uint8_t	usb_mode:1;		/* shadow copy of "udev->usb_mode" */
 };
 
 struct usbd_config {

==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#62 (text+ko) ====

@@ -162,14 +162,61 @@
 	struct usbd_pipe *pipe = udev->pipes;
 	struct usbd_pipe *pipe_end = udev->pipes_end;
 	uint8_t index = setup->index;
-	uint8_t ea;
-	uint8_t at;
+	uint8_t ea_mask;
+	uint8_t ea_val;
+	uint8_t type_mask;
+	uint8_t type_val;
 
 	PRINTFN(8, ("udev=%p iface_index=%d address=0x%x "
 	    "type=0x%x dir=0x%x index=%d\n",
 	    udev, iface_index, setup->endpoint,
 	    setup->type, setup->direction, setup->index));
 
+	/* setup expected endpoint direction mask and value */
+
+	if (setup->direction == UE_DIR_ANY) {
+		/* match any endpoint direction */
+		ea_mask = 0;
+		ea_val = 0;
+	} else {
+		/* match the given endpoint direction */
+		ea_mask = (UE_DIR_IN | UE_DIR_OUT);
+		ea_val = (setup->direction & (UE_DIR_IN | UE_DIR_OUT));
+
+		/* swap endpoint direction, if device */
+		if (setup->direction & UE_DIR_SID) {
+			if (udev->usb_mode == USB_MODE_DEVICE) {
+				ea_val ^= (UE_DIR_IN | UE_DIR_OUT);
+			}
+		}
+	}
+
+	/* setup expected endpoint address */
+
+	if (setup->endpoint == UE_ADDR_ANY) {
+		/* match any endpoint address */
+	} else {
+		/* match the given endpoint address */
+		ea_mask |= UE_ADDR;
+		ea_val |= (setup->endpoint & UE_ADDR);
+	}
+
+	/* setup expected endpoint type */
+
+	if (setup->type == UE_BULK_INTR) {
+		/* this will match BULK and INTERRUPT endpoints */
+		type_mask = 2;
+		type_val = 2;
+	} else if (setup->type == UE_TYPE_ANY) {
+		/* match any endpoint type */
+		type_mask = 0;
+		type_val = 0;
+	} else {
+		/* match the given endpoint type */
+		type_mask = UE_XFERTYPE;
+		type_val = (setup->type & UE_XFERTYPE);
+	}
+
 	/* NOTE: pipes are searched from the beginning */
 
 	for (; pipe != pipe_end; pipe++) {
@@ -178,17 +225,10 @@
 		    (pipe->iface_index != iface_index)) {
 			continue;
 		}
-		ea = pipe->edesc->bEndpointAddress;
-		at = pipe->edesc->bmAttributes;
+		/* do the masks and check the values */
 
-		if (((setup->direction == (ea & (UE_DIR_IN | UE_DIR_OUT))) ||
-		    (setup->direction == UE_DIR_ANY)) &&
-		    ((setup->endpoint == (ea & UE_ADDR)) ||
-		    (setup->endpoint == UE_ADDR_ANY)) &&
-		    ((setup->type == (at & UE_XFERTYPE)) ||
-		    (setup->type == UE_TYPE_ANY) ||
-		    ((setup->type == UE_BULK_INTR) && (at & 2)))) {
-
+		if (((pipe->edesc->bEndpointAddress & ea_mask) == ea_val) &&
+		    ((pipe->edesc->bmAttributes & type_mask) == type_val)) {
 			if (!index--) {
 				goto found;
 			}
@@ -200,9 +240,9 @@
 	 * address" and "any direction" returns the first pipe of the
 	 * interface. "iface_index" and "direction" is ignored:
 	 */
-	if ((setup->endpoint == 0) &&
-	    (setup->type == 0) &&
-	    (udev->default_pipe.edesc) &&
+	if ((udev->default_pipe.edesc) &&
+	    ((udev->default_pipe.edesc->bEndpointAddress & ea_mask) == ea_val) &&
+	    ((udev->default_pipe.edesc->bmAttributes & type_mask) == type_val) &&
 	    (!index)) {
 		pipe = &udev->default_pipe;
 		goto found;
@@ -320,6 +360,7 @@
 	xfer->endpoint = edesc->bEndpointAddress;
 	xfer->max_packet_size = UGETW(edesc->wMaxPacketSize);
 	xfer->max_packet_count = 1;
+	xfer->flags_int.usb_mode = parm->udev->usb_mode;	/* make a shadow copy */
 
 	parm->bufsize = setup->bufsize;
 
@@ -666,6 +707,7 @@
 	struct usbd_setup_params parm;
 	const struct usbd_config *setup_end = setup_start + n_setup;
 	const struct usbd_config *setup;
+	struct usbd_pipe *pipe;
 	struct usbd_memory_info *info;
 	struct usbd_xfer *xfer;
 	void *buf = NULL;
@@ -746,6 +788,15 @@
 		for (setup = setup_start, n = 0;
 		    setup != setup_end; setup++, n++) {
 
+			/* see if there is a matching endpoint */
+			pipe = usbd_get_pipe(udev, iface_index, setup);
+			if (!pipe) {
+				if (setup->flags.no_pipe_ok) {
+					continue;
+				}
+				parm.err = USBD_NO_PIPE;
+				goto done;
+			}
 			/* store current setup pointer */
 			parm.curr_setup = setup;
 
@@ -776,12 +827,8 @@
 
 			parm.size[0] += sizeof(xfer[0]);
 
-			xfer->pipe = usbd_get_pipe(udev, iface_index, setup);
+			xfer->pipe = pipe;
 
-			if (!xfer->pipe) {
-				parm.err = USBD_NO_PIPE;
-				goto done;
-			}
 			if (buf) {
 				xfer->pipe->refcount++;
 			}
@@ -1579,7 +1626,7 @@
 	if (xfer->flags_int.control_xfr &&
 	    xfer->flags_int.control_hdr) {
 		/* special case */
-		if (xfer->flags_int.is_dci) {
+		if (xfer->flags_int.usb_mode == USB_MODE_DEVICE) {
 			xfer->frbuffers[0].isread = 0;
 		} else {
 			xfer->frbuffers[0].isread = 1;

From owner-p4-projects@FreeBSD.ORG  Fri Dec  7 05:28:38 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 51A1316A46C; Fri,  7 Dec 2007 05:28:38 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F0F3D16A418
	for ; Fri,  7 Dec 2007 05:28:37 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DFA4513C45D
	for ; Fri,  7 Dec 2007 05:28:37 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB75SbGM070243
	for ; Fri, 7 Dec 2007 05:28:37 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB75SbIr070240
	for perforce@freebsd.org; Fri, 7 Dec 2007 05:28:37 GMT
	(envelope-from kmacy@freebsd.org)
Date: Fri, 7 Dec 2007 05:28:37 GMT
Message-Id: <200712070528.lB75SbIr070240@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130391 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 07 Dec 2007 05:28:38 -0000

http://perforce.freebsd.org/chv.cgi?CH=130391

Change 130391 by kmacy@entropy_kmacy_xen31 on 2007/12/07 05:27:38

	IFC 130385

Affected files ...

.. //depot/projects/xen31/lib/libkse/thread/thr_kern.c#4 integrate
.. //depot/projects/xen31/release/fixit.profile#2 integrate
.. //depot/projects/xen31/share/man/man4/aac.4#3 integrate
.. //depot/projects/xen31/sys/arm/arm/pmap.c#5 integrate
.. //depot/projects/xen31/sys/compat/freebsd32/freebsd32.h#2 integrate
.. //depot/projects/xen31/sys/compat/freebsd32/freebsd32_ipc.h#1 branch
.. //depot/projects/xen31/sys/compat/freebsd32/freebsd32_misc.c#3 integrate
.. //depot/projects/xen31/sys/compat/freebsd32/freebsd32_proto.h#2 integrate
.. //depot/projects/xen31/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate
.. //depot/projects/xen31/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate
.. //depot/projects/xen31/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate
.. //depot/projects/xen31/sys/compat/freebsd32/syscalls.master#2 integrate
.. //depot/projects/xen31/sys/dev/aac/aac.c#3 integrate
.. //depot/projects/xen31/sys/dev/aac/aac_pci.c#3 integrate
.. //depot/projects/xen31/sys/dev/aac/aacvar.h#2 integrate
.. //depot/projects/xen31/sys/fs/tmpfs/tmpfs_subr.c#3 integrate
.. //depot/projects/xen31/sys/fs/tmpfs/tmpfs_vfsops.c#4 integrate
.. //depot/projects/xen31/sys/geom/geom_bsd.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_module.c#2 integrate
.. //depot/projects/xen31/sys/net/if_var.h#2 integrate
.. //depot/projects/xen31/sys/net/route.c#3 integrate
.. //depot/projects/xen31/sys/net80211/ieee80211.c#3 integrate
.. //depot/projects/xen31/sys/net80211/ieee80211_output.c#4 integrate
.. //depot/projects/xen31/sys/netinet/in_pcb.h#2 integrate
.. //depot/projects/xen31/sys/netinet/libalias/alias_util.c#3 integrate
.. //depot/projects/xen31/sys/netinet/sctp_output.c#5 integrate
.. //depot/projects/xen31/sys/netinet/sctp_usrreq.c#4 integrate
.. //depot/projects/xen31/sys/netinet/sctputil.c#5 integrate
.. //depot/projects/xen31/sys/netinet/tcp_syncache.c#7 integrate
.. //depot/projects/xen31/sys/netinet/tcp_var.h#2 integrate
.. //depot/projects/xen31/sys/netinet6/in6.c#2 integrate
.. //depot/projects/xen31/sys/sys/param.h#8 integrate
.. //depot/projects/xen31/sys/sys/ucred.h#2 integrate
.. //depot/projects/xen31/usr.bin/kdump/kdump.c#2 integrate

Differences ...

==== //depot/projects/xen31/lib/libkse/thread/thr_kern.c#4 (text+ko) ====

@@ -33,7 +33,7 @@
  *
  */
 #include 
-__FBSDID("$FreeBSD: src/lib/libkse/thread/thr_kern.c,v 1.127 2007/11/30 17:16:14 deischen Exp $");
+__FBSDID("$FreeBSD: src/lib/libkse/thread/thr_kern.c,v 1.128 2007/12/06 06:04:01 deischen Exp $");
 
 #include 
 #include 
@@ -361,6 +361,19 @@
 	curthread->kse->k_kcb->kcb_kmbx.km_curthread = NULL;
 	curthread->attr.flags |= PTHREAD_SCOPE_SYSTEM;
 
+	/*
+	 * After a fork, it is possible that an upcall occurs in
+	 * the parent KSE that fork()'d before the child process
+	 * is fully created and before its vm space is copied.
+	 * During the upcall, the tcb is set to null or to another
+	 * thread, and this is what gets copied in the child process
+	 * when the vm space is cloned sometime after the upcall
+	 * occurs.  Note that we shouldn't have to set the kcb, but
+	 * we do it for completeness.
+	 */
+	_kcb_set(curthread->kse->k_kcb);
+	_tcb_set(curthread->kse->k_kcb, curthread->tcb);
+
 	/* After a fork(), there child should have no pending signals. */
 	sigemptyset(&curthread->sigpend);
 

==== //depot/projects/xen31/release/fixit.profile#2 (text+ko) ====

@@ -1,5 +1,5 @@
 :
-# $FreeBSD: src/release/fixit.profile,v 1.10 2004/09/02 13:40:34 keramida Exp $
+# $FreeBSD: src/release/fixit.profile,v 1.11 2007/12/06 20:25:31 lulf Exp $
 
 export BLOCKSIZE=K
 export PS1="Fixit# "
@@ -8,6 +8,8 @@
 export SCSI_MODES="/mnt2/usr/share/misc/scsi_modes"
 # the root MFS doesn't have /dev/nrsa0, pick a better default for mt(1)
 export TAPE=/mnt2/dev/nrsa0
+# make geom(8) utilities find their modules
+export GEOM_LIBRARY_PATH="/mnt2/lib/geom"
 
 alias ls="ls -F"
 alias ll="ls -l"

==== //depot/projects/xen31/share/man/man4/aac.4#3 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/aac.4,v 1.38 2007/11/29 18:53:11 emaste Exp $
+.\" $FreeBSD: src/share/man/man4/aac.4,v 1.39 2007/12/06 18:31:57 emaste Exp $
 .Dd November 29, 2007
 .Dt AAC 4
 .Os
@@ -123,8 +123,16 @@
 .It
 Adaptec RAID 51205
 .It
+Adaptec RAID 51245
+.It
 Adaptec RAID 51605
 .It
+Adaptec RAID 51645
+.It
+Adaptec RAID 52445
+.It
+Adaptec RAID 5405
+.It
 Adaptec RAID 5445
 .It
 Adaptec RAID 5805
@@ -242,6 +250,26 @@
 Legend S220
 .It
 Legend S230
+.It
+Sun STK RAID REM
+.It
+Sun STK RAID EM
+.It
+SG-XPCIESAS-R-IN
+.It
+SG-XPCIESAS-R-EX
+.It
+AOC-USAS-S4i
+.It
+AOC-USAS-S8i
+.It
+AOC-USAS-S4iR
+.It
+AOC-USAS-S8iR
+.It
+AOC-USAS-S8i-LP
+.It
+AOC-USAS-S8iR-LP
 .El
 .Sh FILES
 .Bl -tag -width /boot/kernel/aac.ko -compact

==== //depot/projects/xen31/sys/arm/arm/pmap.c#5 (text+ko) ====

@@ -147,7 +147,7 @@
 #include "opt_vm.h"
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.90 2007/12/02 15:26:30 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.91 2007/12/06 23:17:24 cognet Exp $");
 #include 
 #include 
 #include 
@@ -1733,7 +1733,7 @@
 			pg->md.krw_mappings++;
 		else
 			pg->md.kro_mappings++;
-	} 
+	} else
 	if (flags & PVF_WRITE)
 		pg->md.urw_mappings++;
 	else

==== //depot/projects/xen31/sys/compat/freebsd32/freebsd32.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32.h,v 1.6 2006/09/22 15:04:28 davidxu Exp $
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32.h,v 1.7 2007/12/06 23:11:27 jhb Exp $
  */
 
 #ifndef _COMPAT_FREEBSD32_FREEBSD32_H_
@@ -75,6 +75,11 @@
 	int32_t	ru_nivcsw;
 };
 
+struct itimerval32 {
+	struct timeval32 it_interval;
+	struct timeval32 it_value;
+};
+
 #define FREEBSD4_MNAMELEN        (88 - 2 * sizeof(int32_t)) /* size of on/from name bufs */
 
 /* 4.x version */
@@ -103,6 +108,57 @@
 	int32_t f_spare[2];
 };
 
+struct kevent32 {
+	u_int32_t	ident;		/* identifier for this event */
+	short		filter;		/* filter for event */
+	u_short		flags;
+	u_int		fflags;
+	int32_t		data;
+	u_int32_t	udata;		/* opaque user data identifier */
+};
+
+struct iovec32 {
+	u_int32_t iov_base;
+	int	iov_len;
+};
+
+struct msghdr32 {
+	u_int32_t	 msg_name;
+	socklen_t	 msg_namelen;
+	u_int32_t	 msg_iov;
+	int		 msg_iovlen;
+	u_int32_t	 msg_control;
+	socklen_t	 msg_controllen;
+	int		 msg_flags;
+};
+
+struct stat32 {
+	dev_t	st_dev;
+	ino_t	st_ino;
+	mode_t	st_mode;
+	nlink_t	st_nlink;
+	uid_t	st_uid;
+	gid_t	st_gid;
+	dev_t	st_rdev;
+	struct timespec32 st_atimespec;
+	struct timespec32 st_mtimespec;
+	struct timespec32 st_ctimespec;
+	off_t	st_size;
+	int64_t	st_blocks;
+	u_int32_t st_blksize;
+	u_int32_t st_flags;
+	u_int32_t st_gen;
+	struct timespec32 st_birthtimespec;
+	unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec32));
+	unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec32));
+};
+
+struct sigaction32 {
+	u_int32_t	sa_u;
+	int		sa_flags;
+	sigset_t	sa_mask;
+};
+
 struct thr_param32 {
 	uint32_t start_func;
 	uint32_t arg;

==== //depot/projects/xen31/sys/compat/freebsd32/freebsd32_misc.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.68 2007/12/04 20:25:41 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.71 2007/12/06 23:35:29 jhb Exp $");
 
 #include "opt_compat.h"
 
@@ -71,6 +71,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 
 #include 
@@ -85,14 +87,25 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 
 CTASSERT(sizeof(struct timeval32) == 8);
 CTASSERT(sizeof(struct timespec32) == 8);
+CTASSERT(sizeof(struct itimerval32) == 16);
 CTASSERT(sizeof(struct statfs32) == 256);
 CTASSERT(sizeof(struct rusage32) == 72);
+CTASSERT(sizeof(struct sigaltstack32) == 12);
+CTASSERT(sizeof(struct kevent32) == 20);
+CTASSERT(sizeof(struct iovec32) == 8);
+CTASSERT(sizeof(struct msghdr32) == 28);
+CTASSERT(sizeof(struct stat32) == 96);
+CTASSERT(sizeof(struct sigaction32) == 24);
 
+static int freebsd32_kevent_copyout(void *arg, struct kevent *kevp, int count);
+static int freebsd32_kevent_copyin(void *arg, struct kevent *kevp, int count);
+
 int
 freebsd32_wait4(struct thread *td, struct freebsd32_wait4_args *uap)
 {
@@ -132,11 +145,14 @@
 }
 
 #ifdef COMPAT_FREEBSD4
-static void
+static int
 copy_statfs(struct statfs *in, struct statfs32 *out)
 {
+	int error;
 
-	statfs_scale_blocks(in, INT32_MAX);
+	error = statfs_scale_blocks(in, INT32_MAX);
+	if (error)
+		return (error);
 	bzero(out, sizeof(*out));
 	CP(*in, *out, f_bsize);
 	out->f_iosize = MIN(in->f_iosize, INT32_MAX);
@@ -144,21 +160,25 @@
 	CP(*in, *out, f_bfree);
 	CP(*in, *out, f_bavail);
 	out->f_files = MIN(in->f_files, INT32_MAX);
-	out->f_ffree = MIN(in->f_ffree, INT32_MAX);
+	if (in->f_ffree < 0)
+		out->f_ffree = MAX(in->f_ffree, INT32_MIN);
+	else
+		out->f_ffree = MIN(in->f_ffree, INT32_MAX);
 	CP(*in, *out, f_fsid);
 	CP(*in, *out, f_owner);
 	CP(*in, *out, f_type);
 	CP(*in, *out, f_flags);
-	out->f_syncwrites = MIN(in->f_syncwrites, INT32_MAX);
-	out->f_asyncwrites = MIN(in->f_asyncwrites, INT32_MAX);
+	CP(*in, *out, f_syncwrites);
+	CP(*in, *out, f_asyncwrites);
 	strlcpy(out->f_fstypename,
 	      in->f_fstypename, MFSNAMELEN);
 	strlcpy(out->f_mntonname,
 	      in->f_mntonname, min(MNAMELEN, FREEBSD4_MNAMELEN));
-	out->f_syncreads = MIN(in->f_syncreads, INT32_MAX);
-	out->f_asyncreads = MIN(in->f_asyncreads, INT32_MAX);
+	CP(*in, *out, f_syncreads);
+	CP(*in, *out, f_asyncreads);
 	strlcpy(out->f_mntfromname,
 	      in->f_mntfromname, min(MNAMELEN, FREEBSD4_MNAMELEN));
+	return (0);
 }
 #endif
 
@@ -178,7 +198,9 @@
 		count = td->td_retval[0];
 		sp = buf;
 		while (count > 0 && error == 0) {
-			copy_statfs(sp, &stat32);
+			error = copy_statfs(sp, &stat32);
+			if (error)
+				break;
 			error = copyout(&stat32, uap->buf, sizeof(stat32));
 			sp++;
 			uap->buf++;
@@ -190,8 +212,6 @@
 }
 #endif
 
-CTASSERT(sizeof(struct sigaltstack32) == 12);
-
 int
 freebsd32_sigaltstack(struct thread *td,
 		      struct freebsd32_sigaltstack_args *uap)
@@ -493,13 +513,6 @@
 }
 #endif
 
-struct itimerval32 {
-	struct timeval32 it_interval;
-	struct timeval32 it_value;
-};
-
-CTASSERT(sizeof(struct itimerval32) == 16);
-
 int
 freebsd32_setitimer(struct thread *td, struct freebsd32_setitimer_args *uap)
 {
@@ -562,19 +575,6 @@
 	return (kern_select(td, uap->nd, uap->in, uap->ou, uap->ex, tvp));
 }
 
-struct kevent32 {
-	u_int32_t	ident;		/* identifier for this event */
-	short		filter;		/* filter for event */
-	u_short		flags;
-	u_int		fflags;
-	int32_t		data;
-	u_int32_t	udata;		/* opaque user data identifier */
-};
-
-CTASSERT(sizeof(struct kevent32) == 20);
-static int freebsd32_kevent_copyout(void *arg, struct kevent *kevp, int count);
-static int freebsd32_kevent_copyin(void *arg, struct kevent *kevp, int count);
-
 /*
  * Copy 'count' items into the destination list pointed to by uap->eventlist.
  */
@@ -712,13 +712,6 @@
 	return (error);
 }
 
-struct iovec32 {
-	u_int32_t iov_base;
-	int	iov_len;
-};
-
-CTASSERT(sizeof(struct iovec32) == 8);
-
 static int
 freebsd32_copyinuio(struct iovec32 *iovp, u_int iovcnt, struct uio **uiop)
 {
@@ -843,17 +836,6 @@
 	return (0);
 }
 
-struct msghdr32 {
-	u_int32_t	 msg_name;
-	socklen_t	 msg_namelen;
-	u_int32_t	 msg_iov;
-	int		 msg_iovlen;
-	u_int32_t	 msg_control;
-	socklen_t	 msg_controllen;
-	int		 msg_flags;
-};
-CTASSERT(sizeof(struct msghdr32) == 28);
-
 static int
 freebsd32_copyinmsghdr(struct msghdr32 *msg32, struct msghdr *msg)
 {
@@ -1293,7 +1275,9 @@
 	error = kern_statfs(td, uap->path, UIO_USERSPACE, &s);
 	if (error)
 		return (error);
-	copy_statfs(&s, &s32);
+	error = copy_statfs(&s, &s32);
+	if (error)
+		return (error);
 	return (copyout(&s32, uap->buf, sizeof(s32)));
 }
 #endif
@@ -1309,7 +1293,9 @@
 	error = kern_fstatfs(td, uap->fd, &s);
 	if (error)
 		return (error);
-	copy_statfs(&s, &s32);
+	error = copy_statfs(&s, &s32);
+	if (error)
+		return (error);
 	return (copyout(&s32, uap->buf, sizeof(s32)));
 }
 #endif
@@ -1328,39 +1314,208 @@
 	error = kern_fhstatfs(td, fh, &s);
 	if (error)
 		return (error);
-	copy_statfs(&s, &s32);
+	error = copy_statfs(&s, &s32);
+	if (error)
+		return (error);
 	return (copyout(&s32, uap->buf, sizeof(s32)));
 }
 #endif
 
+static void
+freebsd32_ipcperm_in(struct ipc_perm32 *ip32, struct ipc_perm *ip)
+{
+
+	CP(*ip32, *ip, cuid);
+	CP(*ip32, *ip, cgid);
+	CP(*ip32, *ip, uid);
+	CP(*ip32, *ip, gid);
+	CP(*ip32, *ip, mode);
+	CP(*ip32, *ip, seq);
+	CP(*ip32, *ip, key);
+}
+
+static void
+freebsd32_ipcperm_out(struct ipc_perm *ip, struct ipc_perm32 *ip32)
+{
+
+	CP(*ip, *ip32, cuid);
+	CP(*ip, *ip32, cgid);
+	CP(*ip, *ip32, uid);
+	CP(*ip, *ip32, gid);
+	CP(*ip, *ip32, mode);
+	CP(*ip, *ip32, seq);
+	CP(*ip, *ip32, key);
+}
+
 int
 freebsd32_semsys(struct thread *td, struct freebsd32_semsys_args *uap)
 {
-	/*
-	 * Vector through to semsys if it is loaded.
-	 */
-	return sysent[SYS_semsys].sy_call(td, uap);
+
+	switch (uap->which) {
+	case 0:
+		return (freebsd32_semctl(td,
+		    (struct freebsd32_semctl_args *)&uap->a2));
+	default:
+		return (semsys(td, (struct semsys_args *)uap));
+	}
+}
+
+int
+freebsd32_semctl(struct thread *td, struct freebsd32_semctl_args *uap)
+{
+	struct semid_ds32 dsbuf32;
+	struct semid_ds dsbuf;
+	union semun semun;
+	union semun32 arg;
+	register_t rval;
+	int error;
+
+	switch (uap->cmd) {
+	case SEM_STAT:
+	case IPC_SET:
+	case IPC_STAT:
+	case GETALL:
+	case SETVAL:
+	case SETALL:
+		error = copyin(uap->arg, &arg, sizeof(arg));
+		if (error)
+			return (error);		
+		break;
+	}
+
+	switch (uap->cmd) {
+	case SEM_STAT:
+	case IPC_STAT:
+		semun.buf = &dsbuf;
+		break;
+	case IPC_SET:
+		error = copyin(PTRIN(arg.buf), &dsbuf32, sizeof(dsbuf32));
+		if (error)
+			return (error);
+		freebsd32_ipcperm_in(&dsbuf32.sem_perm, &dsbuf.sem_perm);
+		PTRIN_CP(dsbuf32, dsbuf, sem_base);
+		CP(dsbuf32, dsbuf, sem_nsems);
+		CP(dsbuf32, dsbuf, sem_otime);
+		CP(dsbuf32, dsbuf, sem_pad1);
+		CP(dsbuf32, dsbuf, sem_ctime);
+		CP(dsbuf32, dsbuf, sem_pad2);
+		CP(dsbuf32, dsbuf, sem_pad3[0]);
+		CP(dsbuf32, dsbuf, sem_pad3[1]);
+		CP(dsbuf32, dsbuf, sem_pad3[2]);
+		CP(dsbuf32, dsbuf, sem_pad3[3]);
+		semun.buf = &dsbuf;
+		break;
+	case GETALL:
+	case SETALL:
+		semun.array = PTRIN(arg.array);
+		break;
+	case SETVAL:
+		semun.val = arg.val;
+		break;		
+	}
+
+	error = kern_semctl(td, uap->semid, uap->semnum, uap->cmd, &semun,
+	    &rval);
+	if (error)
+		return (error);
+
+	switch (uap->cmd) {
+	case SEM_STAT:
+	case IPC_STAT:
+		freebsd32_ipcperm_out(&dsbuf.sem_perm, &dsbuf32.sem_perm);
+		PTROUT_CP(dsbuf, dsbuf32, sem_base);
+		CP(dsbuf, dsbuf32, sem_nsems);
+		CP(dsbuf, dsbuf32, sem_otime);
+		CP(dsbuf, dsbuf32, sem_pad1);
+		CP(dsbuf, dsbuf32, sem_ctime);
+		CP(dsbuf, dsbuf32, sem_pad2);
+		CP(dsbuf, dsbuf32, sem_pad3[0]);
+		CP(dsbuf, dsbuf32, sem_pad3[1]);
+		CP(dsbuf, dsbuf32, sem_pad3[2]);
+		CP(dsbuf, dsbuf32, sem_pad3[3]);
+		error = copyout(&dsbuf32, PTRIN(arg.buf), sizeof(dsbuf32));
+		break;
+	}
+
+	if (error == 0)
+		td->td_retval[0] = rval;
+	return (error);
 }
 
 int
 freebsd32_msgsys(struct thread *td, struct freebsd32_msgsys_args *uap)
 {
+
 	switch (uap->which) {
+	case 0:
+		return (freebsd32_msgctl(td,
+		    (struct freebsd32_msgctl_args *)&uap->a2));
 	case 2:
 		return (freebsd32_msgsnd(td,
 		    (struct freebsd32_msgsnd_args *)&uap->a2));
-		break;
 	case 3:
 		return (freebsd32_msgrcv(td,
 		    (struct freebsd32_msgrcv_args *)&uap->a2));
-		break;
 	default:
-		/*
-		 * Vector through to msgsys if it is loaded.
-		 */
-		return (sysent[SYS_msgsys].sy_call(td, uap));
-		break;
+		return (msgsys(td, (struct msgsys_args *)uap));
+	}
+}
+
+int
+freebsd32_msgctl(struct thread *td, struct freebsd32_msgctl_args *uap)
+{
+	struct msqid_ds msqbuf;
+	struct msqid_ds32 msqbuf32;
+	int error;
+
+	if (uap->cmd == IPC_SET) {
+		error = copyin(uap->buf, &msqbuf32, sizeof(msqbuf32));
+		if (error)
+			return (error);
+		freebsd32_ipcperm_in(&msqbuf32.msg_perm, &msqbuf.msg_perm);
+		PTRIN_CP(msqbuf32, msqbuf, msg_first);
+		PTRIN_CP(msqbuf32, msqbuf, msg_last);
+		CP(msqbuf32, msqbuf, msg_cbytes);
+		CP(msqbuf32, msqbuf, msg_qnum);
+		CP(msqbuf32, msqbuf, msg_qbytes);
+		CP(msqbuf32, msqbuf, msg_lspid);
+		CP(msqbuf32, msqbuf, msg_lrpid);
+		CP(msqbuf32, msqbuf, msg_stime);
+		CP(msqbuf32, msqbuf, msg_pad1);
+		CP(msqbuf32, msqbuf, msg_rtime);
+		CP(msqbuf32, msqbuf, msg_pad2);
+		CP(msqbuf32, msqbuf, msg_ctime);
+		CP(msqbuf32, msqbuf, msg_pad3);
+		CP(msqbuf32, msqbuf, msg_pad4[0]);
+		CP(msqbuf32, msqbuf, msg_pad4[1]);
+		CP(msqbuf32, msqbuf, msg_pad4[2]);
+		CP(msqbuf32, msqbuf, msg_pad4[3]);
+	}
+	error = kern_msgctl(td, uap->msqid, uap->cmd, &msqbuf);
+	if (error)
+		return (error);
+	if (uap->cmd == IPC_STAT) {
+		freebsd32_ipcperm_out(&msqbuf.msg_perm, &msqbuf32.msg_perm);
+		PTROUT_CP(msqbuf, msqbuf32, msg_first);
+		PTROUT_CP(msqbuf, msqbuf32, msg_last);
+		CP(msqbuf, msqbuf32, msg_cbytes);
+		CP(msqbuf, msqbuf32, msg_qnum);
+		CP(msqbuf, msqbuf32, msg_qbytes);
+		CP(msqbuf, msqbuf32, msg_lspid);
+		CP(msqbuf, msqbuf32, msg_lrpid);
+		CP(msqbuf, msqbuf32, msg_stime);
+		CP(msqbuf, msqbuf32, msg_pad1);
+		CP(msqbuf, msqbuf32, msg_rtime);
+		CP(msqbuf, msqbuf32, msg_pad2);
+		CP(msqbuf, msqbuf32, msg_ctime);
+		CP(msqbuf, msqbuf32, msg_pad3);
+		CP(msqbuf, msqbuf32, msg_pad4[0]);
+		CP(msqbuf, msqbuf32, msg_pad4[1]);
+		CP(msqbuf, msqbuf32, msg_pad4[2]);
+		CP(msqbuf, msqbuf32, msg_pad4[3]);
+		error = copyout(&msqbuf32, uap->buf, sizeof(struct msqid_ds32));
 	}
+	return (error);
 }
 
 int
@@ -1438,42 +1593,6 @@
 	}
 }
 
-struct ipc_perm32 {
-	uint16_t	cuid;
-	uint16_t	cgid;
-	uint16_t	uid;
-	uint16_t	gid;
-	uint16_t	mode;
-	uint16_t	seq;
-	uint32_t	key;
-};
-struct shmid_ds32 {
-	struct ipc_perm32 shm_perm;
-	int32_t		shm_segsz;
-	int32_t		shm_lpid;
-	int32_t		shm_cpid;
-	int16_t		shm_nattch;
-	int32_t		shm_atime;
-	int32_t		shm_dtime;
-	int32_t		shm_ctime;
-	uint32_t	shm_internal;
-};
-struct shm_info32 {
-	int32_t		used_ids;
-	uint32_t	shm_tot;
-	uint32_t	shm_rss;
-	uint32_t	shm_swp;
-	uint32_t	swap_attempts;
-	uint32_t	swap_successes;
-};
-struct shminfo32 {
-	uint32_t	shmmax;
-	uint32_t	shmmin;
-	uint32_t	shmmni;
-	uint32_t	shmseg;
-	uint32_t	shmall;
-};
-
 int
 freebsd32_shmctl(struct thread *td, struct freebsd32_shmctl_args *uap)
 {
@@ -1494,13 +1613,8 @@
 		if ((error = copyin(uap->buf, &u32.shmid_ds32,
 		    sizeof(u32.shmid_ds32))))
 			goto done;
-		CP(u32.shmid_ds32, u.shmid_ds, shm_perm.cuid);
-		CP(u32.shmid_ds32, u.shmid_ds, shm_perm.cgid);
-		CP(u32.shmid_ds32, u.shmid_ds, shm_perm.uid);
-		CP(u32.shmid_ds32, u.shmid_ds, shm_perm.gid);
-		CP(u32.shmid_ds32, u.shmid_ds, shm_perm.mode);
-		CP(u32.shmid_ds32, u.shmid_ds, shm_perm.seq);
-		CP(u32.shmid_ds32, u.shmid_ds, shm_perm.key);
+		freebsd32_ipcperm_in(&u32.shmid_ds32.shm_perm,
+		    &u.shmid_ds.shm_perm);
 		CP(u32.shmid_ds32, u.shmid_ds, shm_segsz);
 		CP(u32.shmid_ds32, u.shmid_ds, shm_lpid);
 		CP(u32.shmid_ds32, u.shmid_ds, shm_cpid);
@@ -1538,13 +1652,8 @@
 		break;
 	case SHM_STAT:
 	case IPC_STAT:
-		CP(u.shmid_ds, u32.shmid_ds32, shm_perm.cuid);
-		CP(u.shmid_ds, u32.shmid_ds32, shm_perm.cgid);
-		CP(u.shmid_ds, u32.shmid_ds32, shm_perm.uid);
-		CP(u.shmid_ds, u32.shmid_ds32, shm_perm.gid);
-		CP(u.shmid_ds, u32.shmid_ds32, shm_perm.mode);
-		CP(u.shmid_ds, u32.shmid_ds32, shm_perm.seq);
-		CP(u.shmid_ds, u32.shmid_ds32, shm_perm.key);
+		freebsd32_ipcperm_out(&u.shmid_ds.shm_perm,
+		    &u32.shmid_ds32.shm_perm);
 		CP(u.shmid_ds, u32.shmid_ds32, shm_segsz);
 		CP(u.shmid_ds, u32.shmid_ds32, shm_lpid);
 		CP(u.shmid_ds, u32.shmid_ds32, shm_cpid);
@@ -1772,30 +1881,6 @@
 	return (freebsd32_do_sendfile(td, uap, 0));
 }
 
-struct stat32 {
-	dev_t	st_dev;
-	ino_t	st_ino;
-	mode_t	st_mode;
-	nlink_t	st_nlink;
-	uid_t	st_uid;
-	gid_t	st_gid;
-	dev_t	st_rdev;
-	struct timespec32 st_atimespec;
-	struct timespec32 st_mtimespec;
-	struct timespec32 st_ctimespec;
-	off_t	st_size;
-	int64_t	st_blocks;
-	u_int32_t st_blksize;
-	u_int32_t st_flags;
-	u_int32_t st_gen;
-	struct timespec32 st_birthtimespec;
-	unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec32));
-	unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec32));
-};
-
-
-CTASSERT(sizeof(struct stat32) == 96);
-
 static void
 copy_stat( struct stat *in, struct stat32 *out)
 {
@@ -1892,14 +1977,6 @@
 	return (error);
 }
 
-struct sigaction32 {
-	u_int32_t	sa_u;
-	int		sa_flags;
-	sigset_t	sa_mask;
-};
-
-CTASSERT(sizeof(struct sigaction32) == 24);
-
 int
 freebsd32_sigaction(struct thread *td, struct freebsd32_sigaction_args *uap)
 {

==== //depot/projects/xen31/sys/compat/freebsd32/freebsd32_proto.h#2 (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.78 2007/08/16 05:32:25 davidxu Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.90 2007/07/04 23:02:40 peter Exp 
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.79 2007/12/06 23:37:26 jhb Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.93 2007/12/06 23:36:57 jhb Exp 
  */
 
 #ifndef _FREEBSD32_SYSPROTO_H_
@@ -158,6 +158,17 @@
 	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
 	char tptr_l_[PADL_(struct timeval32 *)]; struct timeval32 * tptr; char tptr_r_[PADR_(struct timeval32 *)];
 };
+struct freebsd32_semctl_args {
+	char semid_l_[PADL_(int)]; int semid; char semid_r_[PADR_(int)];
+	char semnum_l_[PADL_(int)]; int semnum; char semnum_r_[PADR_(int)];
+	char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
+	char arg_l_[PADL_(union semun32 *)]; union semun32 * arg; char arg_r_[PADR_(union semun32 *)];
+};
+struct freebsd32_msgctl_args {
+	char msqid_l_[PADL_(int)]; int msqid; char msqid_r_[PADR_(int)];
+	char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
+	char buf_l_[PADL_(struct msqid_ds32 *)]; struct msqid_ds32 * buf; char buf_r_[PADR_(struct msqid_ds32 *)];
+};
 struct freebsd32_msgsnd_args {
 	char msqid_l_[PADL_(int)]; int msqid; char msqid_r_[PADR_(int)];
 	char msgp_l_[PADL_(void *)]; void * msgp; char msgp_r_[PADR_(void *)];
@@ -340,6 +351,8 @@
 int	freebsd32_lstat(struct thread *, struct freebsd32_lstat_args *);
 int	freebsd32_sysctl(struct thread *, struct freebsd32_sysctl_args *);
 int	freebsd32_futimes(struct thread *, struct freebsd32_futimes_args *);
+int	freebsd32_semctl(struct thread *, struct freebsd32_semctl_args *);
+int	freebsd32_msgctl(struct thread *, struct freebsd32_msgctl_args *);
 int	freebsd32_msgsnd(struct thread *, struct freebsd32_msgsnd_args *);
 int	freebsd32_msgrcv(struct thread *, struct freebsd32_msgrcv_args *);
 int	freebsd32_shmctl(struct thread *, struct freebsd32_shmctl_args *);
@@ -541,6 +554,8 @@
 #define	FREEBSD32_SYS_AUE_freebsd32_lstat	AUE_LSTAT
 #define	FREEBSD32_SYS_AUE_freebsd32_sysctl	AUE_SYSCTL
 #define	FREEBSD32_SYS_AUE_freebsd32_futimes	AUE_FUTIMES
+#define	FREEBSD32_SYS_AUE_freebsd32_semctl	AUE_SEMCTL
+#define	FREEBSD32_SYS_AUE_freebsd32_msgctl	AUE_MSGCTL
 #define	FREEBSD32_SYS_AUE_freebsd32_msgsnd	AUE_MSGSND
 #define	FREEBSD32_SYS_AUE_freebsd32_msgrcv	AUE_MSGRCV
 #define	FREEBSD32_SYS_AUE_freebsd32_shmctl	AUE_SHMCTL

==== //depot/projects/xen31/sys/compat/freebsd32/freebsd32_syscall.h#2 (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.76 2007/08/16 05:32:25 davidxu Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.90 2007/07/04 23:02:40 peter Exp 
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.77 2007/12/06 23:37:26 jhb Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.93 2007/12/06 23:36:57 jhb Exp 
  */
 
 #define	FREEBSD32_SYS_syscall	0
@@ -190,10 +190,10 @@
 #define	FREEBSD32_SYS_freebsd32_futimes	206
 #define	FREEBSD32_SYS_getpgid	207
 #define	FREEBSD32_SYS_poll	209
-#define	FREEBSD32_SYS___semctl	220
+#define	FREEBSD32_SYS_freebsd32_semctl	220
 #define	FREEBSD32_SYS_semget	221
 #define	FREEBSD32_SYS_semop	222
-#define	FREEBSD32_SYS_msgctl	224
+#define	FREEBSD32_SYS_freebsd32_msgctl	224
 #define	FREEBSD32_SYS_msgget	225
 #define	FREEBSD32_SYS_freebsd32_msgsnd	226
 #define	FREEBSD32_SYS_freebsd32_msgrcv	227

==== //depot/projects/xen31/sys/compat/freebsd32/freebsd32_syscalls.c#2 (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.67 2007/08/16 05:32:25 davidxu Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.90 2007/07/04 23:02:40 peter Exp 
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.68 2007/12/06 23:37:26 jhb Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.93 2007/12/06 23:36:57 jhb Exp 
  */
 
 const char *freebsd32_syscallnames[] = {
@@ -227,11 +227,11 @@
 	"#217",			/* 217 =  */
 	"#218",			/* 218 =  */
 	"#219",			/* 219 =  */
-	"__semctl",			/* 220 = __semctl */
+	"freebsd32_semctl",			/* 220 = freebsd32_semctl */
 	"semget",			/* 221 = semget */
 	"semop",			/* 222 = semop */
 	"#223",			/* 223 = semconfig */
-	"msgctl",			/* 224 = msgctl */
+	"freebsd32_msgctl",			/* 224 = freebsd32_msgctl */
 	"msgget",			/* 225 = msgget */
 	"freebsd32_msgsnd",			/* 226 = freebsd32_msgsnd */
 	"freebsd32_msgrcv",			/* 227 = freebsd32_msgrcv */

==== //depot/projects/xen31/sys/compat/freebsd32/freebsd32_sysent.c#2 (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.77 2007/08/16 05:32:25 davidxu Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.90 2007/07/04 23:02:40 peter Exp 
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.78 2007/12/06 23:37:26 jhb Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.93 2007/12/06 23:36:57 jhb Exp 
  */
 
 #include "opt_compat.h"
@@ -13,6 +13,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -258,11 +259,11 @@
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 217 =  */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 218 =  */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 219 =  */
-	{ AS(__semctl_args), (sy_call_t *)__semctl, AUE_SEMCTL, NULL, 0, 0 },	/* 220 = __semctl */
+	{ 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(msgctl_args), (sy_call_t *)msgctl, AUE_MSGCTL, NULL, 0, 0 },	/* 224 = msgctl */
+	{ 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 */

==== //depot/projects/xen31/sys/compat/freebsd32/syscalls.master#2 (text+ko) ====

@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.91 2007/08/16 05:30:04 davidxu Exp $
+ $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.93 2007/12/06 23:36:57 jhb Exp $
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ;	from: src/sys/kern/syscalls.master 1.107
 ;
@@ -38,6 +38,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -394,15 +395,15 @@
 ; The following were introduced with NetBSD/4.4Lite-2
 ; They are initialized by thier respective modules/sysinits
 ; XXX PROBLEM!!
-220	AUE_SEMCTL	NOPROTO	{ int __semctl(int semid, int semnum, \
-				    int cmd, union semun *arg); }
+220	AUE_SEMCTL	STD	{ int freebsd32_semctl(int semid, int semnum, \
+				    int cmd, union semun32 *arg); }
 221	AUE_SEMGET	NOPROTO	{ int semget(key_t key, int nsems, \
 				    int semflg); }
 222	AUE_SEMOP	NOPROTO	{ int semop(int semid, struct sembuf *sops, \
 				    u_int nsops); }
 223	AUE_NULL	UNIMPL	semconfig
-224	AUE_MSGCTL	NOPROTO	{ int msgctl(int msqid, int cmd, \
-				    struct msqid_ds *buf); }
+224	AUE_MSGCTL	STD	{ int freebsd32_msgctl(int msqid, int cmd, \
+				    struct msqid_ds32 *buf); }
 225	AUE_MSGGET	NOPROTO	{ int msgget(key_t key, int msgflg); }
 226	AUE_MSGSND	STD	{ int freebsd32_msgsnd(int msqid, void *msgp, \
 				    size_t msgsz, int msgflg); }

==== //depot/projects/xen31/sys/dev/aac/aac.c#3 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.123 2007/11/01 20:45:28 emaste Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.124 2007/12/07 00:22:23 emaste Exp $");
 
 /*
  * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters.
@@ -216,8 +216,11 @@
 static void		aac_handle_aif(struct aac_softc *sc,
 					   struct aac_fib *fib);
 static int		aac_rev_check(struct aac_softc *sc, caddr_t udata);
+static int		aac_open_aif(struct aac_softc *sc, caddr_t arg);
+static int		aac_close_aif(struct aac_softc *sc, caddr_t arg);
 static int		aac_getnext_aif(struct aac_softc *sc, caddr_t arg);
-static int		aac_return_aif(struct aac_softc *sc, caddr_t uptr);
+static int		aac_return_aif(struct aac_softc *sc,
+					struct aac_fib_context *ctx, caddr_t uptr);
 static int		aac_query_disk(struct aac_softc *sc, caddr_t uptr);
 static int		aac_get_pci_info(struct aac_softc *sc, caddr_t uptr);
 static void		aac_ioctl_event(struct aac_softc *sc,

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri Dec  7 05:42:54 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7D4A116A41B; Fri,  7 Dec 2007 05:42: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 B40F416A419
	for ; Fri,  7 Dec 2007 05:42:53 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8CA6213C459
	for ; Fri,  7 Dec 2007 05:42:53 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB75gruY072558
	for ; Fri, 7 Dec 2007 05:42:53 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB75grq0072555
	for perforce@freebsd.org; Fri, 7 Dec 2007 05:42:53 GMT
	(envelope-from kmacy@freebsd.org)
Date: Fri, 7 Dec 2007 05:42:53 GMT
Message-Id: <200712070542.lB75grq0072555@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130392 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 07 Dec 2007 05:42:55 -0000

http://perforce.freebsd.org/chv.cgi?CH=130392

Change 130392 by kmacy@entropy_kmacy_xen31 on 2007/12/07 05:42:25

	rename evtchn.c

Affected files ...

.. //depot/projects/xen31/sys/xen/evtchn.c#2 delete
.. //depot/projects/xen31/sys/xen/evtchn/evtchn.c#1 branch

Differences ...

From owner-p4-projects@FreeBSD.ORG  Fri Dec  7 07:07:26 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2652516A41B; Fri,  7 Dec 2007 07:07:26 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A6E9B16A419
	for ; Fri,  7 Dec 2007 07:07:25 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 97DBB13C442
	for ; Fri,  7 Dec 2007 07:07:25 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB777PHu087500
	for ; Fri, 7 Dec 2007 07:07:25 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB777PRb087497
	for perforce@freebsd.org; Fri, 7 Dec 2007 07:07:25 GMT
	(envelope-from kmacy@freebsd.org)
Date: Fri, 7 Dec 2007 07:07:25 GMT
Message-Id: <200712070707.lB777PRb087497@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130395 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 07 Dec 2007 07:07:26 -0000

http://perforce.freebsd.org/chv.cgi?CH=130395

Change 130395 by kmacy@entropy_kmacy_xen31 on 2007/12/07 07:07:20

	final bits to get domU kernel to link

Affected files ...

.. //depot/projects/xen31/sys/conf/files#8 edit
.. //depot/projects/xen31/sys/conf/files.i386#7 edit
.. //depot/projects/xen31/sys/i386/include/trap.h#2 edit
.. //depot/projects/xen31/sys/i386/pci/pci_cfgreg.c#3 edit
.. //depot/projects/xen31/sys/i386/pci/pci_pir.c#2 edit
.. //depot/projects/xen31/sys/i386/xen/clock.c#1 add
.. //depot/projects/xen31/sys/xen/evtchn/evtchn_dev.c#1 add

Differences ...

==== //depot/projects/xen31/sys/conf/files#8 (text+ko) ====

@@ -2108,7 +2108,8 @@
 vm/vm_zeroidle.c		standard
 vm/vnode_pager.c		standard
 xen/gnttab.c			optional xen
-xen/evtchn.c			optional xen
+xen/evtchn/evtchn.c		optional xen
+xen/evtchn/evtchn_dev.c		optional xen
 #
 gnu/fs/xfs/xfs_alloc.c		optional xfs \
 	compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" \

==== //depot/projects/xen31/sys/conf/files.i386#7 (text+ko) ====

@@ -347,7 +347,8 @@
 i386/ibcs2/imgact_coff.c	optional ibcs2
 i386/isa/atpic.c		standard
 #i386/isa/atpic_vector.s		standard
-i386/isa/clock.c		standard
+i386/isa/clock.c		optional native
+i386/xen/clock.c		optional xen
 i386/isa/elcr.c			standard
 i386/isa/elink.c		optional ep | ie
 i386/isa/isa.c			optional isa

==== //depot/projects/xen31/sys/i386/include/trap.h#2 (text+ko) ====

@@ -49,6 +49,9 @@
 #define	T_PAGEFLT	12	/* page fault */
 #define	T_ALIGNFLT	14	/* alignment fault */
 
+#ifdef XEN
+#define	T_HYPCALLBACK	17	/* hypervisor upcall */
+#endif
 #define	T_DIVIDE	18	/* integer divide fault */
 #define	T_NMI		19	/* non-maskable trap */
 #define	T_OFLOW		20	/* overflow trap */

==== //depot/projects/xen31/sys/i386/pci/pci_cfgreg.c#3 (text+ko) ====

@@ -82,9 +82,10 @@
 
 static int	pcireg_cfgread(int bus, int slot, int func, int reg, int bytes);
 static void	pcireg_cfgwrite(int bus, int slot, int func, int reg, int data, int bytes);
+#ifndef XEN
 static int	pcireg_cfgopen(void);
-
 static int	pciereg_cfgopen(void);
+#endif
 static int	pciereg_cfgread(int bus, int slot, int func, int reg,
 				int bytes);
 static void	pciereg_cfgwrite(int bus, int slot, int func, int reg,
@@ -105,6 +106,7 @@
 	return (line);
 }
 
+#ifndef XEN
 static u_int16_t
 pcibios_get_version(void)
 {
@@ -125,6 +127,7 @@
 	}
 	return (args.ebx & 0xffff);
 }
+#endif
 
 /* 
  * Initialise access to PCI configuration space 
@@ -132,6 +135,7 @@
 int
 pci_cfgregopen(void)
 {
+#ifndef XEN	
 	static int		opened = 0;
 	u_int16_t		vid, did;
 	u_int16_t		v;
@@ -173,7 +177,7 @@
 			pciereg_cfgopen();
 		}
 	}
-
+#endif
 	return(1);
 }
 
@@ -353,6 +357,7 @@
 	mtx_unlock_spin(&pcicfg_mtx);
 }
 
+#ifndef XEN
 /* check whether the configuration mechanism has been correctly identified */
 static int
 pci_cfgcheck(int maxdev)
@@ -530,6 +535,7 @@
 	devmax = 32;
 	return (1);
 }
+#endif
 
 #define PCIE_PADDR(bar, reg, bus, slot, func)	\
 	((bar)				|	\

==== //depot/projects/xen31/sys/i386/pci/pci_pir.c#2 (text+ko) ====

@@ -80,8 +80,10 @@
     struct PIR_intpin* intpin, void *arg);
 
 static void	pci_print_irqmask(u_int16_t irqs);
+#ifndef XEN
 static int	pci_pir_biosroute(int bus, int device, int func, int pin,
 		    int irq);
+#endif
 static int	pci_pir_choose_irq(struct pci_link *pci_link, int irqmask);
 static void	pci_pir_create_links(struct PIR_entry *entry,
 		    struct PIR_intpin *intpin, void *arg);
@@ -133,6 +135,9 @@
 void
 pci_pir_open(void)
 {
+#if defined(XEN) && !defined(XEN_DOM0)
+	return;
+#else
 	struct PIR_table *pt;
 	uint32_t sigaddr;
 	int i;
@@ -165,6 +170,8 @@
 	pci_route_count = (pt->pt_header.ph_length -
 	    sizeof(struct PIR_header)) / 
 	    sizeof(struct PIR_entry);
+#	
+#endif	
 }
 
 /*
@@ -466,7 +473,7 @@
 		printf(" ]\n");
 	}
 }
-
+#ifndef XEN
 /*
  * Use the PCI BIOS to route an interrupt for a given device.
  *
@@ -487,7 +494,7 @@
 	args.ecx = (irq << 8) | (0xa + pin);
 	return (bios32(&args, PCIbios.ventry, GSEL(GCODE_SEL, SEL_KPL)));
 }
-
+#endif
 
 /*
  * Route a PCI interrupt using a link device from the $PIR.
@@ -497,7 +504,7 @@
 {
 	struct pci_link_lookup lookup;
 	struct pci_link *pci_link;
-	int error, irq;
+	int irq;
 
 	if (pci_route_table == NULL)
 		return (PCI_INVALID_IRQ);
@@ -539,9 +546,11 @@
 		}
 		pci_link->pl_irq = irq;
 	}
-
+#ifndef XEN
 	/* Ask the BIOS to route this IRQ if we haven't done so already. */
 	if (!pci_link->pl_routed) {
+		int error;
+		
 		error = pci_pir_biosroute(bus, device, func, pin - 1,
 		    pci_link->pl_irq);
 
@@ -557,6 +566,7 @@
 		BUS_CONFIG_INTR(pir_device, pci_link->pl_irq,
 		    INTR_TRIGGER_LEVEL, INTR_POLARITY_LOW);
 	}
+#endif	
 	if (bootverbose)
 		printf("$PIR: %d:%d INT%c routed to irq %d\n", bus, device,
 		    pin - 1 + 'A', pci_link->pl_irq);
@@ -677,6 +687,7 @@
 	return (0);
 }
 
+#ifndef XEN
 static void
 pir_resume_find_device(struct PIR_entry *entry, struct PIR_intpin *intpin,
     void *arg)
@@ -690,10 +701,12 @@
 	pd->device = entry->pe_device;
 	pd->pin = intpin - entry->pe_intpin;
 }
+#endif
 
 static int
 pir_resume(device_t dev)
 {
+#ifndef XEN	
 	struct pci_dev_lookup pd;
 	struct pci_link *pci_link;
 	int error;
@@ -726,6 +739,7 @@
 				    pci_link->pl_id);
 		}
 	}
+#endif	
 	return (0);
 }
 

From owner-p4-projects@FreeBSD.ORG  Fri Dec  7 17:00:08 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D59DB16A41A; Fri,  7 Dec 2007 17:00: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 5D7E216A417
	for ; Fri,  7 Dec 2007 17:00:07 +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 4D32713C43E
	for ; Fri,  7 Dec 2007 17:00:07 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB7H079g023690
	for ; Fri, 7 Dec 2007 17:00:07 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB7H07D8023687
	for perforce@freebsd.org; Fri, 7 Dec 2007 17:00:07 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Fri, 7 Dec 2007 17:00:07 GMT
Message-Id: <200712071700.lB7H07D8023687@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 130411 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 07 Dec 2007 17:00:08 -0000

http://perforce.freebsd.org/chv.cgi?CH=130411

Change 130411 by gonzo@gonzo_jeeves on 2007/12/07 16:59:34

	o Bump version of gxemul to the best and the latest gxemul 0.4.6
	    Patches also updated. 

Affected files ...

.. //depot/projects/mips2/src/EMULATION#3 edit

Differences ...

==== //depot/projects/mips2/src/EMULATION#3 (text+ko) ====

@@ -30,11 +30,11 @@
 Installation of GXemul
 ----------------------
 
-	Get GXemul 0.4.1 from 
-	    http://gavare.se/gxemul/src/gxemul-0.4.1.tar.gz
+	Get GXemul 0.4.6 from 
+	    http://gavare.se/gxemul/src/gxemul-0.4.6.tar.gz
 
 	Apply following patch (see changes below)
-	    http://gonzo.kiev.ua/mips/freebsd-gxemul-0.4.1.patch
+	    http://gonzo.kiev.ua/mips/freebsd-gxemul-0.4.6.patch
 	    - ATA ERROR register on power up should be 1
 	    - Do not reset ATA ERROR register on read (there is no
 		such requirement in specs).
@@ -43,9 +43,6 @@
 		wdc resources.
 	    - Change words order for 4-bytes values of ata identify 
 	        struct. they seemed to be in wrong order.
-	    - Set EPC if in EXCL mode. This is temporary hack till 
-	        we will check it with spec/real hardware though this 
-		change hasn't broken linux/netbsd support.
 
 	./configure && make && ... save gxemul binary somewhere
 

From owner-p4-projects@FreeBSD.ORG  Fri Dec  7 19:16:23 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 116E916A41B; Fri,  7 Dec 2007 19:16: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 947B916A419
	for ; Fri,  7 Dec 2007 19:16:22 +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 6BC2613C46B
	for ; Fri,  7 Dec 2007 19:16:22 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB7JGMvS095780
	for ; Fri, 7 Dec 2007 19:16:22 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB7JGMv3095777
	for perforce@freebsd.org; Fri, 7 Dec 2007 19:16:22 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 7 Dec 2007 19:16:22 GMT
Message-Id: <200712071916.lB7JGMv3095777@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 130418 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 07 Dec 2007 19:16:23 -0000

http://perforce.freebsd.org/chv.cgi?CH=130418

Change 130418 by hselasky@hselasky_laptop001 on 2007/12/07 19:15:25

	
	This commit relates to USB device side support.
	
	The file "usb_template.h" contains a template framework
	for building up generic USB descriptors.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_template.h#1 add

Differences ...

From owner-p4-projects@FreeBSD.ORG  Fri Dec  7 19:18:25 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 733A016A468; Fri,  7 Dec 2007 19:18: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 1B86B16A419
	for ; Fri,  7 Dec 2007 19:18:25 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0B51813C43E
	for ; Fri,  7 Dec 2007 19:18:25 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB7JIOHs095846
	for ; Fri, 7 Dec 2007 19:18:24 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB7JIOnS095843
	for perforce@freebsd.org; Fri, 7 Dec 2007 19:18:24 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 7 Dec 2007 19:18:24 GMT
Message-Id: <200712071918.lB7JIOnS095843@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 130419 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 07 Dec 2007 19:18:25 -0000

http://perforce.freebsd.org/chv.cgi?CH=130419

Change 130419 by hselasky@hselasky_laptop001 on 2007/12/07 19:17:36

	
	Spell correction.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#8 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#8 (text+ko) ====

@@ -207,7 +207,7 @@
 
 /*
  * Definition of direction mask for
- * "bEndpointAddress" and "bRequestType":
+ * "bEndpointAddress" and "bmRequestType":
  */
 #define	USB_DIR_MASK			0x80
 #define	USB_DIR_OUT			0x00	/* write to USB device */
@@ -215,7 +215,7 @@
 
 /*
  * Definition of type mask for
- * "bRequestType":
+ * "bmRequestType":
  */
 #define	USB_TYPE_MASK			(0x03 << 5)
 #define	USB_TYPE_STANDARD		(0x00 << 5)
@@ -225,7 +225,7 @@
 
 /*
  * Definition of receiver mask for
- * "bRequestType":
+ * "bmRequestType":
  */
 #define	USB_RECIP_MASK			0x1f
 #define	USB_RECIP_DEVICE		0x00

From owner-p4-projects@FreeBSD.ORG  Fri Dec  7 22:49:17 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0CDE316A420; Fri,  7 Dec 2007 22:49: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 85FA616A41A
	for ; Fri,  7 Dec 2007 22:49:16 +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 6365C13C458
	for ; Fri,  7 Dec 2007 22:49:16 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB7MnFSq047618
	for ; Fri, 7 Dec 2007 22:49:15 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB7MnF5G047615
	for perforce@freebsd.org; Fri, 7 Dec 2007 22:49:15 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 7 Dec 2007 22:49:15 GMT
Message-Id: <200712072249.lB7MnF5G047615@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 130432 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 07 Dec 2007 22:49:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=130432

Change 130432 by hselasky@hselasky_laptop001 on 2007/12/07 22:49:14

	
	This commit is part of USB device side support.
	
	o Add C-routines that build up the real USB descriptors
	  from the USB template descriptors.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb.h#22 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_template.c#1 add
.. //depot/projects/usb/src/sys/dev/usb/usb_template.h#2 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb.h#22 (text+ko) ====

@@ -274,6 +274,7 @@
 #define	UE_ISO_SYNC	0x0c
 #define	UE_GET_ISO_TYPE(a)	((a) & UE_ISO_TYPE)
 	uWord	wMaxPacketSize;
+#define UE_ZERO_MPS 0xFFFF		/* for internal use only */
 	uByte	bInterval;
 } __packed usb_endpoint_descriptor_t;
 

==== //depot/projects/usb/src/sys/dev/usb/usb_template.h#2 (text+ko) ====

@@ -31,6 +31,8 @@
 #ifndef _USB_TEMPLATE_H_
 #define	_USB_TEMPLATE_H_
 
+typedef const uint8_t * (usbd_temp_get_string_desc_t)(struct usbd_device *udev, uint16_t langid, uint8_t index);
+
 struct usb_temp_packet_size {
 	uint16_t mps[USB_SPEED_MAX];
 };
@@ -39,6 +41,7 @@
 	const void **ppRawDesc;
 	const struct usb_temp_packet_size *pPacketSize;
 	uint8_t	direction;		/* UE_DIR_IN or UE_DIR_OUT */
+	uint8_t	endpoint;	/* endpoint address */
 	uint8_t	bmAttributes;
 };
 
@@ -56,10 +59,11 @@
 	const struct usb_temp_interface_desc **ppIfaceDesc;
 	uint8_t	bmAttributes;
 	uint8_t	bMaxPower;
+	uint8_t iConfiguration;
 };
 
 struct usb_temp_device_desc {
-	const void ***pppRawStringDesc;
+	usbd_temp_get_string_desc_t *pGetStringDescFn;
 	const struct usb_temp_config_desc **ppConfigDesc;
 	uint16_t idVendor;
 	uint16_t idProduct;

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 00:23:24 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8E7E016A479; Sat,  8 Dec 2007 00:23:24 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 37A6916A5AA
	for ; Sat,  8 Dec 2007 00:23:24 +0000 (UTC)
	(envelope-from delphij@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 23F5713C4D5
	for ; Sat,  8 Dec 2007 00:23:24 +0000 (UTC)
	(envelope-from delphij@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB80NOJ6068622
	for ; Sat, 8 Dec 2007 00:23:24 GMT
	(envelope-from delphij@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB80MxYx068550
	for perforce@freebsd.org; Sat, 8 Dec 2007 00:22:59 GMT
	(envelope-from delphij@freebsd.org)
Date: Sat, 8 Dec 2007 00:22:59 GMT
Message-Id: <200712080022.lB80MxYx068550@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	delphij@freebsd.org using -f
From: Xin LI 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130442 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 00:23:24 -0000

http://perforce.freebsd.org/chv.cgi?CH=130442

Change 130442 by delphij@charlie on 2007/12/08 00:22:21

	IFC

Affected files ...

.. //depot/projects/delphij_fork/Makefile.inc1#7 integrate
.. //depot/projects/delphij_fork/ObsoleteFiles.inc#15 integrate
.. //depot/projects/delphij_fork/UPDATING#7 integrate
.. //depot/projects/delphij_fork/bin/sh/sh.1#3 integrate
.. //depot/projects/delphij_fork/cddl/Makefile.inc#2 integrate
.. //depot/projects/delphij_fork/cddl/lib/libnvpair/Makefile#2 integrate
.. //depot/projects/delphij_fork/compat/opensolaris/include/alloca.h#1 branch
.. //depot/projects/delphij_fork/compat/opensolaris/include/fcntl.h#1 branch
.. //depot/projects/delphij_fork/compat/opensolaris/include/stdio.h#1 branch
.. //depot/projects/delphij_fork/compat/opensolaris/include/stdlib.h#1 branch
.. //depot/projects/delphij_fork/compat/opensolaris/include/strings.h#1 branch
.. //depot/projects/delphij_fork/compat/opensolaris/include/unistd.h#1 branch
.. //depot/projects/delphij_fork/contrib/amd/AUTHORS#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/BUGS#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/COPYING#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/ChangeLog#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/FAQ#1 branch
.. //depot/projects/delphij_fork/contrib/amd/INSTALL#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/NEWS#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/README.attrcache#1 branch
.. //depot/projects/delphij_fork/contrib/amd/README.ldap#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/am_ops.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/amd.8#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/amd.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/amd.h#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/amfs_auto.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/amfs_direct.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/amfs_error.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/amfs_generic.c#1 branch
.. //depot/projects/delphij_fork/contrib/amd/amd/amfs_host.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/amfs_inherit.c#2 delete
.. //depot/projects/delphij_fork/contrib/amd/amd/amfs_link.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/amfs_linkx.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/amfs_nfsl.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/amfs_nfsx.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/amfs_program.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/amfs_root.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/amfs_toplvl.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/amfs_union.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/amq_subr.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/amq_svc.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/autil.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/clock.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/conf.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/conf_parse.y#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/conf_tok.l#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/get_args.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/info_exec.c#1 branch
.. //depot/projects/delphij_fork/contrib/amd/amd/info_file.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/info_hesiod.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/info_ldap.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/info_ndbm.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/info_nis.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/info_nisplus.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/info_passwd.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/info_union.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/map.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/mapc.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/mntfs.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/nfs_prot_svc.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/nfs_start.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/nfs_subr.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/ops_TEMPLATE.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/ops_cachefs.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/ops_cdfs.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/ops_efs.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/ops_lofs.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/ops_mfs.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/ops_nfs.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/ops_nfs3.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/ops_nullfs.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/ops_pcfs.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/ops_tfs.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/ops_tmpfs.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/ops_ufs.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/ops_umapfs.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/ops_unionfs.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/ops_xfs.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/opts.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/readdir.c#1 branch
.. //depot/projects/delphij_fork/contrib/amd/amd/restart.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/rpc_fwd.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/sched.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/srvr_amfs_auto.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amd/srvr_nfs.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amq/amq.8#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amq/amq.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amq/amq.h#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amq/amq_clnt.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amq/amq_xdr.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amq/pawd.1#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/amq/pawd.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/aux_conf.h.in#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/bootstrap#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/conf/checkmount/checkmount_bsd44.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/conf/mtab/mtab_bsd.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/conf/transp/transp_sockets.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/conf/trap/trap_default.h#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/conf/umount/umount_bsd44.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/doc/am-utils.texi#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/doc/stamp-vti#1 branch
.. //depot/projects/delphij_fork/contrib/amd/doc/texinfo.tex#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/doc/version.texi#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/fixmount/fixmount.8#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/fixmount/fixmount.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/fsinfo/fsi_analyze.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/fsinfo/fsi_data.h#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/fsinfo/fsi_dict.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/fsinfo/fsi_gram.y#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/fsinfo/fsi_lex.l#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/fsinfo/fsi_util.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/fsinfo/fsinfo.8#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/fsinfo/fsinfo.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/fsinfo/fsinfo.h#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/fsinfo/wr_atab.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/fsinfo/wr_bparam.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/fsinfo/wr_dumpset.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/fsinfo/wr_exportfs.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/fsinfo/wr_fstab.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/hlfsd/hlfsd.8#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/hlfsd/hlfsd.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/hlfsd/hlfsd.h#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/hlfsd/homedir.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/hlfsd/nfs_prot_svc.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/hlfsd/stubs.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/include/am_compat.h#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/include/am_defs.h#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/include/am_utils.h#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/include/am_xdr_func.h#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/include/amq_defs.h#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/include/mount_headers1.h#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/include/mount_headers2.h#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/ldap-id.ms#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/ldap.schema#1 branch
.. //depot/projects/delphij_fork/contrib/amd/libamu/alloca.c#2 delete
.. //depot/projects/delphij_fork/contrib/amd/libamu/amu.h#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/libamu/hasmntopt.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/libamu/misc_rpc.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/libamu/mount_fs.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/libamu/mtab.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/libamu/nfs_prot_xdr.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/libamu/strerror.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/libamu/strutil.c#1 branch
.. //depot/projects/delphij_fork/contrib/amd/libamu/util.c#2 delete
.. //depot/projects/delphij_fork/contrib/amd/libamu/wire.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/libamu/xdr_func.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/libamu/xutil.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/m4/GNUmakefile#2 delete
.. //depot/projects/delphij_fork/contrib/amd/m4/amdgrep#2 delete
.. //depot/projects/delphij_fork/contrib/amd/m4/amindent#2 delete
.. //depot/projects/delphij_fork/contrib/amd/m4/autopat#2 delete
.. //depot/projects/delphij_fork/contrib/amd/m4/chop-aclocal.pl#2 delete
.. //depot/projects/delphij_fork/contrib/amd/m4/copy-if-newbig#2 delete
.. //depot/projects/delphij_fork/contrib/amd/m4/macros/HEADER#2 delete
.. //depot/projects/delphij_fork/contrib/amd/m4/macros/TRAILER#2 delete
.. //depot/projects/delphij_fork/contrib/amd/m4/mk-aclocal#2 delete
.. //depot/projects/delphij_fork/contrib/amd/m4/mkconf#2 delete
.. //depot/projects/delphij_fork/contrib/amd/m4/rmtspc#2 delete
.. //depot/projects/delphij_fork/contrib/amd/m4/update_build_version#2 delete
.. //depot/projects/delphij_fork/contrib/amd/mk-amd-map/mk-amd-map.8#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/mk-amd-map/mk-amd-map.c#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/scripts/am-eject.in#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/scripts/amd.conf-sample#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/scripts/amd.conf.5#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/scripts/amd2ldif.in#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/scripts/amd2sun.in#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/scripts/automount2amd.8#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/scripts/automount2amd.in#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/scripts/ctl-amd.in#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/scripts/ctl-hlfsd.in#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/scripts/expn.1#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/scripts/expn.in#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/scripts/fix-amd-map.in#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/scripts/fixrmtab.in#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/scripts/redhat-ctl-amd.in#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/scripts/test-attrcache.in#1 branch
.. //depot/projects/delphij_fork/contrib/amd/scripts/wait4amd.in#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/scripts/wait4amd2die.in#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/tasks#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/vers.m4#1 branch
.. //depot/projects/delphij_fork/contrib/amd/wire-test/wire-test.8#2 integrate
.. //depot/projects/delphij_fork/contrib/amd/wire-test/wire-test.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/CHANGES#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/COPYRIGHT#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/FAQ#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/FAQ.xml#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/Makefile.in#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/README#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/check/check-tool.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/check/named-checkconf.8#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/check/named-checkconf.html#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/check/named-checkzone.8#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/check/named-checkzone.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/check/named-checkzone.html#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/dig/dig.1#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/dig/dig.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/dig/dig.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/dig/dig.html#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/dig/dighost.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/dig/host.1#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/dig/host.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/dig/host.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/dig/host.html#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/dig/nslookup.1#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/dig/nslookup.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/dig/nslookup.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/dig/nslookup.html#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/named/client.c#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/named/config.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/named/control.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/named/lwresd.8#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/named/lwresd.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/named/lwresd.html#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/named/named.8#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/named/named.conf.5#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/named/named.conf.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/named/named.conf.html#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/named/named.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/named/named.html#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/named/query.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/named/server.c#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/named/update.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/rndc/Makefile.in#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/rndc/rndc.8#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/rndc/rndc.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/bin/rndc/rndc.html#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/configure.in#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/arm/Bv9ARM.ch01.html#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/arm/Bv9ARM.ch02.html#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/arm/Bv9ARM.ch10.html#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/arm/Bv9ARM.pdf#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/arm/Makefile.in#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/arm/man.dig.html#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/arm/man.dnssec-keygen.html#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/arm/man.dnssec-signzone.html#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/arm/man.host.html#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/arm/man.named-checkconf.html#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/arm/man.named-checkzone.html#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/arm/man.named.html#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/arm/man.rndc-confgen.html#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/arm/man.rndc.conf.html#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/arm/man.rndc.html#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#2 delete
.. //depot/projects/delphij_fork/contrib/bind9/doc/misc/Makefile.in#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/misc/migration#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/rfc/index#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/doc/rfc/rfc4398.txt#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/doc/rfc/rfc4408.txt#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/doc/rfc/rfc4470.txt#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/doc/rfc/rfc4634.txt#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/doc/rfc/rfc4641.txt#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/lib/bind/api#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/bind/config.h.in#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/bind/configure#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/bind/configure.in#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/bind/irs/gai_strerror.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/bind/irs/irs_data.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/bind/make/rules.in#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/bind/port_before.h.in#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/bind/resolv/res_data.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/bind9/api#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/bind9/check.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/adb.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/api#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/dispatch.c#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/dnssec.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/include/dns/db.h#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/include/dns/dispatch.h#3 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/journal.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/lookup.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/master.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/message.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/openssl_link.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/openssldh_link.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/rbtdb.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/rdataslab.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/resolver.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/rootns.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/sdb.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/sdlz.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/tsig.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/validator.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/view.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/xfrin.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/dns/zone.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/Makefile.in#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/alpha/Makefile.in#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/alpha/include/Makefile.in#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/api#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/arm/include/isc/atomic.h#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/hmacsha.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/ia64/Makefile.in#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/ia64/include/Makefile.in#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/include/isc/platform.h.in#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/include/isc/string.h#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/mem.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/mips/Makefile.in#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/mips/include/Makefile.in#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/noatomic/Makefile.in#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/noatomic/include/Makefile.in#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/powerpc/Makefile.in#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/powerpc/include/Makefile.in#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/sparc64/Makefile.in#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/sparc64/include/Makefile.in#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/timer.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/unix/net.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/unix/socket.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/unix/syslog.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/x86_32/Makefile.in#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/x86_32/include/Makefile.in#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/x86_64/Makefile.in#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/x86_64/include/Makefile.in#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in#1 branch
.. //depot/projects/delphij_fork/contrib/bind9/lib/isccc/symtab.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/isccfg/api#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/lwres/api#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/lwres/context.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/lwres/getipnode.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/lwres/lwres_gnba.c#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/make/rules.in#2 integrate
.. //depot/projects/delphij_fork/contrib/bind9/version#3 integrate
.. //depot/projects/delphij_fork/contrib/less/NEWS#5 integrate
.. //depot/projects/delphij_fork/contrib/less/README#5 integrate
.. //depot/projects/delphij_fork/contrib/less/less.man#5 integrate
.. //depot/projects/delphij_fork/contrib/less/less.nro#5 integrate
.. //depot/projects/delphij_fork/contrib/less/lessecho.man#5 integrate
.. //depot/projects/delphij_fork/contrib/less/lessecho.nro#5 integrate
.. //depot/projects/delphij_fork/contrib/less/lesskey.man#5 integrate
.. //depot/projects/delphij_fork/contrib/less/lesskey.nro#5 integrate
.. //depot/projects/delphij_fork/contrib/less/search.c#4 integrate
.. //depot/projects/delphij_fork/contrib/less/version.c#5 integrate
.. //depot/projects/delphij_fork/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate
.. //depot/projects/delphij_fork/etc/defaults/periodic.conf#2 integrate
.. //depot/projects/delphij_fork/etc/freebsd-update.conf#3 integrate
.. //depot/projects/delphij_fork/etc/gss/mech#2 integrate
.. //depot/projects/delphij_fork/games/fortune/datfiles/Makefile#2 integrate
.. //depot/projects/delphij_fork/games/fortune/datfiles/fortunes#4 integrate
.. //depot/projects/delphij_fork/games/fortune/datfiles/fortunes-o.real#3 integrate
.. //depot/projects/delphij_fork/games/fortune/datfiles/fortunes-o.sp.ok#2 integrate
.. //depot/projects/delphij_fork/games/fortune/datfiles/fortunes.sp.ok#2 integrate
.. //depot/projects/delphij_fork/games/fortune/datfiles/fortunes2-o#2 delete
.. //depot/projects/delphij_fork/games/fortune/datfiles/freebsd-tips#2 integrate
.. //depot/projects/delphij_fork/games/fortune/datfiles/freebsd-tips.sp.ok#1 branch
.. //depot/projects/delphij_fork/games/fortune/datfiles/limerick#3 integrate
.. //depot/projects/delphij_fork/games/fortune/datfiles/limerick.sp.ok#1 branch
.. //depot/projects/delphij_fork/games/fortune/datfiles/murphy#2 integrate
.. //depot/projects/delphij_fork/games/fortune/datfiles/murphy-o#2 integrate
.. //depot/projects/delphij_fork/games/fortune/datfiles/murphy.sp.ok#1 branch
.. //depot/projects/delphij_fork/games/fortune/datfiles/startrek#2 integrate
.. //depot/projects/delphij_fork/games/fortune/datfiles/zippy#2 integrate
.. //depot/projects/delphij_fork/games/fortune/datfiles/zippy.sp.ok#2 integrate
.. //depot/projects/delphij_fork/gnu/usr.bin/groff/tmac/mdoc.local#4 integrate
.. //depot/projects/delphij_fork/include/assert.h#2 integrate
.. //depot/projects/delphij_fork/include/elf.h#2 integrate
.. //depot/projects/delphij_fork/lib/bind/bind/Makefile#2 integrate
.. //depot/projects/delphij_fork/lib/bind/bind/config.h#2 integrate
.. //depot/projects/delphij_fork/lib/bind/bind/port_before.h#2 integrate
.. //depot/projects/delphij_fork/lib/bind/config.h#2 integrate
.. //depot/projects/delphij_fork/lib/bind/config.mk#2 integrate
.. //depot/projects/delphij_fork/lib/bind/isc/isc/platform.h#2 integrate
.. //depot/projects/delphij_fork/lib/bind/lwres/Makefile#2 integrate
.. //depot/projects/delphij_fork/lib/csu/common/crtbrand.c#2 integrate
.. //depot/projects/delphij_fork/lib/libarchive/archive_read_support_format_zip.c#4 integrate
.. //depot/projects/delphij_fork/lib/libc/amd64/Makefile.inc#2 integrate
.. //depot/projects/delphij_fork/lib/libc/gdtoa/_ldtoa.c#3 integrate
.. //depot/projects/delphij_fork/lib/libc/gdtoa/machdep_ldisQ.c#2 integrate
.. //depot/projects/delphij_fork/lib/libc/gdtoa/machdep_ldisx.c#2 integrate
.. //depot/projects/delphij_fork/lib/libc/gen/Symbol.map#2 integrate
.. //depot/projects/delphij_fork/lib/libc/gen/closedir.c#3 integrate
.. //depot/projects/delphij_fork/lib/libc/gen/readdir.c#2 integrate
.. //depot/projects/delphij_fork/lib/libc/gen/seekdir.c#2 integrate
.. //depot/projects/delphij_fork/lib/libc/gen/telldir.c#2 integrate
.. //depot/projects/delphij_fork/lib/libc/i386/Makefile.inc#2 integrate
.. //depot/projects/delphij_fork/lib/libc/ia64/Makefile.inc#2 integrate
.. //depot/projects/delphij_fork/lib/libc/nameser/ns_parse.c#2 integrate
.. //depot/projects/delphij_fork/lib/libc/resolv/res_data.c#2 integrate
.. //depot/projects/delphij_fork/lib/libc/resolv/res_init.c#2 integrate
.. //depot/projects/delphij_fork/lib/libc/sparc64/Makefile.inc#2 integrate
.. //depot/projects/delphij_fork/lib/libc/stdlib/malloc.3#2 integrate
.. //depot/projects/delphij_fork/lib/libc/stdlib/malloc.c#2 integrate
.. //depot/projects/delphij_fork/lib/libelf/gelf_xlatetof.3#2 integrate
.. //depot/projects/delphij_fork/lib/libelf/libelf_xlate.c#2 integrate
.. //depot/projects/delphij_fork/lib/libgssapi/gss_acquire_cred.c#2 integrate
.. //depot/projects/delphij_fork/lib/libkse/Makefile#4 integrate
.. //depot/projects/delphij_fork/lib/libkse/arch/amd64/include/atomic_ops.h#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/arch/amd64/include/pthread_md.h#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/arch/arm/include/atomic_ops.h#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/arch/i386/include/atomic_ops.h#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/arch/i386/include/pthread_md.h#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/arch/ia64/include/atomic_ops.h#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/arch/ia64/include/pthread_md.h#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/include/atomic_ops.h#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/include/pthread_md.h#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/arch/sparc64/include/atomic_ops.h#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/arch/sparc64/include/pthread_md.h#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/kse.map#2 integrate
.. //depot/projects/delphij_fork/lib/libkse/sys/lock.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/sys/lock.h#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/sys/thr_error.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_accept.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_aio_suspend.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_atfork.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_destroy.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_get_np.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getdetachstate.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getguardsize.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getinheritsched.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getschedparam.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getschedpolicy.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getscope.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getstack.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getstackaddr.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getstacksize.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_init.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setdetachstate.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setguardsize.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setinheritsched.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setschedparam.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setschedpolicy.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setscope.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setstack.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setstackaddr.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setstacksize.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_barrier.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_barrierattr.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_cancel.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_clean.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_close.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_concurrency.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_cond.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_condattr_destroy.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_condattr_init.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_condattr_pshared.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_connect.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_creat.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_create.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_detach.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_equal.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_execve.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_exit.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_fcntl.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_find_thread.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_fork.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_fsync.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_getschedparam.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_info.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_init.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_join.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_kern.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_kill.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_main_np.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_mattr_init.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_mattr_kind_np.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_mattr_pshared.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_msync.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_multi_np.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_mutex.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_mutex_prioceiling.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_mutex_protocol.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_mutexattr_destroy.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_nanosleep.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_once.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_open.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_pause.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_poll.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_priority_queue.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_private.h#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_pselect.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_pspinlock.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_raise.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_read.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_readv.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_resume_np.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_rtld.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_rwlock.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_rwlockattr.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_select.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_self.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_seterrno.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_setprio.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_setschedparam.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_sig.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigaction.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigaltstack.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigmask.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigpending.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigprocmask.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigsuspend.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigwait.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_single_np.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_sleep.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_spec.c#4 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_spinlock.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_stack.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_suspend_np.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_switch_np.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_symbols.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_system.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_tcdrain.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_vfork.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_wait.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_wait4.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_waitpid.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_write.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_writev.c#3 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_yield.c#3 integrate
.. //depot/projects/delphij_fork/lib/libpmc/libpmc.c#2 integrate
.. //depot/projects/delphij_fork/lib/libpmc/pmc.3#3 integrate
.. //depot/projects/delphij_fork/lib/libpmc/pmclog.c#2 integrate
.. //depot/projects/delphij_fork/lib/libpmc/pmclog.h#2 integrate
.. //depot/projects/delphij_fork/lib/libthr/pthread.map#2 integrate
.. //depot/projects/delphij_fork/lib/libthr/thread/thr_mutex.c#5 integrate
.. //depot/projects/delphij_fork/libexec/rtld-elf/sparc64/rtld_machdep.h#2 integrate
.. //depot/projects/delphij_fork/release/Makefile#8 integrate
.. //depot/projects/delphij_fork/release/doc/en_US.ISO8859-1/relnotes/article.sgml#16 integrate
.. //depot/projects/delphij_fork/release/doc/share/sgml/release.ent#4 integrate
.. //depot/projects/delphij_fork/release/fixit.profile#2 integrate
.. //depot/projects/delphij_fork/release/picobsd/tinyware/msg/msg.c#2 integrate
.. //depot/projects/delphij_fork/sbin/atacontrol/atacontrol.8#2 integrate
.. //depot/projects/delphij_fork/sbin/dhclient/dispatch.c#2 integrate
.. //depot/projects/delphij_fork/sbin/ipfw/ipfw.8#5 integrate
.. //depot/projects/delphij_fork/sbin/mdconfig/mdconfig.8#3 integrate
.. //depot/projects/delphij_fork/sbin/mount/mount.8#3 integrate
.. //depot/projects/delphij_fork/sbin/newfs/newfs.8#2 integrate
.. //depot/projects/delphij_fork/sbin/newfs/newfs.c#2 integrate
.. //depot/projects/delphij_fork/sbin/newfs/newfs.h#2 integrate
.. //depot/projects/delphij_fork/sbin/sysctl/sysctl.8#4 integrate
.. //depot/projects/delphij_fork/share/examples/cvsup/refuse#2 integrate
.. //depot/projects/delphij_fork/share/examples/cvsup/refuse.README#2 integrate
.. //depot/projects/delphij_fork/share/man/man4/aac.4#3 integrate
.. //depot/projects/delphij_fork/share/man/man4/agp.4#2 integrate
.. //depot/projects/delphij_fork/share/man/man4/enc.4#3 integrate
.. //depot/projects/delphij_fork/share/man/man4/hwpmc.4#4 integrate
.. //depot/projects/delphij_fork/share/man/man4/ichsmb.4#2 integrate
.. //depot/projects/delphij_fork/share/man/man4/msk.4#3 integrate
.. //depot/projects/delphij_fork/share/man/man4/nfe.4#3 integrate
.. //depot/projects/delphij_fork/share/man/man4/rl.4#2 integrate
.. //depot/projects/delphij_fork/share/man/man9/Makefile#7 integrate
.. //depot/projects/delphij_fork/share/man/man9/rwlock.9#3 integrate
.. //depot/projects/delphij_fork/share/man/man9/stack.9#1 branch
.. //depot/projects/delphij_fork/share/man/man9/sx.9#3 integrate
.. //depot/projects/delphij_fork/share/misc/iso3166#2 integrate
.. //depot/projects/delphij_fork/share/mk/bsd.subdir.mk#2 integrate
.. //depot/projects/delphij_fork/share/mk/sys.mk#6 integrate
.. //depot/projects/delphij_fork/share/zoneinfo/asia#4 integrate
.. //depot/projects/delphij_fork/share/zoneinfo/northamerica#4 integrate
.. //depot/projects/delphij_fork/share/zoneinfo/southamerica#3 integrate
.. //depot/projects/delphij_fork/share/zoneinfo/zone.tab#3 integrate
.. //depot/projects/delphij_fork/sys/amd64/amd64/busdma_machdep.c#2 integrate
.. //depot/projects/delphij_fork/sys/amd64/amd64/db_trace.c#3 integrate
.. //depot/projects/delphij_fork/sys/amd64/amd64/exception.S#3 integrate
.. //depot/projects/delphij_fork/sys/amd64/amd64/pmap.c#5 integrate
.. //depot/projects/delphij_fork/sys/amd64/amd64/prof_machdep.c#2 integrate
.. //depot/projects/delphij_fork/sys/amd64/amd64/stack_machdep.c#1 branch
.. //depot/projects/delphij_fork/sys/amd64/amd64/trap.c#4 integrate
.. //depot/projects/delphij_fork/sys/amd64/conf/GENERIC#4 integrate
.. //depot/projects/delphij_fork/sys/amd64/conf/NOTES#5 integrate
.. //depot/projects/delphij_fork/sys/amd64/include/pci_cfgreg.h#2 integrate
.. //depot/projects/delphij_fork/sys/amd64/include/pmc_mdep.h#2 integrate
.. //depot/projects/delphij_fork/sys/amd64/include/stack.h#1 branch
.. //depot/projects/delphij_fork/sys/amd64/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/delphij_fork/sys/arm/arm/busdma_machdep.c#4 integrate
.. //depot/projects/delphij_fork/sys/arm/arm/cpufunc.c#7 integrate
.. //depot/projects/delphij_fork/sys/arm/arm/db_trace.c#2 integrate
.. //depot/projects/delphij_fork/sys/arm/arm/nexus_io.c#2 delete
.. //depot/projects/delphij_fork/sys/arm/arm/nexus_io_asm.S#2 delete
.. //depot/projects/delphij_fork/sys/arm/arm/pmap.c#7 integrate
.. //depot/projects/delphij_fork/sys/arm/arm/stack_machdep.c#1 branch
.. //depot/projects/delphij_fork/sys/arm/conf/AVILA#3 integrate
.. //depot/projects/delphij_fork/sys/arm/conf/BWCT#2 integrate
.. //depot/projects/delphij_fork/sys/arm/conf/CRB#3 integrate
.. //depot/projects/delphij_fork/sys/arm/conf/EP80219#2 integrate
.. //depot/projects/delphij_fork/sys/arm/conf/HL200#2 integrate
.. //depot/projects/delphij_fork/sys/arm/conf/IQ31244#2 integrate
.. //depot/projects/delphij_fork/sys/arm/conf/KB920X#3 integrate
.. //depot/projects/delphij_fork/sys/arm/conf/SIMICS#2 integrate
.. //depot/projects/delphij_fork/sys/arm/conf/SKYEYE#2 integrate
.. //depot/projects/delphij_fork/sys/arm/include/asmacros.h#3 integrate
.. //depot/projects/delphij_fork/sys/arm/include/atomic.h#2 integrate
.. //depot/projects/delphij_fork/sys/arm/include/pmc_mdep.h#2 integrate
.. //depot/projects/delphij_fork/sys/arm/include/stack.h#1 branch
.. //depot/projects/delphij_fork/sys/arm/sa11x0/files.sa11x0#2 integrate
.. //depot/projects/delphij_fork/sys/boot/i386/gptboot/gptldr.S#2 integrate
.. //depot/projects/delphij_fork/sys/boot/i386/pmbr/pmbr.s#2 integrate
.. //depot/projects/delphij_fork/sys/compat/freebsd32/freebsd32.h#2 integrate
.. //depot/projects/delphij_fork/sys/compat/freebsd32/freebsd32_ipc.h#1 branch
.. //depot/projects/delphij_fork/sys/compat/freebsd32/freebsd32_misc.c#4 integrate
.. //depot/projects/delphij_fork/sys/compat/freebsd32/freebsd32_proto.h#4 integrate
.. //depot/projects/delphij_fork/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate
.. //depot/projects/delphij_fork/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate
.. //depot/projects/delphij_fork/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate
.. //depot/projects/delphij_fork/sys/compat/freebsd32/syscalls.master#4 integrate
.. //depot/projects/delphij_fork/sys/compat/linprocfs/linprocfs.c#3 integrate
.. //depot/projects/delphij_fork/sys/compat/ndis/ndis_var.h#2 integrate
.. //depot/projects/delphij_fork/sys/compat/ndis/ntoskrnl_var.h#2 integrate
.. //depot/projects/delphij_fork/sys/compat/ndis/subr_ndis.c#2 integrate
.. //depot/projects/delphij_fork/sys/compat/ndis/subr_ntoskrnl.c#4 integrate
.. //depot/projects/delphij_fork/sys/compat/opensolaris/rpc/xdr.h#2 integrate
.. //depot/projects/delphij_fork/sys/compat/opensolaris/sys/atomic.h#2 integrate
.. //depot/projects/delphij_fork/sys/compat/opensolaris/sys/bitmap.h#1 branch
.. //depot/projects/delphij_fork/sys/compat/opensolaris/sys/cpupart.h#1 branch
.. //depot/projects/delphij_fork/sys/compat/opensolaris/sys/cpuvar.h#1 branch
.. //depot/projects/delphij_fork/sys/compat/opensolaris/sys/cyclic.h#1 branch
.. //depot/projects/delphij_fork/sys/compat/opensolaris/sys/elf.h#1 branch
.. //depot/projects/delphij_fork/sys/compat/opensolaris/sys/kmem.h#2 integrate
.. //depot/projects/delphij_fork/sys/compat/opensolaris/sys/mman.h#1 branch
.. //depot/projects/delphij_fork/sys/compat/opensolaris/sys/modctl.h#1 branch
.. //depot/projects/delphij_fork/sys/compat/opensolaris/sys/objfs.h#1 branch
.. //depot/projects/delphij_fork/sys/compat/opensolaris/sys/param.h#1 branch
.. //depot/projects/delphij_fork/sys/compat/opensolaris/sys/pcpu.h#1 branch
.. //depot/projects/delphij_fork/sys/compat/opensolaris/sys/proc.h#4 integrate
.. //depot/projects/delphij_fork/sys/compat/opensolaris/sys/stat.h#1 branch
.. //depot/projects/delphij_fork/sys/compat/opensolaris/sys/time.h#2 integrate
.. //depot/projects/delphij_fork/sys/compat/opensolaris/sys/types.h#2 integrate
.. //depot/projects/delphij_fork/sys/conf/Makefile.amd64#2 integrate
.. //depot/projects/delphij_fork/sys/conf/NOTES#13 integrate
.. //depot/projects/delphij_fork/sys/conf/files#13 integrate
.. //depot/projects/delphij_fork/sys/conf/files.amd64#7 integrate
.. //depot/projects/delphij_fork/sys/conf/files.arm#3 integrate
.. //depot/projects/delphij_fork/sys/conf/files.i386#7 integrate
.. //depot/projects/delphij_fork/sys/conf/files.ia64#3 integrate
.. //depot/projects/delphij_fork/sys/conf/files.pc98#4 integrate
.. //depot/projects/delphij_fork/sys/conf/files.powerpc#3 integrate
.. //depot/projects/delphij_fork/sys/conf/files.sparc64#2 integrate
.. //depot/projects/delphij_fork/sys/conf/files.sun4v#3 integrate
.. //depot/projects/delphij_fork/sys/conf/options#8 integrate
.. //depot/projects/delphij_fork/sys/conf/options.amd64#2 integrate
.. //depot/projects/delphij_fork/sys/conf/options.i386#2 integrate
.. //depot/projects/delphij_fork/sys/contrib/ipfilter/netinet/fil.c#3 integrate
.. //depot/projects/delphij_fork/sys/contrib/ipfilter/netinet/ip_auth.c#3 integrate
.. //depot/projects/delphij_fork/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate
.. //depot/projects/delphij_fork/sys/contrib/opensolaris/common/avl/avl.c#2 integrate
.. //depot/projects/delphij_fork/sys/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate
.. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 integrate
.. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate
.. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate
.. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate
.. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate
.. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate
.. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate
.. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate
.. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate
.. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate
.. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/sys/procset.h#2 integrate
.. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate
.. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/sys/vmem.h#2 integrate
.. //depot/projects/delphij_fork/sys/dev/aac/aac.c#4 integrate
.. //depot/projects/delphij_fork/sys/dev/aac/aac_cam.c#3 integrate
.. //depot/projects/delphij_fork/sys/dev/aac/aac_pci.c#4 integrate
.. //depot/projects/delphij_fork/sys/dev/aac/aacreg.h#2 integrate
.. //depot/projects/delphij_fork/sys/dev/aac/aacvar.h#2 integrate
.. //depot/projects/delphij_fork/sys/dev/agp/agp_i810.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/amr/amr.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/amr/amr_cam.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/amr/amr_pci.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/an/if_an.c#6 integrate
.. //depot/projects/delphij_fork/sys/dev/ata/ata-chipset.c#7 integrate
.. //depot/projects/delphij_fork/sys/dev/em/if_em.c#6 integrate
.. //depot/projects/delphij_fork/sys/dev/em/if_em.h#4 integrate
.. //depot/projects/delphij_fork/sys/dev/hwpmc/hwpmc_amd.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/hwpmc/hwpmc_arm.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/hwpmc/hwpmc_ia64.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/hwpmc/hwpmc_logging.c#3 integrate
.. //depot/projects/delphij_fork/sys/dev/hwpmc/hwpmc_mod.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/hwpmc/hwpmc_piv.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/hwpmc/hwpmc_powerpc.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/hwpmc/hwpmc_sparc64.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/hwpmc/hwpmc_x86.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/ichsmb/ichsmb_pci.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/if_ndis/if_ndis.c#5 integrate
.. //depot/projects/delphij_fork/sys/dev/if_ndis/if_ndis_pci.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/if_ndis/if_ndisvar.h#3 integrate
.. //depot/projects/delphij_fork/sys/dev/ipw/if_ipw.c#5 integrate
.. //depot/projects/delphij_fork/sys/dev/iwi/if_iwi.c#5 integrate
.. //depot/projects/delphij_fork/sys/dev/msk/if_msk.c#4 integrate
.. //depot/projects/delphij_fork/sys/dev/msk/if_mskreg.h#3 integrate
.. //depot/projects/delphij_fork/sys/dev/random/yarrow.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/re/if_re.c#9 integrate
.. //depot/projects/delphij_fork/sys/dev/si/si_pci.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/sio/sio.c#3 integrate
.. //depot/projects/delphij_fork/sys/dev/sio/sio_isa.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/sio/sio_puc.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/snp/snp.c#3 integrate
.. //depot/projects/delphij_fork/sys/dev/sound/pci/hda/hdac.c#5 integrate
.. //depot/projects/delphij_fork/sys/dev/sound/pcm/channel.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/usb/if_zyd.c#6 integrate
.. //depot/projects/delphij_fork/sys/dev/usb/usbdevs#11 integrate
.. //depot/projects/delphij_fork/sys/dev/utopia/utopia.c#3 integrate
.. //depot/projects/delphij_fork/sys/dev/wpi/if_wpi.c#3 integrate
.. //depot/projects/delphij_fork/sys/dev/wpi/if_wpireg.h#2 integrate
.. //depot/projects/delphij_fork/sys/fs/tmpfs/tmpfs_subr.c#7 integrate
.. //depot/projects/delphij_fork/sys/fs/tmpfs/tmpfs_vfsops.c#10 integrate
.. //depot/projects/delphij_fork/sys/fs/tmpfs/tmpfs_vnops.c#7 integrate
.. //depot/projects/delphij_fork/sys/geom/geom_bsd.c#2 integrate
.. //depot/projects/delphij_fork/sys/geom/part/g_part.c#3 integrate
.. //depot/projects/delphij_fork/sys/geom/part/g_part.h#3 integrate
.. //depot/projects/delphij_fork/sys/geom/part/g_part_bsd.c#1 branch
.. //depot/projects/delphij_fork/sys/i386/bios/apm.c#4 integrate
.. //depot/projects/delphij_fork/sys/i386/conf/GENERIC#4 integrate
.. //depot/projects/delphij_fork/sys/i386/conf/NOTES#5 integrate
.. //depot/projects/delphij_fork/sys/i386/conf/XBOX#2 integrate
.. //depot/projects/delphij_fork/sys/i386/i386/busdma_machdep.c#2 integrate
.. //depot/projects/delphij_fork/sys/i386/i386/db_trace.c#2 integrate
.. //depot/projects/delphij_fork/sys/i386/i386/exception.s#2 integrate
.. //depot/projects/delphij_fork/sys/i386/i386/pmap.c#5 integrate
.. //depot/projects/delphij_fork/sys/i386/i386/stack_machdep.c#1 branch
.. //depot/projects/delphij_fork/sys/i386/i386/trap.c#4 integrate
.. //depot/projects/delphij_fork/sys/i386/include/pmc_mdep.h#2 integrate
.. //depot/projects/delphij_fork/sys/i386/include/stack.h#1 branch
.. //depot/projects/delphij_fork/sys/i386/isa/prof_machdep.c#2 integrate
.. //depot/projects/delphij_fork/sys/i386/linux/linux_machdep.c#4 integrate
.. //depot/projects/delphij_fork/sys/i386/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/delphij_fork/sys/ia64/conf/DEFAULTS#2 integrate
.. //depot/projects/delphij_fork/sys/ia64/conf/GENERIC#3 integrate
.. //depot/projects/delphij_fork/sys/ia64/ia64/busdma_machdep.c#2 integrate
.. //depot/projects/delphij_fork/sys/ia64/ia64/db_machdep.c#4 integrate
.. //depot/projects/delphij_fork/sys/ia64/ia64/stack_machdep.c#1 branch
.. //depot/projects/delphij_fork/sys/ia64/include/atomic.h#3 integrate
.. //depot/projects/delphij_fork/sys/ia64/include/pmc_mdep.h#2 integrate
.. //depot/projects/delphij_fork/sys/kern/imgact_elf.c#4 integrate
.. //depot/projects/delphij_fork/sys/kern/init_main.c#5 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_clock.c#4 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_conf.c#3 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_descrip.c#3 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_exec.c#7 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_linker.c#4 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_lock.c#4 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_mbuf.c#4 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_mib.c#2 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_module.c#2 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_mutex.c#4 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_pmc.c#2 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_proc.c#6 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_rwlock.c#4 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_sysctl.c#4 integrate
.. //depot/projects/delphij_fork/sys/kern/subr_bus.c#3 integrate
.. //depot/projects/delphij_fork/sys/kern/subr_stack.c#2 integrate
.. //depot/projects/delphij_fork/sys/kern/subr_trap.c#4 integrate
.. //depot/projects/delphij_fork/sys/kern/vfs_bio.c#4 integrate
.. //depot/projects/delphij_fork/sys/kern/vfs_mount.c#7 integrate
.. //depot/projects/delphij_fork/sys/kern/vfs_subr.c#5 integrate
.. //depot/projects/delphij_fork/sys/modules/amr/Makefile#2 integrate
.. //depot/projects/delphij_fork/sys/modules/zfs/Makefile#2 integrate
.. //depot/projects/delphij_fork/sys/net/if_enc.c#2 integrate
.. //depot/projects/delphij_fork/sys/net/if_lagg.c#7 integrate
.. //depot/projects/delphij_fork/sys/net/if_var.h#2 integrate
.. //depot/projects/delphij_fork/sys/net/pfil.c#2 integrate
.. //depot/projects/delphij_fork/sys/net/pfil.h#2 integrate
.. //depot/projects/delphij_fork/sys/net/route.c#3 integrate
.. //depot/projects/delphij_fork/sys/net80211/ieee80211.c#4 integrate
.. //depot/projects/delphij_fork/sys/net80211/ieee80211_output.c#6 integrate
.. //depot/projects/delphij_fork/sys/net80211/ieee80211_scan_sta.c#7 integrate
.. //depot/projects/delphij_fork/sys/netgraph/ng_cisco.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/if_ether.c#4 integrate
.. //depot/projects/delphij_fork/sys/netinet/in_pcb.h#3 integrate
.. //depot/projects/delphij_fork/sys/netinet/ip_input.c#5 integrate
.. //depot/projects/delphij_fork/sys/netinet/libalias/alias_util.c#3 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp.h#7 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_output.c#12 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_structs.h#9 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_usrreq.c#13 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctputil.c#14 integrate
.. //depot/projects/delphij_fork/sys/netinet/tcp_output.c#5 integrate
.. //depot/projects/delphij_fork/sys/netinet/tcp_subr.c#10 integrate
.. //depot/projects/delphij_fork/sys/netinet/tcp_syncache.c#7 integrate
.. //depot/projects/delphij_fork/sys/netinet/tcp_var.h#5 integrate
.. //depot/projects/delphij_fork/sys/netinet6/in6.c#3 integrate
.. //depot/projects/delphij_fork/sys/netipsec/ipsec.c#2 integrate
.. //depot/projects/delphij_fork/sys/netipsec/ipsec.h#2 integrate
.. //depot/projects/delphij_fork/sys/netipsec/ipsec_input.c#4 integrate
.. //depot/projects/delphij_fork/sys/netipsec/ipsec_output.c#3 integrate
.. //depot/projects/delphij_fork/sys/netipsec/xform.h#2 integrate
.. //depot/projects/delphij_fork/sys/netipsec/xform_ipip.c#3 integrate
.. //depot/projects/delphij_fork/sys/pc98/conf/GENERIC#4 integrate
.. //depot/projects/delphij_fork/sys/pc98/include/stack.h#1 branch
.. //depot/projects/delphij_fork/sys/pci/if_rl.c#4 integrate
.. //depot/projects/delphij_fork/sys/pci/if_rlreg.h#4 integrate
.. //depot/projects/delphij_fork/sys/pci/xrpu.c#2 delete
.. //depot/projects/delphij_fork/sys/powerpc/conf/GENERIC#4 integrate
.. //depot/projects/delphij_fork/sys/powerpc/include/atomic.h#4 integrate
.. //depot/projects/delphij_fork/sys/powerpc/include/pmc_mdep.h#2 integrate
.. //depot/projects/delphij_fork/sys/powerpc/include/stack.h#1 branch
.. //depot/projects/delphij_fork/sys/powerpc/powerpc/db_trace.c#2 integrate
.. //depot/projects/delphij_fork/sys/powerpc/powerpc/stack_machdep.c#1 branch
.. //depot/projects/delphij_fork/sys/security/audit/audit.c#3 integrate
.. //depot/projects/delphij_fork/sys/sparc64/conf/GENERIC#3 integrate
.. //depot/projects/delphij_fork/sys/sparc64/include/pmc_mdep.h#2 integrate
.. //depot/projects/delphij_fork/sys/sparc64/include/stack.h#1 branch
.. //depot/projects/delphij_fork/sys/sparc64/pci/ofw_pcibus.c#3 integrate
.. //depot/projects/delphij_fork/sys/sparc64/pci/psycho.c#5 integrate
.. //depot/projects/delphij_fork/sys/sparc64/pci/psychovar.h#2 integrate
.. //depot/projects/delphij_fork/sys/sparc64/sparc64/db_trace.c#2 integrate
.. //depot/projects/delphij_fork/sys/sparc64/sparc64/stack_machdep.c#1 branch
.. //depot/projects/delphij_fork/sys/sun4v/conf/GENERIC#3 integrate
.. //depot/projects/delphij_fork/sys/sun4v/include/pcpu.h#3 integrate
.. //depot/projects/delphij_fork/sys/sun4v/include/pmc_mdep.h#2 integrate
.. //depot/projects/delphij_fork/sys/sun4v/include/stack.h#1 branch
.. //depot/projects/delphij_fork/sys/sun4v/sun4v/db_trace.c#2 integrate
.. //depot/projects/delphij_fork/sys/sun4v/sun4v/stack_machdep.c#1 branch
.. //depot/projects/delphij_fork/sys/sys/_elf_solaris.h#2 delete
.. //depot/projects/delphij_fork/sys/sys/elf.h#2 integrate
.. //depot/projects/delphij_fork/sys/sys/elf_common.h#2 integrate
.. //depot/projects/delphij_fork/sys/sys/kernel.h#3 integrate
.. //depot/projects/delphij_fork/sys/sys/linker.h#5 integrate
.. //depot/projects/delphij_fork/sys/sys/param.h#6 integrate
.. //depot/projects/delphij_fork/sys/sys/pcpu.h#3 integrate
.. //depot/projects/delphij_fork/sys/sys/pmc.h#2 integrate
.. //depot/projects/delphij_fork/sys/sys/pmckern.h#2 integrate
.. //depot/projects/delphij_fork/sys/sys/pmclog.h#2 integrate
.. //depot/projects/delphij_fork/sys/sys/proc.h#9 integrate
.. //depot/projects/delphij_fork/sys/sys/resource.h#2 integrate
.. //depot/projects/delphij_fork/sys/sys/signal.h#2 integrate
.. //depot/projects/delphij_fork/sys/sys/stack.h#2 integrate
.. //depot/projects/delphij_fork/sys/sys/stat.h#2 integrate
.. //depot/projects/delphij_fork/sys/sys/sysctl.h#3 integrate
.. //depot/projects/delphij_fork/sys/sys/systm.h#3 integrate
.. //depot/projects/delphij_fork/sys/sys/time.h#2 integrate
.. //depot/projects/delphij_fork/sys/sys/types.h#2 integrate
.. //depot/projects/delphij_fork/sys/sys/ucred.h#2 integrate
.. //depot/projects/delphij_fork/sys/sys/user.h#3 integrate
.. //depot/projects/delphij_fork/sys/sys/xrpuio.h#2 delete
.. //depot/projects/delphij_fork/sys/ufs/ffs/ffs_alloc.c#4 integrate
.. //depot/projects/delphij_fork/sys/vm/redzone.c#2 integrate
.. //depot/projects/delphij_fork/sys/vm/vm_contig.c#4 integrate
.. //depot/projects/delphij_fork/sys/vm/vm_page.c#10 integrate
.. //depot/projects/delphij_fork/sys/vm/vm_pageout.c#5 integrate
.. //depot/projects/delphij_fork/sys/vm/vm_pageout.h#2 integrate
.. //depot/projects/delphij_fork/tools/regression/lib/libc/stdio/test-printfloat.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/lib/libc/stdio/test-scanfloat.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/netinet/tcpconnect/README.tcp-md5#1 branch
.. //depot/projects/delphij_fork/tools/regression/netinet/tcpconnect/tcpconnect.c#2 integrate
.. //depot/projects/delphij_fork/tools/tools/ath/athdebug/athdebug.c#2 integrate
.. //depot/projects/delphij_fork/tools/tools/ath/athstats/athstats.c#2 integrate
.. //depot/projects/delphij_fork/tools/tools/ath/athstats/athstats.h#2 integrate
.. //depot/projects/delphij_fork/tools/tools/ath/athstats/main.c#2 integrate
.. //depot/projects/delphij_fork/tools/tools/ath/athstats/statfoo.c#2 integrate
.. //depot/projects/delphij_fork/tools/tools/ath/athstats/statfoo.h#2 integrate
.. //depot/projects/delphij_fork/tools/tools/net80211/wlanstats/main.c#3 integrate
.. //depot/projects/delphij_fork/tools/tools/net80211/wlanstats/statfoo.c#3 integrate
.. //depot/projects/delphij_fork/tools/tools/net80211/wlanstats/statfoo.h#2 integrate
.. //depot/projects/delphij_fork/tools/tools/net80211/wlanstats/wlanstats.c#3 integrate
.. //depot/projects/delphij_fork/tools/tools/net80211/wlanstats/wlanstats.h#2 integrate
.. //depot/projects/delphij_fork/tools/tools/net80211/wlanwatch/wlanwatch.c#2 integrate
.. //depot/projects/delphij_fork/usr.bin/Makefile#4 integrate
.. //depot/projects/delphij_fork/usr.bin/fstat/zfs/Makefile#2 integrate
.. //depot/projects/delphij_fork/usr.bin/kdump/kdump.c#4 integrate
.. //depot/projects/delphij_fork/usr.bin/login/login.1#2 integrate
.. //depot/projects/delphij_fork/usr.bin/make/main.c#2 integrate
.. //depot/projects/delphij_fork/usr.bin/procstat/Makefile#1 branch
.. //depot/projects/delphij_fork/usr.bin/procstat/procstat.1#1 branch
.. //depot/projects/delphij_fork/usr.bin/procstat/procstat.c#1 branch
.. //depot/projects/delphij_fork/usr.bin/procstat/procstat.h#1 branch
.. //depot/projects/delphij_fork/usr.bin/procstat/procstat_args.c#1 branch
.. //depot/projects/delphij_fork/usr.bin/procstat/procstat_basic.c#1 branch
.. //depot/projects/delphij_fork/usr.bin/procstat/procstat_bin.c#1 branch
.. //depot/projects/delphij_fork/usr.bin/procstat/procstat_cred.c#1 branch
.. //depot/projects/delphij_fork/usr.bin/procstat/procstat_files.c#1 branch
.. //depot/projects/delphij_fork/usr.bin/procstat/procstat_kstack.c#1 branch
.. //depot/projects/delphij_fork/usr.bin/procstat/procstat_threads.c#1 branch
.. //depot/projects/delphij_fork/usr.bin/procstat/procstat_vm.c#1 branch
.. //depot/projects/delphij_fork/usr.sbin/Makefile#6 integrate
.. //depot/projects/delphij_fork/usr.sbin/amd/amd/Makefile#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/amd/fsinfo/Makefile#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/amd/include/amu_autofs_prot.h#1 branch
.. //depot/projects/delphij_fork/usr.sbin/amd/include/aux_conf.h#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/amd/include/build_version.h#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/amd/include/config.h#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/amd/include/newvers.sh#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/amd/libamu/Makefile#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/amd/mk-amd-map/Makefile#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/mtree/verify.c#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/newsyslog/newsyslog.conf.5#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/pmcstat/Makefile#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/pmcstat/pmcstat.8#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/pmcstat/pmcstat.c#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/pmcstat/pmcstat.h#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/pmcstat/pmcstat_log.c#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/syslogd/syslogd.c#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/zic/zic.c#2 integrate
.. //depot/user/howardsu/truss/ObsoleteFiles.inc#30 integrate
.. //depot/user/howardsu/truss/bin/sh/sh.1#4 integrate
.. //depot/user/howardsu/truss/contrib/amd/AUTHORS#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/BUGS#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/COPYING#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/ChangeLog#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/FAQ#1 branch
.. //depot/user/howardsu/truss/contrib/amd/INSTALL#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/NEWS#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/README.attrcache#1 branch
.. //depot/user/howardsu/truss/contrib/amd/README.ldap#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/am_ops.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/amd.8#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/amd.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/amd.h#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/amfs_auto.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/amfs_direct.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/amfs_error.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/amfs_generic.c#1 branch
.. //depot/user/howardsu/truss/contrib/amd/amd/amfs_host.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/amfs_inherit.c#2 delete
.. //depot/user/howardsu/truss/contrib/amd/amd/amfs_link.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/amfs_linkx.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/amfs_nfsl.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/amfs_nfsx.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/amfs_program.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/amfs_root.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/amfs_toplvl.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/amfs_union.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/amq_subr.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/amq_svc.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/autil.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/clock.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/conf.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/conf_parse.y#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/conf_tok.l#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/get_args.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/info_exec.c#1 branch
.. //depot/user/howardsu/truss/contrib/amd/amd/info_file.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/info_hesiod.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/info_ldap.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/info_ndbm.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/info_nis.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/info_nisplus.c#2 integrate
.. //depot/user/howardsu/truss/contrib/amd/amd/info_passwd.c#2 integrate

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 00:23:25 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7F8A316A502; Sat,  8 Dec 2007 00:23:24 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5B1E416A5B1
	for ; Sat,  8 Dec 2007 00:23:24 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 47F4B13C4E7
	for ; Sat,  8 Dec 2007 00:23:24 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB80NOiL068628
	for ; Sat, 8 Dec 2007 00:23:24 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB80NOUQ068625
	for perforce@freebsd.org; Sat, 8 Dec 2007 00:23:24 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 8 Dec 2007 00:23:24 GMT
Message-Id: <200712080023.lB80NOUQ068625@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130443 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 00:23:25 -0000

http://perforce.freebsd.org/chv.cgi?CH=130443

Change 130443 by jb@jb_freebsd1 on 2007/12/08 00:22:57

	Update to account for different include file strategy.

Affected files ...

.. //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#9 edit

Differences ...

==== //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#9 (text+ko) ====

@@ -1,10 +1,18 @@
 # $FreeBSD$
 
+.if ${MACHINE_ARCH} == "amd64"
+ARCHDIR=	i386
+.else
+ARCHDIR=	${MACHINE_ARCH}
+.endif
+
+.PATH: ${.CURDIR}/../../../contrib/opensolaris/uts/common/dtrace
 .PATH: ${.CURDIR}/../../../cddl/dev/dtrace
-.PATH: ${.CURDIR}/../../../cddl/dev/dtrace/${MACHINE_ARCH}
+.PATH: ${.CURDIR}/../../../cddl/dev/dtrace/${ARCHDIR}
 
 KMOD=		dtrace
-SRCS=		dtrace.c \
+SRCS=		dtrace.c
+UYUYSRCS=	\
 		dtrace_mutex.c \
 		dtrace_asm.S \
 		dtrace_subr.c
@@ -16,11 +24,10 @@
 
 SRCS+=		bus_if.h device_if.h vnode_if.h
 
-CFLAGS+=	-I${.CURDIR}/../../../cddl/dev/dtrace \
-		-I${.CURDIR}/../../../cddl/dev/dtrace/${MACHINE_ARCH} \
-		-I${.CURDIR}/../../../contrib/opensolaris/compat \
+CFLAGS+=	-I${.CURDIR}/../../../compat/opensolaris \
+		-I${.CURDIR}/../../../cddl/dev/dtrace \
+		-I${.CURDIR}/../../../cddl/dev/dtrace/${ARCHDIR} \
 		-I${.CURDIR}/../../../contrib/opensolaris/uts/common \
-		-I${.CURDIR}/../../../contrib \
 		-I${.CURDIR}/../../.. -DDIS_MEM
 
 CFLAGS+=	-DDEBUG

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 00:25:27 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1AFF216A41A; Sat,  8 Dec 2007 00:25:27 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C88A816A417
	for ; Sat,  8 Dec 2007 00:25:26 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B881C13C469
	for ; Sat,  8 Dec 2007 00:25:26 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB80PQsc068911
	for ; Sat, 8 Dec 2007 00:25:26 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB80PQfJ068908
	for perforce@freebsd.org; Sat, 8 Dec 2007 00:25:26 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 8 Dec 2007 00:25:26 GMT
Message-Id: <200712080025.lB80PQfJ068908@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130444 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 00:25:27 -0000

http://perforce.freebsd.org/chv.cgi?CH=130444

Change 130444 by jb@jb_freebsd1 on 2007/12/08 00:24:54

	Save some WIP.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_cddl.h#2 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_cddl.h#2 (text+ko) ====

@@ -25,10 +25,22 @@
 #ifndef _DTRACE_CDDL_H_
 #define	_DTRACE_CDDL_H_
 
+#include 
+
+/*
+ * Kernel DTrace extension to 'struct proc' for FreeBSD.
+ */
+typedef struct kdtrace_proc {
+	int		p_dtrace_probes;	/* Are there probes for this proc? */
+	u_int64_t	p_dtrace_count;		/* Number of DTrace tracepoints */
+	void		*p_dtrace_helpers;	/* DTrace helpers, if any */
+
+} kdtrace_proc_t;
+
 /*
  * Kernel DTrace extension to 'struct thread' for FreeBSD.
  */
-struct kdtrace_thread {
+typedef struct kdtrace_thread {
 	u_int8_t	td_dtrace_stop;	/* Indicates a DTrace-desired stop */
 	u_int8_t	td_dtrace_sig;	/* Signal sent via DTrace's raise() */
 	u_int		td_predcache;	/* DTrace predicate cache */
@@ -62,6 +74,30 @@
 					/* DTrace return sequence location. */
 	u_int64_t	td_hrtime;	/* Last time on cpu. */
 	int		td_errno;	/* Syscall return value. */
-};
+} kdtrace_thread_t;
+
+/*
+ * Definitions to reference fields in the FreeBSD DTrace structures defined
+ * above using the names of fields in similar structures in Solaris. Note 
+ * that the separation on FreeBSD is a licensing constraint designed to
+ * keep the GENERIC kernel BSD licensed.
+ */
+#define	t_dtrace_vtime	td_dtrace->td_dtrace_vtime
+#define	t_dtrace_start	td_dtrace->td_dtrace_start
+#define	t_dtrace_stop	td_dtrace->td_dtrace_stop
+#define	t_dtrace_sig	td_dtrace->td_dtrace_sig
+#define	t_predcache	td_dtrace->td_predcache
+#define p_dtrace_helpers	p_dtrace->p_dtrace_helpers
+
+/*
+ * Definitions for fields in struct proc which are named differntly in FreeBSD.
+ */
+#define	p_cred		p_ucred
+
+/*
+ * Definitions for fields in struct thread which are named differntly in FreeBSD.
+ */
+#define	t_procp		td_proc
+#define	t_tid		td_tid
 
 #endif	/* !_DTRACE_CDDL_H_ */

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 00:26:28 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B4D6316A418; Sat,  8 Dec 2007 00:26: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 235EA16A420
	for ; Sat,  8 Dec 2007 00:26:28 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1247813C461
	for ; Sat,  8 Dec 2007 00:26:28 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB80QSfr068946
	for ; Sat, 8 Dec 2007 00:26:28 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB80QRJX068943
	for perforce@freebsd.org; Sat, 8 Dec 2007 00:26:27 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 8 Dec 2007 00:26:27 GMT
Message-Id: <200712080026.lB80QRJX068943@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130445 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 00:26:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=130445

Change 130445 by jb@jb_freebsd1 on 2007/12/08 00:25:53

	Save some WIP. I really wish this file had been coded in multiple files.
	There are too many lines here.

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 edit

Differences ...

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 (text) ====

@@ -66,34 +66,58 @@
  * on capital-f functions.
  */
 #include 
+#if !defined(sun)
+#include 
+#endif
 #include 
 #include 
 #include 
 #include 
+#if defined(sun)
 #include 
 #include 
+#endif
 #include 
 #include 
+#if defined(sun)
 #include 
+#endif
 #include 
 #include 
 #include 
 #include 
+#if defined(sun)
 #include 
 #include 
+#endif
 #include 
+#if defined(sun)
 #include 
 #include 
+#endif
 #include 
+#if defined(sun)
 #include 
 #include 
+#endif
 #include 
+#if defined(sun)
 #include 
 #include 
+#endif
 #include 
 #include 
 #include 
 
+/* FreeBSD includes: */
+#if !defined(sun)
+#include 
+#include 
+#include 
+#include 
+#include "dtrace_cddl.h"
+#endif
+
 /*
  * DTrace Tunable Variables
  *
@@ -161,7 +185,9 @@
 /*
  * DTrace Internal Variables
  */
+#if defined(sun)
 static dev_info_t	*dtrace_devi;		/* device info */
+#endif
 static vmem_t		*dtrace_arena;		/* probe ID arena */
 static vmem_t		*dtrace_minor;		/* minor number arena */
 static taskq_t		*dtrace_taskq;		/* task queue */
@@ -222,6 +248,40 @@
 static kmutex_t		dtrace_provider_lock;	/* provider state lock */
 static kmutex_t		dtrace_meta_lock;	/* meta-provider state lock */
 
+#if !defined(sun)
+MALLOC_DEFINE(M_DTRACE, "dtrace", "Dynamic Trace");
+
+/* XXX FreeBSD hacks. */
+static kmutex_t		cpu_lock;
+static kmutex_t		mod_lock;
+
+#define cr_suid		cr_svuid
+#define cr_sgid		cr_svgid
+#define mod_modname	pathname
+#define vuprintf	vprintf
+#define ttoproc(_a)	((_a)->td_proc)
+#define crgetzoneid(_a)	0
+#define	NCPU		32
+#define SNOCD		0
+#define CPU_ON_INTR(_a)	0
+#define M_KMEM		M_DTRACE
+
+#define PRIV_EFFECTIVE		(1 << 0)
+#define PRIV_DTRACE_KERNEL	(1 << 1)
+#define PRIV_DTRACE_PROC	(1 << 2)
+#define PRIV_DTRACE_USER	(1 << 3)
+#define PRIV_PROC_OWNER		(1 << 4)
+#define PRIV_PROC_ZONE		(1 << 5)
+#define PRIV_ALL		~0
+
+
+#endif
+
+#if defined(sun)
+#define curcpu	CPU->cpu_id
+#endif
+
+
 /*
  * DTrace Provider Variables
  *
@@ -241,8 +301,8 @@
 {}
 
 static dtrace_pops_t	dtrace_provider_ops = {
-	(void (*)(void *, const dtrace_probedesc_t *))dtrace_nullop,
-	(void (*)(void *, struct modctl *))dtrace_nullop,
+	(void (*)(void *, dtrace_probedesc_t *))dtrace_nullop,
+	(void (*)(void *, modctl_t *))dtrace_nullop,
 	(void (*)(void *, dtrace_id_t, void *))dtrace_nullop,
 	(void (*)(void *, dtrace_id_t, void *))dtrace_nullop,
 	(void (*)(void *, dtrace_id_t, void *))dtrace_nullop,
@@ -349,7 +409,7 @@
 #define	DTRACE_ALIGNCHECK(addr, size, flags)				\
 	if (addr & (size - 1)) {					\
 		*flags |= CPU_DTRACE_BADALIGN;				\
-		cpu_core[CPU->cpu_id].cpuc_dtrace_illval = addr;	\
+		cpu_core[curcpu].cpuc_dtrace_illval = addr;	\
 		return (0);						\
 	}
 #else
@@ -388,7 +448,7 @@
 	uint##bits##_t rval;						\
 	int i;								\
 	volatile uint16_t *flags = (volatile uint16_t *)		\
-	    &cpu_core[CPU->cpu_id].cpuc_dtrace_flags;			\
+	    &cpu_core[curcpu].cpuc_dtrace_flags;			\
 									\
 	DTRACE_ALIGNCHECK(addr, size, flags);				\
 									\
@@ -403,7 +463,7 @@
 		 * This address falls within a toxic region; return 0.	\
 		 */							\
 		*flags |= CPU_DTRACE_BADADDR;				\
-		cpu_core[CPU->cpu_id].cpuc_dtrace_illval = addr;	\
+		cpu_core[curcpu].cpuc_dtrace_illval = addr;	\
 		return (0);						\
 	}								\
 									\
@@ -446,6 +506,7 @@
 	((act)->dta_kind == DTRACEACT_DIFEXPR &&			\
 	(act)->dta_difo->dtdo_rtype.dtdt_kind == DIF_TYPE_STRING)
 
+/* Function prototype definitions: */
 static size_t dtrace_strlen(const char *, size_t);
 static dtrace_probe_t *dtrace_probe_lookup_id(dtrace_id_t id);
 static void dtrace_enabling_provide(dtrace_provider_t *);
@@ -462,6 +523,14 @@
     dtrace_optval_t);
 static int dtrace_ecb_create_enable(dtrace_probe_t *, void *);
 static void dtrace_helper_provider_destroy(dtrace_helper_provider_t *);
+uint16_t dtrace_load16(uintptr_t);
+uint32_t dtrace_load32(uintptr_t);
+uint64_t dtrace_load64(uintptr_t);
+uint8_t dtrace_load8(uintptr_t);
+void dtrace_dynvar_clean(dtrace_dstate_t *);
+dtrace_dynvar_t *dtrace_dynvar(dtrace_dstate_t *, uint_t, dtrace_key_t *,
+    size_t, dtrace_dynvar_op_t, dtrace_mstate_t *, dtrace_vstate_t *);
+uintptr_t dtrace_dif_varstr(uintptr_t, dtrace_state_t *, dtrace_mstate_t *);
 
 /*
  * DTrace Probe Context Functions
@@ -672,7 +741,7 @@
 dtrace_canload(uint64_t addr, size_t sz, dtrace_mstate_t *mstate,
     dtrace_vstate_t *vstate)
 {
-	volatile uintptr_t *illval = &cpu_core[CPU->cpu_id].cpuc_dtrace_illval;
+	volatile uintptr_t *illval = &cpu_core[curcpu].cpuc_dtrace_illval;
 
 	/*
 	 * If we hold the privilege to read from kernel memory, then
@@ -764,7 +833,7 @@
 	if (s1 == s2 || limit == 0)
 		return (0);
 
-	flags = (volatile uint16_t *)&cpu_core[CPU->cpu_id].cpuc_dtrace_flags;
+	flags = (volatile uint16_t *)&cpu_core[curcpu].cpuc_dtrace_flags;
 
 	do {
 		if (s1 == NULL) {
@@ -818,13 +887,13 @@
 
 		if (kaddr - taddr < tsize) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR);
-			cpu_core[CPU->cpu_id].cpuc_dtrace_illval = kaddr;
+			cpu_core[curcpu].cpuc_dtrace_illval = kaddr;
 			return (1);
 		}
 
 		if (taddr - kaddr < size) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR);
-			cpu_core[CPU->cpu_id].cpuc_dtrace_illval = taddr;
+			cpu_core[curcpu].cpuc_dtrace_illval = taddr;
 			return (1);
 		}
 	}
@@ -908,7 +977,7 @@
 {
 	volatile uint16_t *flags;
 
-	flags = (volatile uint16_t *)&cpu_core[CPU->cpu_id].cpuc_dtrace_flags;
+	flags = (volatile uint16_t *)&cpu_core[curcpu].cpuc_dtrace_flags;
 
 	if (s1 == s2)
 		return (0);
@@ -977,6 +1046,7 @@
 static int
 dtrace_priv_proc_common_zone(dtrace_state_t *state)
 {
+#if defined(sun)
 	cred_t *cr, *s_cr = state->dts_cred.dcr_cred;
 
 	/*
@@ -990,6 +1060,9 @@
 		return (1);
 
 	return (0);
+#else
+	return (1);
+#endif
 }
 
 /*
@@ -997,7 +1070,7 @@
  * verify that the process has not setuid or changed credentials.
  */
 static int
-dtrace_priv_proc_common_nocd()
+dtrace_priv_proc_common_nocd(void)
 {
 	proc_t *proc;
 
@@ -1028,7 +1101,7 @@
 	return (1);
 
 bad:
-	cpu_core[CPU->cpu_id].cpuc_dtrace_flags |= CPU_DTRACE_UPRIV;
+	cpu_core[curcpu].cpuc_dtrace_flags |= CPU_DTRACE_UPRIV;
 
 	return (0);
 }
@@ -1044,7 +1117,7 @@
 	    dtrace_priv_proc_common_nocd())
 		return (1);
 
-	cpu_core[CPU->cpu_id].cpuc_dtrace_flags |= CPU_DTRACE_UPRIV;
+	cpu_core[curcpu].cpuc_dtrace_flags |= CPU_DTRACE_UPRIV;
 
 	return (0);
 }
@@ -1055,7 +1128,7 @@
 	if (state->dts_cred.dcr_action & DTRACE_CRA_PROC)
 		return (1);
 
-	cpu_core[CPU->cpu_id].cpuc_dtrace_flags |= CPU_DTRACE_UPRIV;
+	cpu_core[curcpu].cpuc_dtrace_flags |= CPU_DTRACE_UPRIV;
 
 	return (0);
 }
@@ -1066,7 +1139,7 @@
 	if (state->dts_cred.dcr_action & DTRACE_CRA_KERNEL)
 		return (1);
 
-	cpu_core[CPU->cpu_id].cpuc_dtrace_flags |= CPU_DTRACE_KPRIV;
+	cpu_core[curcpu].cpuc_dtrace_flags |= CPU_DTRACE_KPRIV;
 
 	return (0);
 }
@@ -1077,7 +1150,7 @@
 	if (state->dts_cred.dcr_action & DTRACE_CRA_KERNEL_DESTRUCTIVE)
 		return (1);
 
-	cpu_core[CPU->cpu_id].cpuc_dtrace_flags |= CPU_DTRACE_KPRIV;
+	cpu_core[curcpu].cpuc_dtrace_flags |= CPU_DTRACE_KPRIV;
 
 	return (0);
 }
@@ -1188,7 +1261,7 @@
 	uint64_t hashval = DTRACE_DYNHASH_VALID;
 	dtrace_dynhash_t *hash = dstate->dtds_hash;
 	dtrace_dynvar_t *free, *new_free, *next, *dvar, *start, *prev = NULL;
-	processorid_t me = CPU->cpu_id, cpu = me;
+	processorid_t me = curcpu, cpu = me;
 	dtrace_dstate_percpu_t *dcpu = &dstate->dtds_percpu[me];
 	size_t bucket, ksize;
 	size_t chunksize = dstate->dtds_chunksize;
@@ -1279,8 +1352,8 @@
 			while ((lock = *lockp) & 1)
 				continue;
 
-			if (dtrace_casptr((void *)lockp,
-			    (void *)lock, (void *)(lock + 1)) == (void *)lock)
+			if (dtrace_casptr((volatile void *)lockp,
+			    (volatile void *)lock, (volatile void *)(lock + 1)) == (void *)lock)
 				break;
 		}
 
@@ -2245,7 +2318,7 @@
 dtrace_speculation_clean_here(dtrace_state_t *state)
 {
 	dtrace_icookie_t cookie;
-	processorid_t cpu = CPU->cpu_id;
+	processorid_t cpu = curcpu;
 	dtrace_buffer_t *dest = &state->dts_buffer[cpu];
 	dtrace_specid_t i;
 
@@ -2442,7 +2515,7 @@
 	if (mstate->dtms_scratch_ptr + strsz >
 	    mstate->dtms_scratch_base + mstate->dtms_scratch_size) {
 		DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-		return (NULL);
+		return (0);
 	}
 
 	dtrace_strcpy((const void *)addr, (void *)mstate->dtms_scratch_ptr,
@@ -2504,6 +2577,7 @@
 		return (mstate->dtms_arg[ndx]);
 
 	case DIF_VAR_UREGS: {
+#ifdef DOODAD
 		klwp_t *lwp;
 
 		if (!dtrace_priv_proc(state))
@@ -2511,11 +2585,14 @@
 
 		if ((lwp = curthread->t_lwp) == NULL) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR);
-			cpu_core[CPU->cpu_id].cpuc_dtrace_illval = NULL;
+			cpu_core[curcpu].cpuc_dtrace_illval = NULL;
 			return (0);
 		}
 
 		return (dtrace_getreg(lwp->lwp_regs, ndx));
+#else
+		return (0);
+#endif
 	}
 
 	case DIF_VAR_CURTHREAD:
@@ -2638,7 +2715,7 @@
 			 * uint64_t will contain the caller, which is what
 			 * we're after.
 			 */
-			ustack[2] = NULL;
+			ustack[2] = 0;
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT);
 			dtrace_getupcstack(ustack, 3);
 			DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_NOFAULT);
@@ -2676,6 +2753,7 @@
 		if (!dtrace_priv_proc(state))
 			return (0);
 
+#if defined(sun)
 		/*
 		 * Note that we are assuming that an unanchored probe is
 		 * always due to a high-level interrupt.  (And we're assuming
@@ -2693,11 +2771,15 @@
 		 * they leave that task to whomever reaps them.)
 		 */
 		return ((uint64_t)curthread->t_procp->p_pidp->pid_id);
+#else
+		return ((uint64_t)curproc->p_pid);
+#endif
 
 	case DIF_VAR_PPID:
 		if (!dtrace_priv_proc(state))
 			return (0);
 
+#if defined(sun)
 		/*
 		 * See comment in DIF_VAR_PID.
 		 */
@@ -2711,6 +2793,9 @@
 		 * state -- they leave that task to whomever reaps them.)
 		 */
 		return ((uint64_t)curthread->t_procp->p_ppid);
+#else
+		return ((uint64_t)curproc->p_ppid);
+#endif
 
 	case DIF_VAR_TID:
 		/*
@@ -2742,6 +2827,7 @@
 		    state, mstate));
 
 	case DIF_VAR_ZONENAME:
+#if defined(sun)
 		if (!dtrace_priv_proc(state))
 			return (0);
 
@@ -2760,6 +2846,9 @@
 		return (dtrace_dif_varstr(
 		    (uintptr_t)curthread->t_procp->p_zone->zone_name,
 		    state, mstate));
+#else
+		return (0);
+#endif
 
 	case DIF_VAR_UID:
 		if (!dtrace_priv_proc(state))
@@ -2843,8 +2932,8 @@
     dtrace_key_t *tupregs, int nargs,
     dtrace_mstate_t *mstate, dtrace_state_t *state)
 {
-	volatile uint16_t *flags = &cpu_core[CPU->cpu_id].cpuc_dtrace_flags;
-	volatile uintptr_t *illval = &cpu_core[CPU->cpu_id].cpuc_dtrace_illval;
+	volatile uint16_t *flags = &cpu_core[curcpu].cpuc_dtrace_flags;
+	volatile uintptr_t *illval = &cpu_core[curcpu].cpuc_dtrace_illval;
 	dtrace_vstate_t *vstate = &state->dts_vstate;
 
 	union {
@@ -2865,7 +2954,7 @@
 	case DIF_SUBR_MUTEX_OWNED:
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (kmutex_t),
 		    mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -2879,7 +2968,7 @@
 	case DIF_SUBR_MUTEX_OWNER:
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (kmutex_t),
 		    mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -2894,7 +2983,7 @@
 	case DIF_SUBR_MUTEX_TYPE_ADAPTIVE:
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (kmutex_t),
 		    mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -2905,7 +2994,7 @@
 	case DIF_SUBR_MUTEX_TYPE_SPIN:
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (kmutex_t),
 		    mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -2918,7 +3007,7 @@
 
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (uintptr_t),
 		    mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -2930,7 +3019,7 @@
 	case DIF_SUBR_RW_WRITE_HELD:
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (krwlock_t),
 		    mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -2941,7 +3030,7 @@
 	case DIF_SUBR_RW_ISWRITER:
 		if (!dtrace_canload(tupregs[0].dttk_value, sizeof (krwlock_t),
 		    mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -2965,7 +3054,7 @@
 		}
 
 		if (!dtrace_canload(src, size, mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -2993,7 +3082,7 @@
 		if (scratch_size < size ||
 		    !DTRACE_INSCRATCH(mstate, scratch_size)) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -3043,7 +3132,7 @@
 		 */
 		if (!DTRACE_INSCRATCH(mstate, size)) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -3059,16 +3148,17 @@
 
 	case DIF_SUBR_MSGSIZE:
 	case DIF_SUBR_MSGDSIZE: {
+#ifdef DOODAD
 		uintptr_t baddr = tupregs[0].dttk_value, daddr;
 		uintptr_t wptr, rptr;
 		size_t count = 0;
 		int cont = 0;
 
-		while (baddr != NULL && !(*flags & CPU_DTRACE_FAULT)) {
+		while (baddr != 0 && !(*flags & CPU_DTRACE_FAULT)) {
 
 			if (!dtrace_canload(baddr, sizeof (mblk_t), mstate,
 			    vstate)) {
-				regs[rd] = NULL;
+				regs[rd] = 0;
 				break;
 			}
 
@@ -3112,6 +3202,7 @@
 		if (!(*flags & CPU_DTRACE_FAULT))
 			regs[rd] = count;
 
+#endif
 		break;
 	}
 
@@ -3123,7 +3214,11 @@
 		DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT);
 
 		for (p = curthread->t_procp; p != NULL; p = p->p_parent) {
+#if defined(sun)
 			if (p->p_pidp->pid_id == pid) {
+#else
+			if (p->p_pid == pid) {
+#endif
 				rval = 1;
 				break;
 			}
@@ -3176,7 +3271,7 @@
 		    state->dts_options[DTRACEOPT_STRSIZE]);
 
 		if (!dtrace_canload(addr, sz + 1, mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -3199,7 +3294,7 @@
 		uintptr_t limit = addr + state->dts_options[DTRACEOPT_STRSIZE];
 		char c, target = (char)tupregs[1].dttk_value;
 
-		for (regs[rd] = NULL; addr < limit; addr++) {
+		for (regs[rd] = 0; addr < limit; addr++) {
 			if ((c = dtrace_load8(addr)) == target) {
 				regs[rd] = addr;
 
@@ -3212,7 +3307,7 @@
 		}
 
 		if (!dtrace_canload(saddr, addr - saddr, mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -3243,13 +3338,13 @@
 		regs[rd] = notfound;
 
 		if (!dtrace_canload((uintptr_t)addr, len + 1, mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
 		if (!dtrace_canload((uintptr_t)substr, sublen + 1, mstate,
 		    vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -3383,17 +3478,17 @@
 		 * since both could be non-scratch addresses.
 		 */
 		if (!dtrace_strcanload(tokaddr, size, mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
 		if (!DTRACE_INSCRATCH(mstate, size)) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
-		if (addr == NULL) {
+		if (addr == 0) {
 			/*
 			 * If the address specified is NULL, we use our saved
 			 * strtok pointer from the mstate.  Note that this
@@ -3412,7 +3507,7 @@
 			 * would fail this access check.
 			 */
 			if (!dtrace_strcanload(addr, size, mstate, vstate)) {
-				regs[rd] = NULL;
+				regs[rd] = 0;
 				break;
 			}
 		}
@@ -3452,8 +3547,8 @@
 			 * We return NULL in this case, and we set the saved
 			 * address to NULL as well.
 			 */
-			regs[rd] = NULL;
-			mstate->dtms_strtok = NULL;
+			regs[rd] = 0;
+			mstate->dtms_strtok = 0;
 			break;
 		}
 
@@ -3489,7 +3584,7 @@
 		int64_t i = 0;
 
 		if (!dtrace_canload(s, len + 1, mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -3498,7 +3593,7 @@
 
 		if (!DTRACE_INSCRATCH(mstate, size)) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -3530,22 +3625,27 @@
 	}
 
 	case DIF_SUBR_GETMAJOR:
+#ifdef DOODAD
 #ifdef _LP64
 		regs[rd] = (tupregs[0].dttk_value >> NBITSMINOR64) & MAXMAJ64;
 #else
 		regs[rd] = (tupregs[0].dttk_value >> NBITSMINOR) & MAXMAJ;
 #endif
+#endif
 		break;
 
 	case DIF_SUBR_GETMINOR:
+#ifdef DOODAD
 #ifdef _LP64
 		regs[rd] = tupregs[0].dttk_value & MAXMIN64;
 #else
 		regs[rd] = tupregs[0].dttk_value & MAXMIN;
 #endif
+#endif
 		break;
 
 	case DIF_SUBR_DDI_PATHNAME: {
+#ifdef DOODAD
 		/*
 		 * This one is a galactic mess.  We are going to roughly
 		 * emulate ddi_pathname(), but it's made more complicated
@@ -3568,12 +3668,12 @@
 		if ((mstate->dtms_access & DTRACE_ACCESS_KERNEL) == 0) {
 			*flags |= CPU_DTRACE_KPRIV;
 			*illval = daddr;
-			regs[rd] = NULL;
+			regs[rd] = 0;
 		}
 
 		if (!DTRACE_INSCRATCH(mstate, size)) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -3707,7 +3807,7 @@
 			 * node), we're going to use the special path
 			 * "devices".
 			 */
-			if (daddr == NULL)
+			if (daddr == 0)
 				s = "devices";
 
 			len = dtrace_strlen(s, size);
@@ -3730,10 +3830,11 @@
 		if (end < start)
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
 
-		if (daddr == NULL) {
+		if (daddr == 0) {
 			regs[rd] = (uintptr_t)end;
 			mstate->dtms_scratch_ptr += size;
 		}
+#endif
 
 		break;
 	}
@@ -3747,20 +3848,20 @@
 
 		if (!dtrace_strcanload(s1, size, mstate, vstate) ||
 		    !dtrace_strcanload(s2, size, mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
 		if (!DTRACE_INSCRATCH(mstate, size)) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
 		for (;;) {
 			if (i >= size) {
 				DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-				regs[rd] = NULL;
+				regs[rd] = 0;
 				break;
 			}
 
@@ -3773,7 +3874,7 @@
 		for (;;) {
 			if (i >= size) {
 				DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-				regs[rd] = NULL;
+				regs[rd] = 0;
 				break;
 			}
 
@@ -3797,7 +3898,7 @@
 
 		if (!DTRACE_INSCRATCH(mstate, size)) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -3855,13 +3956,13 @@
 		int start, end;
 
 		if (!dtrace_canload(src, len + 1, mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
 		if (!DTRACE_INSCRATCH(mstate, size)) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -3983,13 +4084,13 @@
 		int i = 0, j = 0;
 
 		if (!dtrace_strcanload(src, size, mstate, vstate)) {
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
 		if (!DTRACE_INSCRATCH(mstate, size)) {
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
@@ -4087,6 +4188,7 @@
 	case DIF_SUBR_INET_NTOA:
 	case DIF_SUBR_INET_NTOA6:
 	case DIF_SUBR_INET_NTOP: {
+#ifdef DOODAD
 		size_t size;
 		int af, argi, i;
 		char *base, *end;
@@ -4114,7 +4216,7 @@
 			size = INET_ADDRSTRLEN;
 			if (!DTRACE_INSCRATCH(mstate, size)) {
 				DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-				regs[rd] = NULL;
+				regs[rd] = 0;
 				break;
 			}
 			base = (char *)mstate->dtms_scratch_ptr;
@@ -4169,7 +4271,7 @@
 			size = INET6_ADDRSTRLEN;
 			if (!DTRACE_INSCRATCH(mstate, size)) {
 				DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-				regs[rd] = NULL;
+				regs[rd] = 0;
 				break;
 			}
 			base = (char *)mstate->dtms_scratch_ptr;
@@ -4279,12 +4381,13 @@
 			 * The user didn't use AH_INET or AH_INET6.
 			 */
 			DTRACE_CPUFLAG_SET(CPU_DTRACE_ILLOP);
-			regs[rd] = NULL;
+			regs[rd] = 0;
 			break;
 		}
 
 inetout:	regs[rd] = (uintptr_t)end + 1;
 		mstate->dtms_scratch_ptr += size;
+#endif
 		break;
 	}
 
@@ -4309,8 +4412,8 @@
 	dtrace_statvar_t *svar;
 	dtrace_dstate_t *dstate = &vstate->dtvs_dynvars;
 	dtrace_difv_t *v;
-	volatile uint16_t *flags = &cpu_core[CPU->cpu_id].cpuc_dtrace_flags;
-	volatile uintptr_t *illval = &cpu_core[CPU->cpu_id].cpuc_dtrace_illval;
+	volatile uint16_t *flags = &cpu_core[curcpu].cpuc_dtrace_flags;
+	volatile uintptr_t *illval = &cpu_core[curcpu].cpuc_dtrace_illval;
 
 	dtrace_key_t tupregs[DIF_DTR_NREGS + 2]; /* +2 for thread and id */
 	uint64_t regs[DIF_DIR_NREGS];
@@ -4578,10 +4681,10 @@
 			uintptr_t s1 = regs[r1];
 			uintptr_t s2 = regs[r2];
 
-			if (s1 != NULL &&
+			if (s1 != 0 &&
 			    !dtrace_strcanload(s1, sz, mstate, vstate))
 				break;
-			if (s2 != NULL &&
+			if (s2 != 0 &&
 			    !dtrace_strcanload(s2, sz, mstate, vstate))
 				break;
 
@@ -4620,7 +4723,7 @@
 					 * then this is to be treated as a
 					 * reference to a NULL variable.
 					 */
-					regs[rd] = NULL;
+					regs[rd] = 0;
 				} else {
 					regs[rd] = a + sizeof (uint64_t);
 				}
@@ -4644,10 +4747,10 @@
 			if (v->dtdv_type.dtdt_flags & DIF_TF_BYREF) {
 				uintptr_t a = (uintptr_t)svar->dtsv_data;
 
-				ASSERT(a != NULL);
+				ASSERT(a != 0);
 				ASSERT(svar->dtsv_size != 0);
 
-				if (regs[rd] == NULL) {
+				if (regs[rd] == 0) {
 					*(uint8_t *)a = UINT8_MAX;
 					break;
 				} else {
@@ -4702,7 +4805,7 @@
 
 				sz += sizeof (uint64_t);
 				ASSERT(svar->dtsv_size == NCPU * sz);
-				a += CPU->cpu_id * sz;
+				a += curcpu * sz;
 
 				if (*(uint8_t *)a == UINT8_MAX) {
 					/*
@@ -4710,7 +4813,7 @@
 					 * then this is to be treated as a
 					 * reference to a NULL variable.
 					 */
-					regs[rd] = NULL;
+					regs[rd] = 0;
 				} else {
 					regs[rd] = a + sizeof (uint64_t);
 				}
@@ -4720,7 +4823,7 @@
 
 			ASSERT(svar->dtsv_size == NCPU * sizeof (uint64_t));
 			tmp = (uint64_t *)(uintptr_t)svar->dtsv_data;
-			regs[rd] = tmp[CPU->cpu_id];
+			regs[rd] = tmp[curcpu];
 			break;
 
 		case DIF_OP_STLS:
@@ -4741,9 +4844,9 @@
 
 				sz += sizeof (uint64_t);
 				ASSERT(svar->dtsv_size == NCPU * sz);
-				a += CPU->cpu_id * sz;
+				a += curcpu * sz;
 
-				if (regs[rd] == NULL) {
+				if (regs[rd] == 0) {
 					*(uint8_t *)a = UINT8_MAX;
 					break;
 				} else {
@@ -4763,7 +4866,7 @@
 
 			ASSERT(svar->dtsv_size == NCPU * sizeof (uint64_t));
 			tmp = (uint64_t *)(uintptr_t)svar->dtsv_data;
-			tmp[CPU->cpu_id] = regs[rd];
+			tmp[curcpu] = regs[rd];
 			break;
 
 		case DIF_OP_LDTS: {
@@ -4824,7 +4927,7 @@
 			 * Given that we're storing to thread-local data,
 			 * we need to flush our predicate cache.
 			 */
-			curthread->t_predcache = NULL;
+			curthread->t_predcache = 0;
 
 			if (dvar == NULL)
 				break;
@@ -4995,7 +5098,7 @@
 			if (size < regs[r1] ||
 			    !DTRACE_INSCRATCH(mstate, size)) {
 				DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
-				regs[rd] = NULL;
+				regs[rd] = 0;
 				break;
 			}
 
@@ -5141,7 +5244,9 @@
 	c[i++] = ')';
 	c[i] = '\0';
 
+#ifdef DOODAD
 	debug_enter(c);
+#endif
 }
 
 static void
@@ -5192,7 +5297,9 @@
 		curthread->t_dtrace_sig = (uint8_t)sig;
 
 	curthread->t_sig_check = 1;
+#ifdef DOODAD
 	aston(curthread);
+#endif
 }
 
 static void
@@ -5204,7 +5311,9 @@
 	if (!curthread->t_dtrace_stop) {
 		curthread->t_dtrace_stop = 1;
 		curthread->t_sig_check = 1;
+#ifdef DOODAD
 		aston(curthread);
+#endif
 	}
 }
 
@@ -5213,7 +5322,11 @@
 {
 	hrtime_t now;
 	volatile uint16_t *flags;
+#if defined(sun)
 	cpu_t *cpu = CPU;
+#else
+	cpu_t *cpu = pcpu_find(curcpu);
+#endif
 
 	if (dtrace_destructive_disallow)
 		return;
@@ -5257,13 +5370,14 @@

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 00:38:41 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6892016A420; Sat,  8 Dec 2007 00:38: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 0B6D716A419
	for ; Sat,  8 Dec 2007 00:38:41 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EF16E13C461
	for ; Sat,  8 Dec 2007 00:38:40 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB80ceh3070564
	for ; Sat, 8 Dec 2007 00:38:40 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB80ce2u070561
	for perforce@freebsd.org; Sat, 8 Dec 2007 00:38:40 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 8 Dec 2007 00:38:40 GMT
Message-Id: <200712080038.lB80ce2u070561@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130446 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 00:38:41 -0000

http://perforce.freebsd.org/chv.cgi?CH=130446

Change 130446 by jb@jb_freebsd1 on 2007/12/08 00:38:25

	Use a larger offset from kernbase for the time being. The previous
	value was being ignored by ld for some reason causing things to
	go bewm when the file was loaded by the loader.
	
	The cause will need to be investigated later. For now, real men
	prefer being able to boot and use the kernel.

Affected files ...

.. //depot/projects/binutils/src/sys/conf/ldscript.amd64#3 edit

Differences ...

==== //depot/projects/binutils/src/sys/conf/ldscript.amd64#3 (text+ko) ====

@@ -6,7 +6,7 @@
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  . = kernbase + 0x00100000 + SIZEOF_HEADERS;
+  . = kernbase + 0x00400000 + SIZEOF_HEADERS;
   .interp         : { *(.interp) }
   .hash           : { *(.hash) }
   .dynsym         : { *(.dynsym) }

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 00:47:59 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D5D9316A41A; Sat,  8 Dec 2007 00:47: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 65C7616A417
	for ; Sat,  8 Dec 2007 00:47:58 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5355113C442
	for ; Sat,  8 Dec 2007 00:47:58 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB80lwXU080852
	for ; Sat, 8 Dec 2007 00:47:58 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB80lpYq080849
	for perforce@freebsd.org; Sat, 8 Dec 2007 00:47:51 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 8 Dec 2007 00:47:51 GMT
Message-Id: <200712080047.lB80lpYq080849@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130448 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 00:47:59 -0000

http://perforce.freebsd.org/chv.cgi?CH=130448

Change 130448 by jb@jb_freebsd1 on 2007/12/08 00:47:18

	IFC

Affected files ...

.. //depot/projects/binutils/src/ObsoleteFiles.inc#6 integrate
.. //depot/projects/binutils/src/bin/sh/sh.1#3 integrate
.. //depot/projects/binutils/src/contrib/amd/AUTHORS#2 integrate
.. //depot/projects/binutils/src/contrib/amd/BUGS#2 integrate
.. //depot/projects/binutils/src/contrib/amd/COPYING#2 integrate
.. //depot/projects/binutils/src/contrib/amd/ChangeLog#2 integrate
.. //depot/projects/binutils/src/contrib/amd/FAQ#1 branch
.. //depot/projects/binutils/src/contrib/amd/INSTALL#2 integrate
.. //depot/projects/binutils/src/contrib/amd/NEWS#2 integrate
.. //depot/projects/binutils/src/contrib/amd/README.attrcache#1 branch
.. //depot/projects/binutils/src/contrib/amd/README.ldap#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/am_ops.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/amd.8#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/amd.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/amd.h#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/amfs_auto.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/amfs_direct.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/amfs_error.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/amfs_generic.c#1 branch
.. //depot/projects/binutils/src/contrib/amd/amd/amfs_host.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/amfs_inherit.c#2 delete
.. //depot/projects/binutils/src/contrib/amd/amd/amfs_link.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/amfs_linkx.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/amfs_nfsl.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/amfs_nfsx.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/amfs_program.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/amfs_root.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/amfs_toplvl.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/amfs_union.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/amq_subr.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/amq_svc.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/autil.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/clock.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/conf.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/conf_parse.y#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/conf_tok.l#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/get_args.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/info_exec.c#1 branch
.. //depot/projects/binutils/src/contrib/amd/amd/info_file.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/info_hesiod.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/info_ldap.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/info_ndbm.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/info_nis.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/info_nisplus.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/info_passwd.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/info_union.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/map.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/mapc.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/mntfs.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/nfs_prot_svc.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/nfs_start.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/nfs_subr.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/ops_TEMPLATE.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/ops_cachefs.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/ops_cdfs.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/ops_efs.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/ops_lofs.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/ops_mfs.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/ops_nfs.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/ops_nfs3.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/ops_nullfs.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/ops_pcfs.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/ops_tfs.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/ops_tmpfs.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/ops_ufs.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/ops_umapfs.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/ops_unionfs.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/ops_xfs.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/opts.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/readdir.c#1 branch
.. //depot/projects/binutils/src/contrib/amd/amd/restart.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/rpc_fwd.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/sched.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/srvr_amfs_auto.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amd/srvr_nfs.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amq/amq.8#3 integrate
.. //depot/projects/binutils/src/contrib/amd/amq/amq.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amq/amq.h#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amq/amq_clnt.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amq/amq_xdr.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amq/pawd.1#2 integrate
.. //depot/projects/binutils/src/contrib/amd/amq/pawd.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/aux_conf.h.in#2 integrate
.. //depot/projects/binutils/src/contrib/amd/bootstrap#2 integrate
.. //depot/projects/binutils/src/contrib/amd/conf/checkmount/checkmount_bsd44.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/conf/mtab/mtab_bsd.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#2 integrate
.. //depot/projects/binutils/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#2 integrate
.. //depot/projects/binutils/src/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#2 integrate
.. //depot/projects/binutils/src/contrib/amd/conf/transp/transp_sockets.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/conf/trap/trap_default.h#2 integrate
.. //depot/projects/binutils/src/contrib/amd/conf/umount/umount_bsd44.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/doc/am-utils.texi#2 integrate
.. //depot/projects/binutils/src/contrib/amd/doc/stamp-vti#1 branch
.. //depot/projects/binutils/src/contrib/amd/doc/texinfo.tex#2 integrate
.. //depot/projects/binutils/src/contrib/amd/doc/version.texi#2 integrate
.. //depot/projects/binutils/src/contrib/amd/fixmount/fixmount.8#2 integrate
.. //depot/projects/binutils/src/contrib/amd/fixmount/fixmount.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/fsinfo/fsi_analyze.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/fsinfo/fsi_data.h#2 integrate
.. //depot/projects/binutils/src/contrib/amd/fsinfo/fsi_dict.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/fsinfo/fsi_gram.y#2 integrate
.. //depot/projects/binutils/src/contrib/amd/fsinfo/fsi_lex.l#2 integrate
.. //depot/projects/binutils/src/contrib/amd/fsinfo/fsi_util.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/fsinfo/fsinfo.8#2 integrate
.. //depot/projects/binutils/src/contrib/amd/fsinfo/fsinfo.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/fsinfo/fsinfo.h#2 integrate
.. //depot/projects/binutils/src/contrib/amd/fsinfo/wr_atab.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/fsinfo/wr_bparam.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/fsinfo/wr_dumpset.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/fsinfo/wr_exportfs.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/fsinfo/wr_fstab.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/hlfsd/hlfsd.8#2 integrate
.. //depot/projects/binutils/src/contrib/amd/hlfsd/hlfsd.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/hlfsd/hlfsd.h#3 integrate
.. //depot/projects/binutils/src/contrib/amd/hlfsd/homedir.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/hlfsd/nfs_prot_svc.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/hlfsd/stubs.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/include/am_compat.h#2 integrate
.. //depot/projects/binutils/src/contrib/amd/include/am_defs.h#2 integrate
.. //depot/projects/binutils/src/contrib/amd/include/am_utils.h#2 integrate
.. //depot/projects/binutils/src/contrib/amd/include/am_xdr_func.h#2 integrate
.. //depot/projects/binutils/src/contrib/amd/include/amq_defs.h#2 integrate
.. //depot/projects/binutils/src/contrib/amd/include/mount_headers1.h#2 integrate
.. //depot/projects/binutils/src/contrib/amd/include/mount_headers2.h#2 integrate
.. //depot/projects/binutils/src/contrib/amd/ldap-id.ms#2 integrate
.. //depot/projects/binutils/src/contrib/amd/ldap.schema#1 branch
.. //depot/projects/binutils/src/contrib/amd/libamu/alloca.c#2 delete
.. //depot/projects/binutils/src/contrib/amd/libamu/amu.h#2 integrate
.. //depot/projects/binutils/src/contrib/amd/libamu/hasmntopt.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/libamu/misc_rpc.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/libamu/mount_fs.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/libamu/mtab.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/libamu/nfs_prot_xdr.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/libamu/strerror.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/libamu/strutil.c#1 branch
.. //depot/projects/binutils/src/contrib/amd/libamu/util.c#2 delete
.. //depot/projects/binutils/src/contrib/amd/libamu/wire.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/libamu/xdr_func.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/libamu/xutil.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/m4/GNUmakefile#2 delete
.. //depot/projects/binutils/src/contrib/amd/m4/amdgrep#2 delete
.. //depot/projects/binutils/src/contrib/amd/m4/amindent#2 delete
.. //depot/projects/binutils/src/contrib/amd/m4/autopat#2 delete
.. //depot/projects/binutils/src/contrib/amd/m4/chop-aclocal.pl#2 delete
.. //depot/projects/binutils/src/contrib/amd/m4/copy-if-newbig#2 delete
.. //depot/projects/binutils/src/contrib/amd/m4/macros/HEADER#2 delete
.. //depot/projects/binutils/src/contrib/amd/m4/macros/TRAILER#2 delete
.. //depot/projects/binutils/src/contrib/amd/m4/mk-aclocal#2 delete
.. //depot/projects/binutils/src/contrib/amd/m4/mkconf#2 delete
.. //depot/projects/binutils/src/contrib/amd/m4/rmtspc#2 delete
.. //depot/projects/binutils/src/contrib/amd/m4/update_build_version#2 delete
.. //depot/projects/binutils/src/contrib/amd/mk-amd-map/mk-amd-map.8#2 integrate
.. //depot/projects/binutils/src/contrib/amd/mk-amd-map/mk-amd-map.c#2 integrate
.. //depot/projects/binutils/src/contrib/amd/scripts/am-eject.in#2 integrate
.. //depot/projects/binutils/src/contrib/amd/scripts/amd.conf-sample#2 integrate
.. //depot/projects/binutils/src/contrib/amd/scripts/amd.conf.5#2 integrate
.. //depot/projects/binutils/src/contrib/amd/scripts/amd2ldif.in#2 integrate
.. //depot/projects/binutils/src/contrib/amd/scripts/amd2sun.in#2 integrate
.. //depot/projects/binutils/src/contrib/amd/scripts/automount2amd.8#2 integrate
.. //depot/projects/binutils/src/contrib/amd/scripts/automount2amd.in#2 integrate
.. //depot/projects/binutils/src/contrib/amd/scripts/ctl-amd.in#2 integrate
.. //depot/projects/binutils/src/contrib/amd/scripts/ctl-hlfsd.in#2 integrate
.. //depot/projects/binutils/src/contrib/amd/scripts/expn.1#2 integrate
.. //depot/projects/binutils/src/contrib/amd/scripts/expn.in#2 integrate
.. //depot/projects/binutils/src/contrib/amd/scripts/fix-amd-map.in#2 integrate
.. //depot/projects/binutils/src/contrib/amd/scripts/fixrmtab.in#2 integrate
.. //depot/projects/binutils/src/contrib/amd/scripts/redhat-ctl-amd.in#2 integrate
.. //depot/projects/binutils/src/contrib/amd/scripts/test-attrcache.in#1 branch
.. //depot/projects/binutils/src/contrib/amd/scripts/wait4amd.in#2 integrate
.. //depot/projects/binutils/src/contrib/amd/scripts/wait4amd2die.in#2 integrate
.. //depot/projects/binutils/src/contrib/amd/tasks#2 integrate
.. //depot/projects/binutils/src/contrib/amd/vers.m4#1 branch
.. //depot/projects/binutils/src/contrib/amd/wire-test/wire-test.8#2 integrate
.. //depot/projects/binutils/src/contrib/amd/wire-test/wire-test.c#2 integrate
.. //depot/projects/binutils/src/games/fortune/datfiles/Makefile#2 integrate
.. //depot/projects/binutils/src/games/fortune/datfiles/fortunes#3 integrate
.. //depot/projects/binutils/src/games/fortune/datfiles/fortunes-o.real#3 integrate
.. //depot/projects/binutils/src/games/fortune/datfiles/fortunes-o.sp.ok#2 integrate
.. //depot/projects/binutils/src/games/fortune/datfiles/fortunes.sp.ok#3 integrate
.. //depot/projects/binutils/src/games/fortune/datfiles/fortunes2-o#3 delete
.. //depot/projects/binutils/src/games/fortune/datfiles/freebsd-tips#3 integrate
.. //depot/projects/binutils/src/games/fortune/datfiles/freebsd-tips.sp.ok#1 branch
.. //depot/projects/binutils/src/games/fortune/datfiles/limerick#3 integrate
.. //depot/projects/binutils/src/games/fortune/datfiles/limerick.sp.ok#1 branch
.. //depot/projects/binutils/src/games/fortune/datfiles/murphy#2 integrate
.. //depot/projects/binutils/src/games/fortune/datfiles/murphy-o#2 integrate
.. //depot/projects/binutils/src/games/fortune/datfiles/murphy.sp.ok#1 branch
.. //depot/projects/binutils/src/games/fortune/datfiles/startrek#2 integrate
.. //depot/projects/binutils/src/games/fortune/datfiles/zippy#3 integrate
.. //depot/projects/binutils/src/games/fortune/datfiles/zippy.sp.ok#2 integrate
.. //depot/projects/binutils/src/lib/libkse/thread/thr_kern.c#3 integrate
.. //depot/projects/binutils/src/lib/libpmc/libpmc.c#3 integrate
.. //depot/projects/binutils/src/release/fixit.profile#2 integrate
.. //depot/projects/binutils/src/sbin/dhclient/dispatch.c#2 integrate
.. //depot/projects/binutils/src/share/examples/cvsup/refuse#2 integrate
.. //depot/projects/binutils/src/share/examples/cvsup/refuse.README#2 integrate
.. //depot/projects/binutils/src/share/man/man4/aac.4#3 integrate
.. //depot/projects/binutils/src/share/man/man4/hwpmc.4#3 integrate
.. //depot/projects/binutils/src/share/man/man4/msk.4#2 integrate
.. //depot/projects/binutils/src/share/mk/bsd.subdir.mk#2 integrate
.. //depot/projects/binutils/src/sys/amd64/amd64/exception.S#3 integrate
.. //depot/projects/binutils/src/sys/amd64/amd64/trap.c#4 integrate
.. //depot/projects/binutils/src/sys/amd64/include/pmc_mdep.h#2 integrate
.. //depot/projects/binutils/src/sys/arm/arm/pmap.c#5 integrate
.. //depot/projects/binutils/src/sys/arm/include/pmc_mdep.h#2 integrate
.. //depot/projects/binutils/src/sys/compat/freebsd32/freebsd32.h#2 integrate
.. //depot/projects/binutils/src/sys/compat/freebsd32/freebsd32_ipc.h#1 branch
.. //depot/projects/binutils/src/sys/compat/freebsd32/freebsd32_misc.c#4 integrate
.. //depot/projects/binutils/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate
.. //depot/projects/binutils/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate
.. //depot/projects/binutils/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate
.. //depot/projects/binutils/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate
.. //depot/projects/binutils/src/sys/compat/freebsd32/syscalls.master#3 integrate
.. //depot/projects/binutils/src/sys/conf/Makefile.amd64#3 integrate
.. //depot/projects/binutils/src/sys/conf/NOTES#5 integrate
.. //depot/projects/binutils/src/sys/conf/files#6 integrate
.. //depot/projects/binutils/src/sys/conf/options#4 integrate
.. //depot/projects/binutils/src/sys/dev/aac/aac.c#3 integrate
.. //depot/projects/binutils/src/sys/dev/aac/aac_cam.c#3 integrate
.. //depot/projects/binutils/src/sys/dev/aac/aac_pci.c#3 integrate
.. //depot/projects/binutils/src/sys/dev/aac/aacreg.h#2 integrate
.. //depot/projects/binutils/src/sys/dev/aac/aacvar.h#3 integrate
.. //depot/projects/binutils/src/sys/dev/ata/ata-chipset.c#3 integrate
.. //depot/projects/binutils/src/sys/dev/hwpmc/hwpmc_amd.c#2 integrate
.. //depot/projects/binutils/src/sys/dev/hwpmc/hwpmc_arm.c#2 integrate
.. //depot/projects/binutils/src/sys/dev/hwpmc/hwpmc_ia64.c#2 integrate
.. //depot/projects/binutils/src/sys/dev/hwpmc/hwpmc_logging.c#3 integrate
.. //depot/projects/binutils/src/sys/dev/hwpmc/hwpmc_mod.c#4 integrate
.. //depot/projects/binutils/src/sys/dev/hwpmc/hwpmc_piv.c#3 integrate
.. //depot/projects/binutils/src/sys/dev/hwpmc/hwpmc_powerpc.c#2 integrate
.. //depot/projects/binutils/src/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate
.. //depot/projects/binutils/src/sys/dev/hwpmc/hwpmc_sparc64.c#2 integrate
.. //depot/projects/binutils/src/sys/dev/hwpmc/hwpmc_x86.c#3 integrate
.. //depot/projects/binutils/src/sys/dev/if_ndis/if_ndis.c#6 integrate
.. //depot/projects/binutils/src/sys/dev/ipw/if_ipw.c#4 integrate
.. //depot/projects/binutils/src/sys/dev/iwi/if_iwi.c#4 integrate
.. //depot/projects/binutils/src/sys/dev/msk/if_msk.c#2 integrate
.. //depot/projects/binutils/src/sys/dev/msk/if_mskreg.h#2 integrate
.. //depot/projects/binutils/src/sys/dev/re/if_re.c#4 integrate
.. //depot/projects/binutils/src/sys/dev/sio/sio.c#3 integrate
.. //depot/projects/binutils/src/sys/dev/utopia/utopia.c#3 integrate
.. //depot/projects/binutils/src/sys/fs/tmpfs/tmpfs_subr.c#2 integrate
.. //depot/projects/binutils/src/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate
.. //depot/projects/binutils/src/sys/geom/geom_bsd.c#2 integrate
.. //depot/projects/binutils/src/sys/geom/part/g_part.c#2 integrate
.. //depot/projects/binutils/src/sys/geom/part/g_part.h#2 integrate
.. //depot/projects/binutils/src/sys/geom/part/g_part_bsd.c#1 branch
.. //depot/projects/binutils/src/sys/i386/bios/apm.c#3 integrate
.. //depot/projects/binutils/src/sys/i386/i386/exception.s#3 integrate
.. //depot/projects/binutils/src/sys/i386/i386/trap.c#4 integrate
.. //depot/projects/binutils/src/sys/i386/include/pmc_mdep.h#2 integrate
.. //depot/projects/binutils/src/sys/ia64/conf/DEFAULTS#3 integrate
.. //depot/projects/binutils/src/sys/ia64/include/pmc_mdep.h#2 integrate
.. //depot/projects/binutils/src/sys/kern/kern_conf.c#3 integrate
.. //depot/projects/binutils/src/sys/kern/kern_mbuf.c#4 integrate
.. //depot/projects/binutils/src/sys/kern/kern_module.c#3 integrate
.. //depot/projects/binutils/src/sys/kern/kern_pmc.c#2 integrate
.. //depot/projects/binutils/src/sys/kern/subr_trap.c#3 integrate
.. //depot/projects/binutils/src/sys/kern/vfs_mount.c#4 integrate
.. //depot/projects/binutils/src/sys/kern/vfs_subr.c#5 integrate
.. //depot/projects/binutils/src/sys/net/if_lagg.c#2 integrate
.. //depot/projects/binutils/src/sys/net/if_var.h#3 integrate
.. //depot/projects/binutils/src/sys/net/route.c#3 integrate
.. //depot/projects/binutils/src/sys/net80211/ieee80211.c#3 integrate
.. //depot/projects/binutils/src/sys/net80211/ieee80211_output.c#3 integrate
.. //depot/projects/binutils/src/sys/netinet/in_pcb.h#3 integrate
.. //depot/projects/binutils/src/sys/netinet/libalias/alias_util.c#3 integrate
.. //depot/projects/binutils/src/sys/netinet/sctp_output.c#6 integrate
.. //depot/projects/binutils/src/sys/netinet/sctp_usrreq.c#6 integrate
.. //depot/projects/binutils/src/sys/netinet/sctputil.c#6 integrate
.. //depot/projects/binutils/src/sys/netinet/tcp_syncache.c#5 integrate
.. //depot/projects/binutils/src/sys/netinet/tcp_var.h#3 integrate
.. //depot/projects/binutils/src/sys/netinet6/in6.c#4 integrate
.. //depot/projects/binutils/src/sys/pci/if_rlreg.h#3 integrate
.. //depot/projects/binutils/src/sys/powerpc/include/pmc_mdep.h#2 integrate
.. //depot/projects/binutils/src/sys/sparc64/include/pmc_mdep.h#2 integrate
.. //depot/projects/binutils/src/sys/sun4v/include/pmc_mdep.h#2 integrate
.. //depot/projects/binutils/src/sys/sys/param.h#4 integrate
.. //depot/projects/binutils/src/sys/sys/pmc.h#3 integrate
.. //depot/projects/binutils/src/sys/sys/pmckern.h#2 integrate
.. //depot/projects/binutils/src/sys/sys/pmclog.h#3 integrate
.. //depot/projects/binutils/src/sys/sys/ucred.h#3 integrate
.. //depot/projects/binutils/src/usr.bin/kdump/kdump.c#3 integrate
.. //depot/projects/binutils/src/usr.sbin/Makefile#3 integrate
.. //depot/projects/binutils/src/usr.sbin/amd/amd/Makefile#2 integrate
.. //depot/projects/binutils/src/usr.sbin/amd/fsinfo/Makefile#2 integrate
.. //depot/projects/binutils/src/usr.sbin/amd/include/amu_autofs_prot.h#1 branch
.. //depot/projects/binutils/src/usr.sbin/amd/include/aux_conf.h#2 integrate
.. //depot/projects/binutils/src/usr.sbin/amd/include/build_version.h#2 integrate
.. //depot/projects/binutils/src/usr.sbin/amd/include/config.h#2 integrate
.. //depot/projects/binutils/src/usr.sbin/amd/include/newvers.sh#2 integrate
.. //depot/projects/binutils/src/usr.sbin/amd/libamu/Makefile#2 integrate
.. //depot/projects/binutils/src/usr.sbin/amd/mk-amd-map/Makefile#2 integrate
.. //depot/projects/binutils/src/usr.sbin/mtree/verify.c#2 integrate
.. //depot/projects/binutils/src/usr.sbin/pmcstat/Makefile#3 integrate
.. //depot/projects/binutils/src/usr.sbin/pmcstat/pmcstat.8#3 integrate
.. //depot/projects/binutils/src/usr.sbin/pmcstat/pmcstat.c#3 integrate
.. //depot/projects/binutils/src/usr.sbin/pmcstat/pmcstat.h#3 integrate
.. //depot/projects/binutils/src/usr.sbin/pmcstat/pmcstat_log.c#3 integrate
.. //depot/projects/binutils/src/usr.sbin/syslogd/syslogd.c#2 integrate

Differences ...

==== //depot/projects/binutils/src/ObsoleteFiles.inc#6 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.123 2007/11/29 21:49:08 brooks Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.124 2007/12/07 22:56:10 dougb Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,9 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20071207: Merged with fortunes-o.real
+OLD_FILES+=usr/share/games/fortune/fortunes2-o
+OLD_FILES+=usr/share/games/fortune/fortunes2-o.dat
 # 20071129: Disabled static versions of libkse by default
 .if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no"
 OLD_FILES+=usr/lib/libkse.a

==== //depot/projects/binutils/src/bin/sh/sh.1#3 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.125 2007/10/04 16:14:48 stefanf Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.126 2007/12/05 12:29:26 ru Exp $
 .\"
 .Dd October 7, 2006
 .Dt SH 1
@@ -57,9 +57,12 @@
 This version has many features which make
 it appear
 similar in some respects to the Korn shell, but it is not a Korn
-shell clone like pdksh.
+shell clone like
+.Nm pdksh .
 Only features
-designated by POSIX, plus a few Berkeley extensions, are being
+designated by
+.Tn POSIX ,
+plus a few Berkeley extensions, are being
 incorporated into this shell.
 This man page is not intended to be a tutorial nor a complete
 specification of the shell.
@@ -107,6 +110,7 @@
 .Pa /etc/profile
 and then
 .Pa .profile
+in a user's home directory,
 if they exist.
 If the environment variable
 .Ev ENV
@@ -129,13 +133,15 @@
 .Pa .shinit
 the filename desired:
 .Pp
-.Dl ENV=$HOME/.shinit; export ENV
+.Dl "ENV=$HOME/.shinit; export ENV"
 .Pp
 The first non-option argument specified on the command line
 will be treated as the
 name of a file from which to read commands (a shell script), and
 the remaining arguments are set as the positional parameters
-of the shell ($1, $2, etc).
+of the shell
+.Li ( $1 , $2 ,
+etc.).
 Otherwise, the shell reads commands
 from its standard input.
 .Pp
@@ -180,7 +186,7 @@
 A
 .Dq Li --
 or plain
-.Dq Ql -
+.Ql -
 will stop option processing and will force the remaining
 words on the command line to be treated as arguments.
 The
@@ -198,7 +204,7 @@
 (UNIMPLEMENTED)
 .It Fl C Li noclobber
 Do not overwrite existing files with
-.Dq Li > .
+.Ql > .
 .It Fl E Li emacs
 Enable the built-in
 .Xr emacs 1
@@ -228,7 +234,7 @@
 Disable pathname expansion.
 .It Fl I Li ignoreeof
 Ignore
-.Dv EOF Ns ' Ns s
+.Dv EOF Ap s
 from input when in interactive mode.
 .It Fl i Li interactive
 Force the shell to behave interactively.
@@ -253,10 +259,10 @@
 .It Fl p Li privileged
 Turn on privileged mode.
 This mode is enabled on startup
-if either the effective user or group id is not equal to the
-real user or group id.
+if either the effective user or group ID is not equal to the
+real user or group ID.
 Turning this mode off sets the
-effective user and group ids to the real user and group ids.
+effective user and group IDs to the real user and group IDs.
 When this mode is enabled for interactive shells, the file
 .Pa /etc/suid_profile
 is sourced instead of
@@ -288,7 +294,6 @@
 .Bd -literal -offset indent
 sh -T -c "trap 'exit 1' 2 ; some-blocking-program"
 .Ed
-.Pp
 .It Fl u Li nounset
 Write a message to standard error when attempting
 to expand a variable that is not set, and if the
@@ -306,7 +311,7 @@
 .It Fl x Li xtrace
 Write each command
 (preceded by the value of the
-.Ev PS4
+.Va PS4
 variable)
 to standard error before it is executed.
 Useful for debugging.
@@ -384,7 +389,7 @@
 it impossible to put single-quotes in a single-quoted string).
 .It Double Quotes
 Enclosing characters within double quotes preserves the literal
-meaning of all characters except dollarsign
+meaning of all characters except dollar sign
 .Pq Ql $ ,
 backquote
 .Pq Ql ` ,
@@ -423,16 +428,14 @@
 For example, if there is an alias called
 .Dq Li lf
 with the value
-.Dq Li ls -F ,
+.Dq Li "ls -F" ,
 then the input
-.Bd -literal -offset indent
-lf foobar
-.Ed
+.Pp
+.Dl "lf foobar"
 .Pp
 would become
-.Bd -literal -offset indent
-ls -F foobar
-.Ed
+.Pp
+.Dl "ls -F foobar"
 .Pp
 Aliases provide a convenient way for naive users to
 create shorthands for commands without having to learn how
@@ -498,10 +501,10 @@
 The overall format
 used for redirection is:
 .Pp
-.Dl [n] redir-op file
+.D1 Oo Ar n Oc Ar redir-op file
 .Pp
 The
-.Ql redir-op
+.Ar redir-op
 is one of the redirection operators mentioned
 previously.
 The following gives some examples of how these
@@ -509,42 +512,66 @@
 Note that stdin and stdout are commonly used abbreviations
 for standard input and standard output respectively.
 .Bl -tag -width "1234567890XX" -offset indent
-.It Li [n]> file
-redirect stdout (or file descriptor n) to file
-.It Li [n]>| file
+.It Oo Ar n Oc Ns Li > Ar file
+redirect stdout (or file descriptor
+.Ar n )
+to
+.Ar file
+.It Oo Ar n Oc Ns Li >| Ar file
 same as above, but override the
 .Fl C
 option
-.It Li [n]>> file
-append stdout (or file descriptor n) to file
-.It Li [n]< file
-redirect stdin (or file descriptor n) from file
-.It Li [n]<> file
-redirect stdin (or file descriptor n) to and from file
-.It Li [n1]<&n2
-duplicate stdin (or file descriptor n1) from file descriptor n2
-.It Li [n]<&-
-close stdin (or file descriptor n)
-.It Li [n1]>&n2
-duplicate stdout (or file descriptor n1) to file descriptor n2
-.It Li [n]>&-
-close stdout (or file descriptor n)
+.It Oo Ar n Oc Ns Li >> Ar file
+append stdout (or file descriptor
+.Ar n )
+to
+.Ar file
+.It Oo Ar n Oc Ns Li < Ar file
+redirect stdin (or file descriptor
+.Ar n )
+from
+.Ar file
+.It Oo Ar n Oc Ns Li <> Ar file
+redirect stdin (or file descriptor
+.Ar n )
+to and from
+.Ar file
+.It Oo Ar n1 Oc Ns Li <& Ns Ar n2
+duplicate stdin (or file descriptor
+.Ar n1 )
+from file descriptor
+.Ar n2
+.It Oo Ar n Oc Ns Li <&-
+close stdin (or file descriptor
+.Ar n )
+.It Oo Ar n1 Oc Ns Li >& Ns Ar n2
+duplicate stdout (or file descriptor
+.Ar n1 )
+to file descriptor
+.Ar n2
+.It Oo Ar n Oc Ns Li >&-
+close stdout (or file descriptor
+.Ar n )
 .El
 .Pp
 The following redirection is often called a
 .Dq here-document .
-.Bd -literal -offset indent
-[n]<< delimiter
-	here-doc-text
-	...
-delimiter
+.Bd -unfilled -offset indent
+.Oo Ar n Oc Ns Li << Ar delimiter
+.D1 Ar here-doc-text
+.D1 ...
+.Ar delimiter
 .Ed
 .Pp
 All the text on successive lines up to the delimiter is
 saved away and made available to the command on standard
-input, or file descriptor n if it is specified.
-If the delimiter
-as specified on the initial line is quoted, then the here-doc-text
+input, or file descriptor
+.Ar n
+if it is specified.
+If the
+.Ar delimiter
+as specified on the initial line is quoted, then the
+.Ar here-doc-text
 is treated literally, otherwise the text is subjected to
 parameter expansion, command substitution, and arithmetic
 expansion (as described in the section on
@@ -554,7 +581,9 @@
 instead of
 .Dq Li << ,
 then leading tabs
-in the here-doc-text are stripped.
+in the
+.Ar here-doc-text
+are stripped.
 .Ss Search and Execution
 There are three types of commands: shell functions,
 built-in commands, and normal programs.
@@ -562,7 +591,9 @@
 The three types of commands are all executed in a different way.
 .Pp
 When a shell function is executed, all of the shell positional
-parameters (except $0, which remains unchanged) are
+parameters (except
+.Li $0 ,
+which remains unchanged) are
 set to the arguments of the shell function.
 The variables which are explicitly placed in the environment of
 the command (by placing assignments to them before the
@@ -583,11 +614,11 @@
 passing the arguments and the environment to the program.
 If the program is not a normal executable file
 (i.e., if it does not begin with the
-.Qq magic number
+.Dq "magic number"
 whose
 .Tn ASCII
 representation is
-.Qq #! ,
+.Dq Li #! ,
 resulting in an
 .Er ENOEXEC
 return value from
@@ -597,13 +628,16 @@
 so that the effect will be
 as if a new shell had been invoked to handle the ad-hoc shell script,
 except that the location of hashed commands located in
-the parent shell will be remembered by the child.
+the parent shell will be remembered by the child
+(see the description of the
+.Ic hash
+built-in command below).
 .Pp
 Note that previous versions of this document
 and the source code itself misleadingly and sporadically
 refer to a shell script without a magic number
 as a
-.Qq shell procedure .
+.Dq "shell procedure" .
 .Ss Path Search
 When locating a command, the shell first looks to see if
 it has a shell function by that name.
@@ -616,8 +650,9 @@
 Command names containing a slash are simply executed without
 performing any searches.
 .It
-The shell searches each entry in
+The shell searches each entry in the
 .Ev PATH
+environment variable
 in turn for the command.
 The value of the
 .Ev PATH
@@ -666,7 +701,8 @@
 that of the last simple command executed by the command.
 .Ss Pipelines
 A pipeline is a sequence of one or more commands separated
-by the control operator |.
+by the control operator
+.Ql \&| .
 The standard output of all but
 the last command is connected to the standard input
 of the next command.
@@ -675,10 +711,12 @@
 .Pp
 The format for a pipeline is:
 .Pp
-.Dl [!] command1 [ | command2 ...]
+.D1 Oo Li \&! Oc Ar command1 Op Li \&| Ar command2 ...
 .Pp
-The standard output of command1 is connected to the standard
-input of command2.
+The standard output of
+.Ar command1
+is connected to the standard input of
+.Ar command2 .
 The standard input, standard output, or
 both of a command is considered to be assigned by the
 pipeline before any redirection specified by redirection
@@ -704,22 +742,22 @@
 modified by redirection.
 For example:
 .Pp
-.Dl $ command1 2>&1 | command2
+.Dl "command1 2>&1 | command2"
 .Pp
 sends both the standard output and standard error of
-.Ql command1
+.Ar command1
 to the standard input of
-.Ql command2 .
+.Ar command2 .
 .Pp
 A
-.Dq Li \&;
+.Ql \&;
 or newline terminator causes the preceding
 AND-OR-list
 (described below in the section called
 .Sx Short-Circuit List Operators )
 to be executed sequentially;
 an
-.Dq Li &
+.Ql &
 causes asynchronous execution of the preceding AND-OR-list.
 .Pp
 Note that unlike some other shells,
@@ -738,12 +776,12 @@
 before executing the next command.
 .Pp
 The format for running a command in background is:
-.Bd -literal -offset indent
-command1 & [command2 & ...]
-.Ed
+.Pp
+.D1 Ar command1 Li & Op Ar command2 Li & Ar ...
 .Pp
 If the shell is not interactive, the standard input of an
-asynchronous command is set to /dev/null.
+asynchronous command is set to
+.Pa /dev/null .
 .Ss Lists (Generally Speaking)
 A list is a sequence of zero or more commands separated by
 newlines, semicolons, or ampersands,
@@ -773,22 +811,23 @@
 The syntax of the
 .Ic if
 command is:
-.\"
-.\" XXX Use .Dl to work around broken handling of .Ic inside .Bd and .Ed .
-.\"
-.Dl Ic if Ar list
-.Dl Ic then Ar list
-.Dl [ Ic elif Ar list
-.Dl Ic then Ar list ] ...
-.Dl [ Ic else Ar list ]
-.Dl Ic fi
+.Bd -unfilled -offset indent -compact
+.Ic if Ar list
+.Ic then Ar list
+.Oo Ic elif Ar list
+.Ic then Ar list Oc Ar ...
+.Op Ic else Ar list
+.Ic fi
+.Ed
 .Pp
 The syntax of the
 .Ic while
 command is:
-.Dl Ic while Ar list
-.Dl Ic do Ar list
-.Dl Ic done
+.Bd -unfilled -offset indent -compact
+.Ic while Ar list
+.Ic do Ar list
+.Ic done
+.Ed
 .Pp
 The two lists are executed repeatedly while the exit status of the
 first list is zero.
@@ -804,9 +843,11 @@
 The syntax of the
 .Ic for
 command is:
-.Dl Ic for Ar variable Op Ic in Ar word ...
-.Dl Ic do Ar list
-.Dl Ic done
+.Bd -unfilled -offset indent -compact
+.Ic for Ar variable Op Ic in Ar word ...
+.Ic do Ar list
+.Ic done
+.Ed
 .Pp
 If
 .Ic in
@@ -820,17 +861,17 @@
 and
 .Ic done
 commands may be replaced with
-.Dq Li {
+.Ql {
 and
-.Dq Li } .
+.Ql } .
 .Pp
 The syntax of the
 .Ic break
 and
 .Ic continue
 commands is:
-.Dl Ic break Op Ar num
-.Dl Ic continue Op Ar num
+.D1 Ic break Op Ar num
+.D1 Ic continue Op Ar num
 .Pp
 The
 .Ic break
@@ -848,18 +889,20 @@
 .Pp
 The syntax of the
 .Ic case
-command is
-.Dl Ic case Ar word Ic in
-.Dl pattern) list ;;
-.Dl ...
-.Dl Ic esac
+command is:
+.Bd -unfilled -offset indent -compact
+.Ic case Ar word Ic in
+.Ar pattern Ns Li ) Ar list Li ;;
+.Ar ...
+.Ic esac
+.Ed
 .Pp
 The pattern can actually be one or more patterns
 (see
 .Sx Shell Patterns
 described later),
 separated by
-.Dq Li \&|
+.Ql \&|
 characters.
 The exit code of the
 .Ic case
@@ -867,14 +910,12 @@
 zero if no patterns were matched.
 .Ss Grouping Commands Together
 Commands may be grouped by writing either
-.Bd -literal -offset indent
-(list)
-.Ed
+.Pp
+.D1 Li \&( Ns Ar list Ns Li \%)
 .Pp
 or
-.Bd -literal -offset indent
-{ list; }
-.Ed
+.Pp
+.D1 Li { Ar list Ns Li \&; }
 .Pp
 The first form executes the commands in a subshell.
 Note that built-in commands thus executed do not affect the current shell.
@@ -887,18 +928,21 @@
 .Ed
 .Ss Functions
 The syntax of a function definition is
-.Bd -literal -offset indent
-name ( ) command
-.Ed
+.Pp
+.D1 Ar name Li \&( \&) Ar command
 .Pp
 A function definition is an executable statement; when
-executed it installs a function named name and returns an
+executed it installs a function named
+.Ar name
+and returns an
 exit status of zero.
-The command is normally a list
+The
+.Ar command
+is normally a list
 enclosed between
-.Dq Li {
+.Ql {
 and
-.Dq Li } .
+.Ql } .
 .Pp
 Variables may be declared to be local to a function by
 using the
@@ -906,11 +950,8 @@
 command.
 This should appear as the first statement of a function,
 and the syntax is:
-.Bd -ragged -offset indent
-.Ic local
-.Op Ar variable ...
-.Op Fl
-.Ed
+.Pp
+.D1 Ic local Oo Ar variable ... Oc Op Fl
 .Pp
 The
 .Ic local
@@ -923,38 +964,38 @@
 Otherwise, the variable is initially unset.
 The shell
 uses dynamic scoping, so that if the variable
-.Em x
+.Va x
 is made local to function
 .Em f ,
 which then calls function
 .Em g ,
 references to the variable
-.Em x
+.Va x
 made inside
 .Em g
 will refer to the variable
-.Em x
+.Va x
 declared inside
 .Em f ,
 not to the global variable named
-.Em x .
+.Va x .
 .Pp
 The only special parameter that can be made local is
-.Dq Li - .
+.Ql - .
 Making
-.Dq Li -
+.Ql -
 local causes any shell options that are
-changed via the set command inside the function to be
+changed via the
+.Ic set
+command inside the function to be
 restored to their original values when the function
 returns.
 .Pp
 The syntax of the
 .Ic return
 command is
-.Bd -ragged -offset indent
-.Ic return
-.Op Ar exitstatus
-.Ed
+.Pp
+.D1 Ic return Op Ar exitstatus
 .Pp
 It terminates the current executional scope, returning from the previous
 nested function, sourced script, or shell instance, in that order.
@@ -969,9 +1010,8 @@
 the shell turns all the environment variables into shell
 variables.
 New variables can be set using the form
-.Bd -literal -offset indent
-name=value
-.Ed
+.Pp
+.D1 Ar name Ns = Ns Ar value
 .Pp
 Variables set by the user must have a name consisting solely
 of alphabetics, numerics, and underscores.
@@ -1001,12 +1041,10 @@
 the expansion occurs within a double-quoted string
 it expands to a single field with the value of each parameter
 separated by the first character of the
-.Ev IFS
+.Va IFS
 variable,
-or by a
-.Aq space
-if
-.Ev IFS
+or by a space if
+.Va IFS
 is unset.
 .It Li $@
 Expands to the positional parameters, starting from one.
@@ -1020,12 +1058,16 @@
 .Li @
 is double-quoted.
 What this basically means, for example, is
-if $1 is
-.Dq abc
-and $2 is
-.Dq def ghi ,
+if
+.Li $1
+is
+.Dq Li abc
+and
+.Li $2
+is
+.Dq Li "def ghi" ,
 then
-.Qq Li $@
+.Dq Li $@
 expands to
 the two arguments:
 .Bd -literal -offset indent
@@ -1033,18 +1075,22 @@
 .Ed
 .It Li $#
 Expands to the number of positional parameters.
-.It Li $\&?
+.It Li $?
 Expands to the exit status of the most recent pipeline.
 .It Li $-
 (hyphen) Expands to the current option flags (the single-letter
 option names concatenated into a string) as specified on
-invocation, by the set built-in command, or implicitly
+invocation, by the
+.Ic set
+built-in command, or implicitly
 by the shell.
 .It Li $$
 Expands to the process ID of the invoked shell.
 A subshell
-retains the same value of $ as its parent.
-.It Li $\&!
+retains the same value of
+.Va $
+as its parent.
+.It Li $!
 Expands to the process ID of the most recent background

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 03:16:38 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 10AC016A419; Sat,  8 Dec 2007 03:16:38 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A495416A417
	for ; Sat,  8 Dec 2007 03:16:37 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 298E913C447
	for ; Sat,  8 Dec 2007 03:16:37 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB83GbZU017638
	for ; Sat, 8 Dec 2007 03:16:37 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB83Gb6L017635
	for perforce@freebsd.org; Sat, 8 Dec 2007 03:16:37 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 8 Dec 2007 03:16:37 GMT
Message-Id: <200712080316.lB83Gb6L017635@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130453 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 03:16:38 -0000

http://perforce.freebsd.org/chv.cgi?CH=130453

Change 130453 by kmacy@kmacy:storage:toestack on 2007/12/08 03:15:45

	add sysctl to drop all syncache entries
	don't skip offloaded entries from syncache timeout

Affected files ...

.. //depot/projects/toestack/sys/netinet/tcp_syncache.c#9 edit

Differences ...

==== //depot/projects/toestack/sys/netinet/tcp_syncache.c#9 (text+ko) ====

@@ -195,6 +195,10 @@
 
 SYSCTL_NODE(_net_inet_tcp, OID_AUTO, syncache, CTLFLAG_RW, 0, "TCP SYN cache");
 
+static int tcp_syncache_drop_all(SYSCTL_HANDLER_ARGS);
+SYSCTL_PROC(_net_inet_tcp_syncache, OID_AUTO, drop_all, CTLTYPE_INT | CTLFLAG_RW,
+    0, 0, tcp_syncache_drop_all, "IU", "drop all elements in the syncache");
+
 SYSCTL_INT(_net_inet_tcp_syncache, OID_AUTO, bucketlimit, CTLFLAG_RDTUN,
      &tcp_syncache.bucket_limit, 0, "Per-bucket hash limit for syncache");
 
@@ -407,10 +411,6 @@
 				sch->sch_nextc = sc->sc_rxttime;
 			continue;
 		}
-#ifndef DISABLE_TCP_OFFLOAD
-		if (sc->sc_inc.inc_eh != NULL)
-			continue;
-#endif	
 		if (sc->sc_rxmits > tcp_syncache.rexmt_limit) {
 			if ((s = tcp_log_addrs(&sc->sc_inc, NULL, NULL, NULL))) {
 				log(LOG_DEBUG, "%s; %s: Retransmits exhausted, "
@@ -1727,3 +1727,29 @@
 	return error;
 }
 
+static int
+tcp_syncache_drop_all(SYSCTL_HANDLER_ARGS)
+{
+	struct syncache_head *sch = tcp_syncache.hashbase;
+	struct syncache *sc, *nsc;
+	int error, v;
+
+	v = 0;
+	error = sysctl_handle_int(oidp, &v, 0, req);
+	if (error)
+		return (error);
+	if (v == 0)
+		return (0);
+
+	printf("dropping syncache entries\n");
+	SCH_LOCK(sch);
+	TAILQ_FOREACH_SAFE(sc, &sch->sch_bucket, sc_hash, nsc) {
+		printf("dropping %p\n", sc);
+		
+		syncache_drop(sc, sch);
+	}
+	SCH_UNLOCK(sch);
+
+	return (0);
+}
+

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 03:53:16 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9159A16A469; Sat,  8 Dec 2007 03:53:16 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 265CB16A41B
	for ; Sat,  8 Dec 2007 03:53:16 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 16EC613C461
	for ; Sat,  8 Dec 2007 03:53:16 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB83rFdS023087
	for ; Sat, 8 Dec 2007 03:53:15 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB83rFqD023084
	for perforce@freebsd.org; Sat, 8 Dec 2007 03:53:15 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 8 Dec 2007 03:53:15 GMT
Message-Id: <200712080353.lB83rFqD023084@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130454 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 03:53:16 -0000

http://perforce.freebsd.org/chv.cgi?CH=130454

Change 130454 by jb@jb_freebsd1 on 2007/12/08 03:52:37

	Disable building gdb until the latest version is integrated.
	The current gdb in the tree is the old version which relies on
	old binutils.
	
	As of now, this binutils project is self hosting on amd64.
	Obviously without widespread testing though.

Affected files ...

.. //depot/projects/binutils/src/Makefile#3 edit

Differences ...

==== //depot/projects/binutils/src/Makefile#3 (text+ko) ====

@@ -114,7 +114,7 @@
 BINMAKE= \
 	`if [ -x ${MAKEPATH}/make ]; then echo ${MAKEPATH}/make; else echo ${MAKE}; fi` \
 	-m ${.CURDIR}/share/mk
-_MAKE=	PATH=${PATH} ${BINMAKE} -f Makefile.inc1
+_MAKE=	PATH=${PATH} WITHOUT_GDB=1 ${BINMAKE} -f Makefile.inc1
 
 #
 # Make sure we have an up-to-date make(1). Only world and buildworld

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 03:54:18 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BAF4F16A421; Sat,  8 Dec 2007 03:54: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 8073916A41B
	for ; Sat,  8 Dec 2007 03:54:18 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 70A7D13C442
	for ; Sat,  8 Dec 2007 03:54:17 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB83sHG0023368
	for ; Sat, 8 Dec 2007 03:54:17 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB83sHVB023365
	for perforce@freebsd.org; Sat, 8 Dec 2007 03:54:17 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 8 Dec 2007 03:54:17 GMT
Message-Id: <200712080354.lB83sHVB023365@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130455 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 03:54:19 -0000

http://perforce.freebsd.org/chv.cgi?CH=130455

Change 130455 by jb@jb_freebsd1 on 2007/12/08 03:53:44

	IFC

Affected files ...

.. //depot/projects/binutils/src/games/fortune/datfiles/freebsd-tips#4 integrate
.. //depot/projects/binutils/src/sys/compat/freebsd32/freebsd32_misc.c#5 integrate

Differences ...

==== //depot/projects/binutils/src/games/fortune/datfiles/freebsd-tips#4 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.44 2007/12/07 22:41:39 dougb Exp $
+$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.45 2007/12/08 00:20:33 dougb Exp $
 %
 Any user that is a member of the wheel group can use "su -" to simulate
 a root login. You can add a user to the wheel group by editing /etc/group.
@@ -204,11 +204,12 @@
 Nice bash prompt: PS1='(\[$(tput md)\]\t <\w>\[$(tput me)\]) $(echo $?) \$ '
 		-- Mathieu 
 %
-Nice tcsh prompt: set prompt = '[%B%m%b] %B%~%b%# '
-%
-Nice tcsh prompt: set prompt = '%m %# '
-%
-Nice tcsh prompt: set prompt = '%n@%m%# '
+Nice tcsh prompts:
+	set prompt = '[%B%m%b] %B%~%b%# '
+	set prompt = '%m %# '
+	set prompt = '%n@%m%# '
+	set prompt = '%n@%m:%/%# '
+	set prompt = '%n@%m:%~%# '
 %
 Over quota?  "du -s * | sort -n " will give you a sorted list of your
 directory sizes.

==== //depot/projects/binutils/src/sys/compat/freebsd32/freebsd32_misc.c#5 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.72 2007/12/07 22:32:09 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.73 2007/12/08 01:41:31 scottl Exp $");
 
 #include "opt_compat.h"
 
@@ -148,8 +148,6 @@
 static int
 copy_statfs(struct statfs *in, struct statfs32 *out)
 {
-	int error;
-
 	statfs_scale_blocks(in, INT32_MAX);
 	bzero(out, sizeof(*out));
 	CP(*in, *out, f_bsize);

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 05:16:47 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ACA0816A510; Sat,  8 Dec 2007 05:16: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 47E6C16A504
	for ; Sat,  8 Dec 2007 05:16:47 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1F8E813C46B
	for ; Sat,  8 Dec 2007 05:16:47 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB85GlO8045891
	for ; Sat, 8 Dec 2007 05:16:47 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB85GkUb045888
	for perforce@freebsd.org; Sat, 8 Dec 2007 05:16:46 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 8 Dec 2007 05:16:46 GMT
Message-Id: <200712080516.lB85GkUb045888@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130456 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 05:16:48 -0000

http://perforce.freebsd.org/chv.cgi?CH=130456

Change 130456 by kmacy@kmacy:storage:toestack on 2007/12/08 05:16:31

	make tp_tid unsigned int everywhere.

Affected files ...

.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.h#13 edit

Differences ...

==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.h#13 (text+ko) ====

@@ -133,6 +133,7 @@
 #define TP_ABORT_REQ_RCVD    	(1 << 6)
 #define TP_CLOSE_CON_REQUESTED	(1 << 7)
 #define TP_SYN_RCVD		(1 << 8)
+#define TP_ESTABLISHED		(1 << 9)
 
 void t3_init_tunables(struct tom_data *t);
 

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 05:18:50 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B3CBB16A420; Sat,  8 Dec 2007 05:18:50 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 325DB16A418
	for ; Sat,  8 Dec 2007 05:18:50 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 09B8D13C458
	for ; Sat,  8 Dec 2007 05:18:50 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB85In96045959
	for ; Sat, 8 Dec 2007 05:18:49 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB85InxB045956
	for perforce@freebsd.org; Sat, 8 Dec 2007 05:18:49 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 8 Dec 2007 05:18:49 GMT
Message-Id: <200712080518.lB85InxB045956@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130457 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 05:18:51 -0000

http://perforce.freebsd.org/chv.cgi?CH=130457

Change 130457 by kmacy@kmacy:storage:toestack on 2007/12/08 05:18:02

	make tid unsigned int

Affected files ...

.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 edit

Differences ...

==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 (text+ko) ====

@@ -7,7 +7,7 @@
 	struct toedev *tp_toedev;
 	struct l2t_entry *tp_l2t;
 	pr_ctloutput_t *tp_ctloutput;
-	int tp_tid;
+	unsigned int tp_tid;
 	int tp_wr_max;
 	int tp_wr_avail;
 	int tp_wr_unacked;

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 05:19:51 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 526F216A473; Sat,  8 Dec 2007 05:19:51 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 183C016A418
	for ; Sat,  8 Dec 2007 05:19:51 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 07FAC13C46E
	for ; Sat,  8 Dec 2007 05:19:51 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB85Joxf046001
	for ; Sat, 8 Dec 2007 05:19:50 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB85Josb045998
	for perforce@freebsd.org; Sat, 8 Dec 2007 05:19:50 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 8 Dec 2007 05:19:50 GMT
Message-Id: <200712080519.lB85Josb045998@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130458 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 05:19:51 -0000

http://perforce.freebsd.org/chv.cgi?CH=130458

Change 130458 by kmacy@kmacy:storage:toestack on 2007/12/08 05:18:53

	add condvar to sleep on rather than using tsleep

Affected files ...

.. //depot/projects/toestack/sys/dev/cxgb/cxgb_adapter.h#11 edit

Differences ...

==== //depot/projects/toestack/sys/dev/cxgb/cxgb_adapter.h#11 (text+ko) ====

@@ -42,6 +42,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -322,6 +323,8 @@
 	int                     idx; /* qset # */
 	int                     qs_cpuid;
 	int                     qs_flags;
+	struct cv		qs_cv;
+	struct mtx		qs_mtx;
 #define QS_NAME_LEN 32
 	char                    namebuf[QS_NAME_LEN];
 };

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 05:19:52 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 25F5A16A528; Sat,  8 Dec 2007 05:19:51 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3BEE816A46C
	for ; Sat,  8 Dec 2007 05:19:51 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2C08E13C478
	for ; Sat,  8 Dec 2007 05:19:51 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB85JpJ0046007
	for ; Sat, 8 Dec 2007 05:19:51 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB85Jp5B046004
	for perforce@freebsd.org; Sat, 8 Dec 2007 05:19:51 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 8 Dec 2007 05:19:51 GMT
Message-Id: <200712080519.lB85Jp5B046004@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130459 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 05:19:52 -0000

http://perforce.freebsd.org/chv.cgi?CH=130459

Change 130459 by kmacy@kmacy:storage:toestack on 2007/12/08 05:19:26

	use cv in place of tsleep

Affected files ...

.. //depot/projects/toestack/sys/dev/cxgb/cxgb_multiq.c#9 edit

Differences ...

==== //depot/projects/toestack/sys/dev/cxgb/cxgb_multiq.c#9 (text+ko) ====

@@ -141,8 +141,12 @@
 		err = ENOBUFS;
 	}
 	mtx_unlock(&mr->br_lock);
-	if ((qs->txq[TXQ_ETH].flags & TXQ_TRANSMITTING) == 0)
-		wakeup(qs);
+	if ((qs->txq[TXQ_ETH].flags & TXQ_TRANSMITTING) == 0) {
+		mtx_lock(&qs->qs_mtx);
+		cv_broadcastpri(&qs->qs_cv, 1);
+		mtx_unlock(&qs->qs_mtx);
+	}
+	
 	if (err) 
 		m_freem(m);
 
@@ -501,8 +505,11 @@
 	} else if (immpkt)
 		err = cxgb_pcpu_enqueue_packet_(qs, immpkt);
 
-	if (resid && (txq->flags & TXQ_TRANSMITTING) == 0)
-		wakeup(qs);
+	if (resid && (txq->flags & TXQ_TRANSMITTING) == 0) {
+		mtx_lock(&qs->qs_mtx);
+		cv_broadcastpri(&qs->qs_cv, 1);
+		mtx_unlock(&qs->qs_mtx);
+	}
 
 	return ((err == ENOSPC) ? 0 : err);
 }
@@ -617,8 +624,10 @@
 				    txq->txq_mr.br_prod);
 			continue;
 		}
-	done:	
-		tsleep(qs, 1, "cxgbidle", sleep_ticks);
+	done:
+		mtx_lock(&qs->qs_mtx);
+		cv_timedwait(&qs->qs_cv, &qs->qs_mtx, sleep_ticks);
+		mtx_unlock(&qs->qs_mtx);
 	}
 
 	if (bootverbose)
@@ -661,6 +670,8 @@
 			qs = &sc->sge.qs[pi->first_qset + j];
 			qs->port = pi;
 			qs->qs_cpuid = ((pi->first_qset + j) % mp_ncpus);
+			cv_init(&qs->qs_cv, qs->namebuf);
+			mtx_init(&qs->qs_mtx, qs->namebuf, NULL, MTX_DEF);
 			device_printf(sc->dev, "starting thread for %d\n", qs->qs_cpuid);
 
 			kproc_create(cxgb_pcpu_start_proc, qs, &p,
@@ -683,7 +694,9 @@
 			struct sge_qset *qs = &sc->sge.qs[first + j];
 
 			qs->qs_flags |= QS_EXITING;
-			wakeup(qs);
+			mtx_lock(&qs->qs_mtx);
+			cv_broadcastpri(&qs->qs_cv, 1);
+			mtx_unlock(&qs->qs_mtx);
 			tsleep(&sc, PRI_MIN_TIMESHARE, "cxgb unload 0", hz>>2);
 			while (qs->qs_flags & QS_RUNNING) {
 				qs->qs_flags |= QS_EXITING;

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 05:20:53 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4B47A16A46B; Sat,  8 Dec 2007 05:20:53 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D881116A419
	for ; Sat,  8 Dec 2007 05:20:52 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C8EF613C465
	for ; Sat,  8 Dec 2007 05:20:52 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB85Kq9I046330
	for ; Sat, 8 Dec 2007 05:20:52 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB85Kq1b046327
	for perforce@freebsd.org; Sat, 8 Dec 2007 05:20:52 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 8 Dec 2007 05:20:52 GMT
Message-Id: <200712080520.lB85Kq1b046327@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130460 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 05:20:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=130460

Change 130460 by kmacy@kmacy:storage:toestack on 2007/12/08 05:20:40

	reduce coalesce nsecs in INVARIANTS case
	remove skip statement causing us to lose ctrl queue updates

Affected files ...

.. //depot/projects/toestack/sys/dev/cxgb/cxgb_sge.c#14 edit

Differences ...

==== //depot/projects/toestack/sys/dev/cxgb/cxgb_sge.c#14 (text+ko) ====

@@ -367,7 +367,7 @@
 			q->coalesce_nsecs = 50000;
 		} else {
 #ifdef INVARIANTS			
-			q->coalesce_nsecs = 50000;
+			q->coalesce_nsecs = 20000;
 #else
 			q->coalesce_nsecs = 5000;
 #endif			
@@ -1585,7 +1585,7 @@
 	if (__predict_false(ret)) {
 		if (ret == 1) {
 			mtx_unlock(&q->lock);
-			printf("no desc available\n");
+			log(LOG_ERR, "no desc available\n");
 			
 			return (ENOSPC);
 		}
@@ -1620,7 +1620,7 @@
 	struct sge_txq *q = &qs->txq[TXQ_CTRL];
 	adapter_t *adap = qs->port->adapter;
 
-	printf("Restart_ctrlq\n");
+	log(LOG_WARNING, "Restart_ctrlq in_use=%d\n", q->in_use);
 	
 	mtx_lock(&q->lock);
 again:	reclaim_completed_tx_imm(q);
@@ -2676,8 +2676,6 @@
 		if (desc_reclaimable(&qs->txq[TXQ_ETH]) > TX_START_MAX_DESC)
 			taskqueue_enqueue(qs->port->adapter->tq,
 			    &qs->port->timer_reclaim_task);
-#else
-		wakeup(qs);
 #endif		
 	}
 	
@@ -2692,6 +2690,7 @@
 	credits = G_RSPD_TXQ1_CR(flags);
 	if (credits)
 		qs->txq[TXQ_OFLD].processed += credits;
+
 }
 
 static void
@@ -2780,8 +2779,6 @@
 			
 			eop = 1;
 			rspq->imm_data++;
-			goto skip;
-			
 #endif			
 		} else if (r->len_cq) {			
 			int drop_thresh = eth ? SGE_RX_DROP_THRES : 0;
@@ -2808,9 +2805,6 @@
 			DPRINTF("pure response\n");
 			rspq->pure_rsps++;
 		}
-#ifndef DISABLE_MBUF_IOVEC		
-	skip:
-#endif
 		if (flags & RSPD_CTRL_MASK) {
 			sleeping |= flags & RSPD_GTS_MASK;
 			handle_rsp_cntrl_info(qs, flags);

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 05:23:58 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 71CC116A469; Sat,  8 Dec 2007 05:23: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 E300116A418
	for ; Sat,  8 Dec 2007 05:23:57 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D1B1713C45D
	for ; Sat,  8 Dec 2007 05:23:57 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB85NulC047535
	for ; Sat, 8 Dec 2007 05:23:56 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB85NulX047529
	for perforce@freebsd.org; Sat, 8 Dec 2007 05:23:56 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 8 Dec 2007 05:23:56 GMT
Message-Id: <200712080523.lB85NulX047529@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130462 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 05:23:58 -0000

http://perforce.freebsd.org/chv.cgi?CH=130462

Change 130462 by kmacy@kmacy:storage:toestack on 2007/12/08 05:23:03

	various locking fixes
	handle abort in SYN_RCVD state

Affected files ...

.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#29 edit

Differences ...

==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#29 (text+ko) ====

@@ -488,9 +488,11 @@
 	toep->tp_copied_seq += read;
 	toep->tp_enqueued_bytes -= read;
 	credits = toep->tp_copied_seq - toep->tp_rcv_wup;
-	DPRINTF("copied_seq=%u rcv_wup=%u credits=%u\n",
-	    toep->tp_copied_seq, toep->tp_rcv_wup, credits);
-	SOCKBUF_UNLOCK(&so->so_rcv);	
+	SOCKBUF_UNLOCK(&so->so_rcv);
+
+	if (credits > so->so_rcv.sb_mbmax)
+	    printf("copied_seq=%u rcv_wup=%u credits=%u\n",
+		toep->tp_copied_seq, toep->tp_rcv_wup, credits);
 	/*
 	 * XXX this won't accurately reflect credit return - we need
 	 * to look at the difference between the amount that has been 
@@ -534,7 +536,7 @@
 {
 	struct socket *so;
 	
-	printf("cxgb_toe_disconnect\n");
+	DPRINTF("cxgb_toe_disconnect\n");
 
 	so = tp->t_inpcb->inp_socket;
 	close_conn(so);
@@ -879,7 +881,7 @@
 		__skb_queue_purge(&tp->out_of_order_queue);
 #endif		
 	} else {                                          // we have TID
-		cxgb_remove_tid(cdev, (void *)so, tid);
+		cxgb_remove_tid(cdev, toep, tid);
 		toepcb_release(toep);
 	}
 #if 0
@@ -975,7 +977,10 @@
 	toep->tp_delack_mode = 0;
 	
 	toep->tp_mtu_idx = select_mss(td, tp, dst->rt_ifp->if_mtu);
-	
+	/*
+	 * XXX broken
+	 * 
+	 */
 	tp->rcv_wnd = select_rcv_wnd(so);
         toep->tp_ulp_mode = TOM_TUNABLE(dev, ddp) && !(so->so_options & SO_NO_DDP) &&
 		       tp->rcv_wnd >= MIN_DDP_RCV_WIN ? ULP_MODE_TCPDDP : 0;
@@ -1161,6 +1166,7 @@
  * check SOCK_DEAD or sk->sk_sock.  Or maybe generate the error here but don't
  * free the atid.  Hmm.
  */
+#ifdef notyet
 static void
 act_open_req_arp_failure(struct t3cdev *dev, struct mbuf *m)
 {
@@ -1178,7 +1184,7 @@
 	}
 	INP_UNLOCK(inp);
 }
-
+#endif
 /*
  * Send an active open request.
  */
@@ -1460,10 +1466,17 @@
 	SOCKBUF_LOCK(&so->so_rcv);
 	if (sb_notify(&so->so_rcv))
 		DPRINTF("rx_data so=%p flags=0x%x len=%d\n", so, so->so_rcv.sb_flags, m->m_pkthdr.len);
+
+	sbappend_locked(&so->so_rcv, m);
+	KASSERT(so->so_rcv.sb_cc < so->so_rcv.sb_mbmax,
+
+	    ("so=%p, data contents exceed mbmax, sb_cc=%d sb_mbmax=%d",
+		so, so->so_rcv.sb_cc, so->so_rcv.sb_mbmax));
 	
-	sbappendstream_locked(&so->so_rcv, m);
 	INP_UNLOCK(tp->t_inpcb);
-
+	DPRINTF("sb_cc=%d sb_mbcnt=%d\n",
+	    so->so_rcv.sb_cc, so->so_rcv.sb_mbcnt);
+	    
 	if (__predict_true((so->so_state & SS_NOFDREF) == 0))
 		sorwakeup_locked(so);
 	else
@@ -1725,7 +1738,7 @@
 	struct toepcb *toep = tp->t_toe;
 	int keep = 0, dead = (so->so_state & SS_NOFDREF);
 
-	printf("do_peer_fin state=%d dead=%d\n", tp->t_state, !!dead);
+	DPRINTF("do_peer_fin state=%d dead=%d\n", tp->t_state, !!dead);
 	
 #ifdef T3_TRACE
 	T3_TRACE0(TIDTB(sk),"do_peer_fin:");
@@ -1772,7 +1785,7 @@
 		 */
 		t3_release_offload_resources(so);
 		if (toep->tp_flags & TP_ABORT_RPL_PENDING) {
-			tcp_close(tp);
+			tp = tcp_close(tp);
 		} else
 			enter_timewait(so);
 		break;
@@ -1782,10 +1795,11 @@
 		       TOE_DEV(so)->name, toep->tp_tid, tp->t_state);
 	}
 	INP_INFO_WUNLOCK(&tcbinfo);
-	INP_UNLOCK(tp->t_inpcb);					
+	if (tp)
+		INP_UNLOCK(tp->t_inpcb);					
 
 	if (!dead) {
-		printf("waking up waiters on %p rcv_notify=%d flags=0x%x\n", so, sb_notify(&so->so_rcv), so->so_rcv.sb_flags);
+		DPRINTF("waking up waiters on %p rcv_notify=%d flags=0x%x\n", so, sb_notify(&so->so_rcv), so->so_rcv.sb_flags);
 		
 		sorwakeup(so);
 		sowwakeup(so);
@@ -1825,19 +1839,18 @@
 process_close_con_rpl(struct socket *so, struct mbuf *m)
 {
 	struct tcpcb *tp = sototcpcb(so);
-	struct inpcb *inp = tp->t_inpcb;
 	struct cpl_close_con_rpl *rpl = cplhdr(m);
 	struct toepcb *toep = tp->t_toe;
 
 	tp->snd_una = ntohl(rpl->snd_nxt) - 1;  /* exclude FIN */
 
-	printf("process_close_con_rpl(%p) state=%d dead=%d\n", so, tp->t_state,
+	DPRINTF("process_close_con_rpl(%p) state=%d dead=%d\n", so, tp->t_state,
 	    !!(so->so_state & SS_NOFDREF));
 	if (!is_t3a(TOE_DEV(so)) && (toep->tp_flags & TP_ABORT_RPL_PENDING))
 		goto out;
 	
 	INP_INFO_WLOCK(&tcbinfo);
-	INP_LOCK(inp);
+	INP_LOCK(tp->t_inpcb);
 	switch (tp->t_state) {
 	case TCPS_CLOSING:              /* see FIN_WAIT2 case in do_peer_fin */
 		t3_release_offload_resources(so);
@@ -1884,7 +1897,7 @@
 	}
 	INP_INFO_WUNLOCK(&tcbinfo);
 	if (tp)
-		INP_UNLOCK(inp);
+		INP_UNLOCK(tp->t_inpcb);
 out:
 	m_free(m);
 }
@@ -1922,14 +1935,13 @@
 		  "process_abort_rpl: GTS rpl pending %d",
 		  sock_flag(sk, ABORT_RPL_PENDING));
 #endif
-	INP_LOCK_ASSERT(tp->t_inpcb);
+	INP_LOCK(tp->t_inpcb);
 	
 	if (toep->tp_flags & TP_ABORT_RPL_PENDING) {
 		if (!(toep->tp_flags & TP_ABORT_RPL_RCVD) && !is_t3a(TOE_DEV(so)))
 			toep->tp_flags |= TP_ABORT_RPL_RCVD;
 		else {
 			toep->tp_flags &= ~(TP_ABORT_RPL_RCVD|TP_ABORT_RPL_PENDING);
-			
 			if (!(toep->tp_flags & TP_ABORT_REQ_RCVD) ||
 			    !is_t3a(TOE_DEV(so))) {
 				if (toep->tp_flags & TP_ABORT_REQ_RCVD)
@@ -1937,12 +1949,14 @@
 				INP_INFO_WLOCK(&tcbinfo);
 				INP_LOCK(tp->t_inpcb);
 				t3_release_offload_resources(so);
-				tcp_close(tp);
+				tp = tcp_close(tp);
 				INP_INFO_WUNLOCK(&tcbinfo);
-				INP_UNLOCK(tp->t_inpcb);
 			}
 		}
 	}
+	if (tp)
+		INP_UNLOCK(tp->t_inpcb);
+
 	m_free(m);
 }
 
@@ -1979,7 +1993,7 @@
 	 */
 	if (!toep)
 		goto discard;
-	
+
 	so = toeptoso(toep);
 	toepcb_hold(toep);
 	process_abort_rpl(so, m);
@@ -2024,6 +2038,8 @@
 
 	rpl->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_HOST_ABORT_CON_RPL));
 	rpl->wr.wr_lo = htonl(V_WR_TID(tid));
+	m->m_len = m->m_pkthdr.len = sizeof(*rpl);
+	
 	OPCODE_TID(rpl) = htonl(MK_OPCODE_TID(CPL_ABORT_RPL, tid));
 	rpl->cmd = cmd;
 }
@@ -2079,6 +2095,7 @@
 	cxgb_ofld_send(TOM_DATA(tdev)->cdev, reply_mbuf);
 }
 
+#ifdef notyet
 static void
 cleanup_syn_rcv_conn(struct socket *child, struct socket *parent)
 {
@@ -2093,6 +2110,7 @@
 #endif
 }
 
+
 /*
  * Performs the actual work to abort a SYN_RECV connection.
  */
@@ -2101,8 +2119,7 @@
 {
 	struct tcpcb *parenttp = sototcpcb(parent);
 	struct tcpcb *childtp = sototcpcb(child);
-	struct inpcb *inp = sotoinpcb(child);
-	
+
 	/*
 	 * If the server is still open we clean up the child connection,
 	 * otherwise the server already did the clean up as it was purging
@@ -2111,15 +2128,16 @@
 	if (__predict_false(parenttp->t_state == TCPS_LISTEN)) {
 		cleanup_syn_rcv_conn(child, parent);
 		INP_INFO_WLOCK(&tcbinfo);
-		INP_LOCK(inp);
+		INP_LOCK(childtp->t_inpcb);
 		t3_release_offload_resources(child);
-		tcp_close(childtp);
+		childtp = tcp_close(childtp);
 		INP_INFO_WUNLOCK(&tcbinfo);
-		INP_UNLOCK(inp);
+		if (childtp)
+			INP_UNLOCK(childtp->t_inpcb);
 	}
 }
+#endif
 
-
 /*
  * Handle abort requests for a SYN_RECV connection.  These need extra work
  * because the socket is on its parent's SYN queue.
@@ -2163,11 +2181,11 @@
 	struct tcpcb *tp = sototcpcb(so);
 	struct toepcb *toep = tp->t_toe;
 
-	INP_LOCK_ASSERT(tp->t_inpcb);
+	INP_LOCK(tp->t_inpcb);
 	if ((toep->tp_flags & TP_ABORT_REQ_RCVD) == 0) {
 		toep->tp_flags |= (TP_ABORT_REQ_RCVD|TP_ABORT_SHUTDOWN);
 		m_free(m);
-		return;
+		goto skip;
 	}
 
 	toep->tp_flags &= ~TP_ABORT_REQ_RCVD;
@@ -2193,15 +2211,18 @@
 		 * returns 0 is has taken care of the abort.
 		 */
 		if ((tp->t_state == TCPS_SYN_RECEIVED) && !abort_syn_rcv(so, m))
-			return;
+			goto skip;
 
-		INP_LOCK(tp->t_inpcb);
 		t3_release_offload_resources(so);
-		tcp_close(tp);
-		INP_UNLOCK(tp->t_inpcb);		
+		tp = tcp_close(tp);
 	}
+	if (tp)
+		INP_UNLOCK(tp->t_inpcb);	
+	send_abort_rpl(m, tdev, rst_status);
+	return;
 	
-	send_abort_rpl(m, tdev, rst_status);
+skip:
+	INP_UNLOCK(tp->t_inpcb);		
 }
 
 /*
@@ -2213,15 +2234,30 @@
 	const struct cpl_abort_req_rss *req = cplhdr(m);
 	struct toepcb *toep = (struct toepcb *)ctx;
 	struct socket *so;
+	struct inpcb *inp;
 	
 	if (is_neg_adv_abort(req->status)) {
 		m_free(m);
 		return (0);
 	}
+
 	printf("aborting tid=%d\n", toep->tp_tid);
 	
-	INP_INFO_WLOCK(&tcbinfo);
 	if (toep->tp_flags & TP_SYN_RCVD) {
+		cxgb_remove_tid(cdev, toep, toep->tp_tid);
+		printf("sending abort rpl\n");
+		
+		send_abort_rpl(m, toep->tp_toedev, CPL_ABORT_NO_RST);
+		printf("sent\n");
+		if (toep->tp_l2t) 
+			l2t_release(L2DATA(cdev), toep->tp_l2t);
+
+		/*
+		 * XXX need to call syncache_chkrst - but we don't
+		 * have a way of doing that yet
+		 */
+		toepcb_release(toep);
+		
 		printf("abort for unestablished connection :-(\n");
 		return (0);
 	}
@@ -2232,14 +2268,17 @@
 	}
 
 	so = toeptoso(toep);
+	inp = sotoinpcb(so);
+	
 	VALIDATE_SOCK(so);
 	toepcb_hold(toep);
+	INP_INFO_WLOCK(&tcbinfo);
 	process_abort_req(so, m, TOE_DEV(so));
 	INP_INFO_WUNLOCK(&tcbinfo);
 	toepcb_release(toep);
 	return (0);
 }
-
+#ifdef notyet
 static void
 pass_open_abort(struct socket *child, struct socket *parent, struct mbuf *m)
 {
@@ -2255,7 +2294,7 @@
 	} else
 		m_free(m);
 }
-
+#endif
 static void
 handle_pass_open_arp_failure(struct socket *so, struct mbuf *m)
 {
@@ -2616,7 +2655,7 @@
 	newtoep->tp_tid = tid;
 	newtoep->tp_toedev = tdev;
 		
-	DPRINTF("inserting tid=%d\n", tid);
+	printf("inserting tid=%d\n", tid);
 	cxgb_insert_tid(cdev, d->client, newtoep, tid);
 
 	if (lctx->ulp_mode) {
@@ -2631,7 +2670,11 @@
 	set_arp_failure_handler(reply_mbuf, pass_accept_rpl_arp_failure);
 
 	DPRINTF("adding request to syn cache\n");
-	
+
+	/*
+	 * XXX workaround for lack of syncache drop
+	 */
+	toepcb_hold(newtoep);
 	syncache_add_accept_req(req, so, newtoep);
 
 	rpl = cplhdr(reply_mbuf);
@@ -2850,7 +2893,7 @@
 	to.to_wscale =  G_TCPOPT_SND_WSCALE(opt);
 	to.to_flags = (mss ? TOF_MSS : 0) | (wsf ? TOF_SCALE : 0) | (ts ? TOF_TS : 0) | (sack ? TOF_SACKPERM : 0);
 
-	printf("syncache expand of %d:%d %d:%d mss:%d wsf:%d ts:%d sack:%d\n",
+	DPRINTF("syncache expand of %d:%d %d:%d mss:%d wsf:%d ts:%d sack:%d\n",
 	    ntohl(req->local_ip), ntohs(req->local_port),
 	    ntohl(req->peer_ip), ntohs(req->peer_port),
 	    mss, wsf, ts, sack);
@@ -2891,6 +2934,11 @@
 		 */
 		UNIMPLEMENTED();
 	}
+
+	/*
+	 * XXX workaround for lack of syncache drop
+	 */
+	toepcb_release(toep);
 	
 	tp = sototcpcb(so);
 	INP_LOCK(tp->t_inpcb);
@@ -2900,6 +2948,7 @@
 	tp->t_toe = toep;
 	reset_wr_list(tp);
 	tp->rcv_wnd = select_rcv_wnd(so);
+	DPRINTF("rcv_wnd=%ld\n", tp->rcv_wnd);
 	install_offload_ops(so);
 	
 	toep->tp_wr_max = toep->tp_wr_avail = TOM_TUNABLE(tdev, max_wrs);

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 05:24:04 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6BD2F16A41B; Sat,  8 Dec 2007 05:24:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2FC1116A418
	for ; Sat,  8 Dec 2007 05:24:04 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1DB7A13C468
	for ; Sat,  8 Dec 2007 05:24:04 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB85O4MY047806
	for ; Sat, 8 Dec 2007 05:24:04 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB85NuLP047541
	for perforce@freebsd.org; Sat, 8 Dec 2007 05:23:56 GMT
	(envelope-from marcel@freebsd.org)
Date: Sat, 8 Dec 2007 05:23:56 GMT
Message-Id: <200712080523.lB85NuLP047541@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130463 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 05:24:04 -0000

http://perforce.freebsd.org/chv.cgi?CH=130463

Change 130463 by marcel@marcel_xcllnt on 2007/12/08 05:23:18

	IFC @130450

Affected files ...

.. //depot/projects/ia64/Makefile.inc1#121 integrate
.. //depot/projects/ia64/ObsoleteFiles.inc#22 integrate
.. //depot/projects/ia64/bin/sh/sh.1#39 integrate
.. //depot/projects/ia64/contrib/amd/AUTHORS#4 integrate
.. //depot/projects/ia64/contrib/amd/BUGS#4 integrate
.. //depot/projects/ia64/contrib/amd/COPYING#4 integrate
.. //depot/projects/ia64/contrib/amd/ChangeLog#4 integrate
.. //depot/projects/ia64/contrib/amd/FAQ#1 branch
.. //depot/projects/ia64/contrib/amd/INSTALL#4 integrate
.. //depot/projects/ia64/contrib/amd/NEWS#4 integrate
.. //depot/projects/ia64/contrib/amd/README.attrcache#1 branch
.. //depot/projects/ia64/contrib/amd/README.ldap#3 integrate
.. //depot/projects/ia64/contrib/amd/amd/am_ops.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amd.8#6 integrate
.. //depot/projects/ia64/contrib/amd/amd/amd.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amd.h#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amfs_auto.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amfs_direct.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amfs_error.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amfs_generic.c#1 branch
.. //depot/projects/ia64/contrib/amd/amd/amfs_host.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amfs_inherit.c#4 delete
.. //depot/projects/ia64/contrib/amd/amd/amfs_link.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amfs_linkx.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amfs_nfsl.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amfs_nfsx.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amfs_program.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amfs_root.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amfs_toplvl.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amfs_union.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amq_subr.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amq_svc.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/autil.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/clock.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/conf.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/conf_parse.y#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/conf_tok.l#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/get_args.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/info_exec.c#1 branch
.. //depot/projects/ia64/contrib/amd/amd/info_file.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/info_hesiod.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/info_ldap.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/info_ndbm.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/info_nis.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/info_nisplus.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/info_passwd.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/info_union.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/map.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/mapc.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/mntfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/nfs_prot_svc.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/nfs_start.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/nfs_subr.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_TEMPLATE.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_cachefs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_cdfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_efs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_lofs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_mfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_nfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_nfs3.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_nullfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_pcfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_tfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_tmpfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_ufs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_umapfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_unionfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_xfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/opts.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/readdir.c#1 branch
.. //depot/projects/ia64/contrib/amd/amd/restart.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/rpc_fwd.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/sched.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/srvr_amfs_auto.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/srvr_nfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amq/amq.8#7 integrate
.. //depot/projects/ia64/contrib/amd/amq/amq.c#6 integrate
.. //depot/projects/ia64/contrib/amd/amq/amq.h#4 integrate
.. //depot/projects/ia64/contrib/amd/amq/amq_clnt.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amq/amq_xdr.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amq/pawd.1#5 integrate
.. //depot/projects/ia64/contrib/amd/amq/pawd.c#4 integrate
.. //depot/projects/ia64/contrib/amd/aux_conf.h.in#3 integrate
.. //depot/projects/ia64/contrib/amd/bootstrap#3 integrate
.. //depot/projects/ia64/contrib/amd/conf/checkmount/checkmount_bsd44.c#4 integrate
.. //depot/projects/ia64/contrib/amd/conf/mtab/mtab_bsd.c#4 integrate
.. //depot/projects/ia64/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#4 integrate
.. //depot/projects/ia64/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#4 integrate
.. //depot/projects/ia64/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#2 integrate
.. //depot/projects/ia64/contrib/amd/conf/transp/transp_sockets.c#5 integrate
.. //depot/projects/ia64/contrib/amd/conf/trap/trap_default.h#4 integrate
.. //depot/projects/ia64/contrib/amd/conf/umount/umount_bsd44.c#4 integrate
.. //depot/projects/ia64/contrib/amd/doc/am-utils.texi#4 integrate
.. //depot/projects/ia64/contrib/amd/doc/stamp-vti#3 branch
.. //depot/projects/ia64/contrib/amd/doc/texinfo.tex#3 integrate
.. //depot/projects/ia64/contrib/amd/doc/version.texi#4 integrate
.. //depot/projects/ia64/contrib/amd/fixmount/fixmount.8#8 integrate
.. //depot/projects/ia64/contrib/amd/fixmount/fixmount.c#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/fsi_analyze.c#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/fsi_data.h#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/fsi_dict.c#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/fsi_gram.y#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/fsi_lex.l#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/fsi_util.c#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/fsinfo.8#8 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/fsinfo.c#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/fsinfo.h#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/wr_atab.c#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/wr_bparam.c#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/wr_dumpset.c#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/wr_exportfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/wr_fstab.c#4 integrate
.. //depot/projects/ia64/contrib/amd/hlfsd/hlfsd.8#7 integrate
.. //depot/projects/ia64/contrib/amd/hlfsd/hlfsd.c#4 integrate
.. //depot/projects/ia64/contrib/amd/hlfsd/hlfsd.h#7 integrate
.. //depot/projects/ia64/contrib/amd/hlfsd/homedir.c#4 integrate
.. //depot/projects/ia64/contrib/amd/hlfsd/nfs_prot_svc.c#4 integrate
.. //depot/projects/ia64/contrib/amd/hlfsd/stubs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/include/am_compat.h#3 integrate
.. //depot/projects/ia64/contrib/amd/include/am_defs.h#4 integrate
.. //depot/projects/ia64/contrib/amd/include/am_utils.h#4 integrate
.. //depot/projects/ia64/contrib/amd/include/am_xdr_func.h#4 integrate
.. //depot/projects/ia64/contrib/amd/include/amq_defs.h#4 integrate
.. //depot/projects/ia64/contrib/amd/include/mount_headers1.h#3 integrate
.. //depot/projects/ia64/contrib/amd/include/mount_headers2.h#2 integrate
.. //depot/projects/ia64/contrib/amd/ldap-id.ms#2 integrate
.. //depot/projects/ia64/contrib/amd/ldap.schema#1 branch
.. //depot/projects/ia64/contrib/amd/libamu/alloca.c#2 delete
.. //depot/projects/ia64/contrib/amd/libamu/amu.h#4 integrate
.. //depot/projects/ia64/contrib/amd/libamu/hasmntopt.c#4 integrate
.. //depot/projects/ia64/contrib/amd/libamu/misc_rpc.c#4 integrate
.. //depot/projects/ia64/contrib/amd/libamu/mount_fs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/libamu/mtab.c#4 integrate
.. //depot/projects/ia64/contrib/amd/libamu/nfs_prot_xdr.c#4 integrate
.. //depot/projects/ia64/contrib/amd/libamu/strerror.c#3 integrate
.. //depot/projects/ia64/contrib/amd/libamu/strutil.c#1 branch
.. //depot/projects/ia64/contrib/amd/libamu/util.c#4 delete
.. //depot/projects/ia64/contrib/amd/libamu/wire.c#4 integrate
.. //depot/projects/ia64/contrib/amd/libamu/xdr_func.c#4 integrate
.. //depot/projects/ia64/contrib/amd/libamu/xutil.c#4 integrate
.. //depot/projects/ia64/contrib/amd/m4/GNUmakefile#2 delete
.. //depot/projects/ia64/contrib/amd/m4/amdgrep#2 delete
.. //depot/projects/ia64/contrib/amd/m4/amindent#2 delete
.. //depot/projects/ia64/contrib/amd/m4/autopat#2 delete
.. //depot/projects/ia64/contrib/amd/m4/chop-aclocal.pl#2 delete
.. //depot/projects/ia64/contrib/amd/m4/copy-if-newbig#2 delete
.. //depot/projects/ia64/contrib/amd/m4/macros/HEADER#2 delete
.. //depot/projects/ia64/contrib/amd/m4/macros/TRAILER#2 delete
.. //depot/projects/ia64/contrib/amd/m4/mk-aclocal#2 delete
.. //depot/projects/ia64/contrib/amd/m4/mkconf#2 delete
.. //depot/projects/ia64/contrib/amd/m4/rmtspc#2 delete
.. //depot/projects/ia64/contrib/amd/m4/update_build_version#2 delete
.. //depot/projects/ia64/contrib/amd/mk-amd-map/mk-amd-map.8#5 integrate
.. //depot/projects/ia64/contrib/amd/mk-amd-map/mk-amd-map.c#4 integrate
.. //depot/projects/ia64/contrib/amd/scripts/am-eject.in#2 integrate
.. //depot/projects/ia64/contrib/amd/scripts/amd.conf-sample#4 integrate
.. //depot/projects/ia64/contrib/amd/scripts/amd.conf.5#7 integrate
.. //depot/projects/ia64/contrib/amd/scripts/amd2ldif.in#2 integrate
.. //depot/projects/ia64/contrib/amd/scripts/amd2sun.in#2 integrate
.. //depot/projects/ia64/contrib/amd/scripts/automount2amd.8#4 integrate
.. //depot/projects/ia64/contrib/amd/scripts/automount2amd.in#2 integrate
.. //depot/projects/ia64/contrib/amd/scripts/ctl-amd.in#3 integrate
.. //depot/projects/ia64/contrib/amd/scripts/ctl-hlfsd.in#3 integrate
.. //depot/projects/ia64/contrib/amd/scripts/expn.1#4 integrate
.. //depot/projects/ia64/contrib/amd/scripts/expn.in#4 integrate
.. //depot/projects/ia64/contrib/amd/scripts/fix-amd-map.in#2 integrate
.. //depot/projects/ia64/contrib/amd/scripts/fixrmtab.in#2 integrate
.. //depot/projects/ia64/contrib/amd/scripts/redhat-ctl-amd.in#2 integrate
.. //depot/projects/ia64/contrib/amd/scripts/test-attrcache.in#1 branch
.. //depot/projects/ia64/contrib/amd/scripts/wait4amd.in#2 integrate
.. //depot/projects/ia64/contrib/amd/scripts/wait4amd2die.in#2 integrate
.. //depot/projects/ia64/contrib/amd/tasks#4 integrate
.. //depot/projects/ia64/contrib/amd/vers.m4#1 branch
.. //depot/projects/ia64/contrib/amd/wire-test/wire-test.8#5 integrate
.. //depot/projects/ia64/contrib/amd/wire-test/wire-test.c#4 integrate
.. //depot/projects/ia64/contrib/pf/pflogd/pidfile.c#7 delete
.. //depot/projects/ia64/contrib/pf/pflogd/pidfile.h#4 delete
.. //depot/projects/ia64/games/fortune/datfiles/Makefile#8 integrate
.. //depot/projects/ia64/games/fortune/datfiles/fortunes#68 integrate
.. //depot/projects/ia64/games/fortune/datfiles/fortunes-o.real#10 integrate
.. //depot/projects/ia64/games/fortune/datfiles/fortunes-o.sp.ok#2 integrate
.. //depot/projects/ia64/games/fortune/datfiles/fortunes.sp.ok#6 integrate
.. //depot/projects/ia64/games/fortune/datfiles/fortunes2-o#15 delete
.. //depot/projects/ia64/games/fortune/datfiles/freebsd-tips#21 integrate
.. //depot/projects/ia64/games/fortune/datfiles/freebsd-tips.sp.ok#1 branch
.. //depot/projects/ia64/games/fortune/datfiles/limerick#10 integrate
.. //depot/projects/ia64/games/fortune/datfiles/limerick.sp.ok#1 branch
.. //depot/projects/ia64/games/fortune/datfiles/murphy#7 integrate
.. //depot/projects/ia64/games/fortune/datfiles/murphy-o#3 integrate
.. //depot/projects/ia64/games/fortune/datfiles/murphy.sp.ok#1 branch
.. //depot/projects/ia64/games/fortune/datfiles/startrek#10 integrate
.. //depot/projects/ia64/games/fortune/datfiles/zippy#5 integrate
.. //depot/projects/ia64/games/fortune/datfiles/zippy.sp.ok#2 integrate
.. //depot/projects/ia64/lib/csu/common/crtbrand.c#6 integrate
.. //depot/projects/ia64/lib/libarchive/archive_read_support_format_zip.c#11 integrate
.. //depot/projects/ia64/lib/libkse/thread/thr_kern.c#2 integrate
.. //depot/projects/ia64/lib/libpmc/libpmc.c#6 integrate
.. //depot/projects/ia64/lib/libpthread/arch/ia64/include/atomic_ops.h#3 delete
.. //depot/projects/ia64/lib/libpthread/arch/ia64/include/pthread_md.h#13 delete
.. //depot/projects/ia64/libexec/rtld-aout/support.c#4 delete
.. //depot/projects/ia64/libexec/rtld-aout/support.h#4 delete
.. //depot/projects/ia64/release/fixit.profile#3 integrate
.. //depot/projects/ia64/sbin/dhclient/dispatch.c#2 integrate
.. //depot/projects/ia64/share/examples/cvsup/refuse#8 integrate
.. //depot/projects/ia64/share/examples/cvsup/refuse.README#9 integrate
.. //depot/projects/ia64/share/man/man4/aac.4#17 integrate
.. //depot/projects/ia64/share/man/man4/hwpmc.4#11 integrate
.. //depot/projects/ia64/share/man/man4/msk.4#5 integrate
.. //depot/projects/ia64/share/mk/bsd.subdir.mk#13 integrate
.. //depot/projects/ia64/sys/amd64/amd64/exception.S#18 integrate
.. //depot/projects/ia64/sys/amd64/amd64/pmap.c#66 integrate
.. //depot/projects/ia64/sys/amd64/amd64/trap.c#36 integrate
.. //depot/projects/ia64/sys/amd64/include/pmc_mdep.h#3 integrate
.. //depot/projects/ia64/sys/arm/arm/pmap.c#30 integrate
.. //depot/projects/ia64/sys/arm/include/pmc_mdep.h#3 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32.h#5 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_ipc.h#1 branch
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_misc.c#28 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_proto.h#26 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_syscall.h#26 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_syscalls.c#26 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_sysent.c#26 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/syscalls.master#25 integrate
.. //depot/projects/ia64/sys/conf/Makefile.amd64#15 integrate
.. //depot/projects/ia64/sys/conf/NOTES#120 integrate
.. //depot/projects/ia64/sys/conf/files#161 integrate
.. //depot/projects/ia64/sys/conf/options#111 integrate
.. //depot/projects/ia64/sys/dev/aac/aac.c#54 integrate
.. //depot/projects/ia64/sys/dev/aac/aac_cam.c#26 integrate
.. //depot/projects/ia64/sys/dev/aac/aac_pci.c#42 integrate
.. //depot/projects/ia64/sys/dev/aac/aacreg.h#16 integrate
.. //depot/projects/ia64/sys/dev/aac/aacvar.h#24 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#60 integrate
.. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_amd.c#6 integrate
.. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_arm.c#2 integrate
.. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_ia64.c#2 integrate
.. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_logging.c#6 integrate
.. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_mod.c#10 integrate
.. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_piv.c#8 integrate
.. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_powerpc.c#2 integrate
.. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_ppro.c#4 integrate
.. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_sparc64.c#2 integrate
.. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_x86.c#5 integrate
.. //depot/projects/ia64/sys/dev/if_ndis/if_ndis.c#28 integrate
.. //depot/projects/ia64/sys/dev/ipw/if_ipw.c#13 integrate
.. //depot/projects/ia64/sys/dev/iwi/if_iwi.c#18 integrate
.. //depot/projects/ia64/sys/dev/msk/if_msk.c#7 integrate
.. //depot/projects/ia64/sys/dev/msk/if_mskreg.h#6 integrate
.. //depot/projects/ia64/sys/dev/re/if_re.c#37 integrate
.. //depot/projects/ia64/sys/dev/sio/sio.c#76 integrate
.. //depot/projects/ia64/sys/dev/utopia/utopia.c#11 integrate
.. //depot/projects/ia64/sys/fs/tmpfs/tmpfs_subr.c#3 integrate
.. //depot/projects/ia64/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate
.. //depot/projects/ia64/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate
.. //depot/projects/ia64/sys/geom/geom_bsd.c#47 integrate
.. //depot/projects/ia64/sys/geom/part/g_part.c#8 integrate
.. //depot/projects/ia64/sys/geom/part/g_part.h#7 integrate
.. //depot/projects/ia64/sys/geom/part/g_part_bsd.c#3 integrate
.. //depot/projects/ia64/sys/i386/bios/apm.c#15 integrate
.. //depot/projects/ia64/sys/i386/i386/exception.s#20 integrate
.. //depot/projects/ia64/sys/i386/i386/pmap.c#106 integrate
.. //depot/projects/ia64/sys/i386/i386/trap.c#62 integrate
.. //depot/projects/ia64/sys/i386/include/pmc_mdep.h#4 integrate
.. //depot/projects/ia64/sys/ia64/conf/DEFAULTS#10 integrate
.. //depot/projects/ia64/sys/ia64/include/pmc_mdep.h#3 integrate
.. //depot/projects/ia64/sys/kern/imgact_elf.c#52 integrate
.. //depot/projects/ia64/sys/kern/init_main.c#67 integrate
.. //depot/projects/ia64/sys/kern/kern_conf.c#45 integrate
.. //depot/projects/ia64/sys/kern/kern_exec.c#91 integrate
.. //depot/projects/ia64/sys/kern/kern_mbuf.c#17 integrate
.. //depot/projects/ia64/sys/kern/kern_mib.c#24 integrate
.. //depot/projects/ia64/sys/kern/kern_module.c#18 integrate
.. //depot/projects/ia64/sys/kern/kern_pmc.c#5 integrate
.. //depot/projects/ia64/sys/kern/subr_trap.c#60 integrate
.. //depot/projects/ia64/sys/kern/vfs_mount.c#60 integrate
.. //depot/projects/ia64/sys/kern/vfs_subr.c#101 integrate
.. //depot/projects/ia64/sys/net/if_lagg.c#5 integrate
.. //depot/projects/ia64/sys/net/if_var.h#39 integrate
.. //depot/projects/ia64/sys/net/route.c#31 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211.c#25 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_output.c#25 integrate
.. //depot/projects/ia64/sys/netinet/if_ether.c#44 integrate
.. //depot/projects/ia64/sys/netinet/in_pcb.h#36 integrate
.. //depot/projects/ia64/sys/netinet/libalias/alias_util.c#6 integrate
.. //depot/projects/ia64/sys/netinet/sctp.h#7 integrate
.. //depot/projects/ia64/sys/netinet/sctp_output.c#11 integrate
.. //depot/projects/ia64/sys/netinet/sctp_structs.h#10 integrate
.. //depot/projects/ia64/sys/netinet/sctp_usrreq.c#10 integrate
.. //depot/projects/ia64/sys/netinet/sctputil.c#11 integrate
.. //depot/projects/ia64/sys/netinet/tcp_syncache.c#52 integrate
.. //depot/projects/ia64/sys/netinet/tcp_var.h#41 integrate
.. //depot/projects/ia64/sys/netinet6/in6.c#32 integrate
.. //depot/projects/ia64/sys/pci/if_rlreg.h#40 integrate
.. //depot/projects/ia64/sys/powerpc/include/pmc_mdep.h#3 integrate
.. //depot/projects/ia64/sys/security/audit/audit.c#10 integrate
.. //depot/projects/ia64/sys/sparc64/include/pmc_mdep.h#3 integrate
.. //depot/projects/ia64/sys/sun4v/include/pmc_mdep.h#2 integrate
.. //depot/projects/ia64/sys/sys/param.h#86 integrate
.. //depot/projects/ia64/sys/sys/pmc.h#8 integrate
.. //depot/projects/ia64/sys/sys/pmckern.h#5 integrate
.. //depot/projects/ia64/sys/sys/pmclog.h#4 integrate
.. //depot/projects/ia64/sys/sys/proc.h#114 integrate
.. //depot/projects/ia64/sys/sys/systm.h#57 integrate
.. //depot/projects/ia64/sys/sys/ucred.h#23 integrate
.. //depot/projects/ia64/tools/tools/ath/athdebug/athdebug.c#2 integrate
.. //depot/projects/ia64/tools/tools/ath/athstats/athstats.c#4 integrate
.. //depot/projects/ia64/tools/tools/ath/athstats/athstats.h#2 integrate
.. //depot/projects/ia64/tools/tools/ath/athstats/main.c#2 integrate
.. //depot/projects/ia64/tools/tools/ath/athstats/statfoo.c#2 integrate
.. //depot/projects/ia64/tools/tools/ath/athstats/statfoo.h#2 integrate
.. //depot/projects/ia64/tools/tools/net80211/wlanstats/main.c#3 integrate
.. //depot/projects/ia64/tools/tools/net80211/wlanstats/statfoo.c#3 integrate
.. //depot/projects/ia64/tools/tools/net80211/wlanstats/statfoo.h#2 integrate
.. //depot/projects/ia64/tools/tools/net80211/wlanstats/wlanstats.c#5 integrate
.. //depot/projects/ia64/tools/tools/net80211/wlanstats/wlanstats.h#2 integrate
.. //depot/projects/ia64/tools/tools/net80211/wlanwatch/wlanwatch.c#3 integrate
.. //depot/projects/ia64/usr.bin/kdump/kdump.c#16 integrate
.. //depot/projects/ia64/usr.sbin/Makefile#86 integrate
.. //depot/projects/ia64/usr.sbin/amd/amd/Makefile#6 integrate
.. //depot/projects/ia64/usr.sbin/amd/fsinfo/Makefile#2 integrate
.. //depot/projects/ia64/usr.sbin/amd/include/amu_autofs_prot.h#1 branch
.. //depot/projects/ia64/usr.sbin/amd/include/aux_conf.h#3 integrate
.. //depot/projects/ia64/usr.sbin/amd/include/build_version.h#2 integrate
.. //depot/projects/ia64/usr.sbin/amd/include/config.h#5 integrate
.. //depot/projects/ia64/usr.sbin/amd/include/newvers.sh#4 integrate
.. //depot/projects/ia64/usr.sbin/amd/libamu/Makefile#4 integrate
.. //depot/projects/ia64/usr.sbin/amd/mk-amd-map/Makefile#2 integrate
.. //depot/projects/ia64/usr.sbin/mtree/verify.c#9 integrate
.. //depot/projects/ia64/usr.sbin/pmcstat/Makefile#5 integrate
.. //depot/projects/ia64/usr.sbin/pmcstat/pmcstat.8#7 integrate
.. //depot/projects/ia64/usr.sbin/pmcstat/pmcstat.c#9 integrate
.. //depot/projects/ia64/usr.sbin/pmcstat/pmcstat.h#4 integrate
.. //depot/projects/ia64/usr.sbin/pmcstat/pmcstat_log.c#7 integrate
.. //depot/projects/ia64/usr.sbin/syslogd/syslogd.c#32 integrate

Differences ...

==== //depot/projects/ia64/Makefile.inc1#121 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.590 2007/10/31 09:26:42 yar Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.591 2007/12/04 12:55:27 yar Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -591,17 +591,25 @@
 #
 distributeworld installworld: installcheck
 	mkdir -p ${INSTALLTMP}
-	for prog in ${ITOOLS}; do \
+	progs=$$(for prog in ${ITOOLS}; do \
 		if progpath=`which $$prog`; then \
-			progs="$$progs $$progpath"; \
+			echo $$progpath; \
 		else \
 			echo "Required tool $$prog not found in PATH." >&2; \
 			exit 1; \
 		fi; \
-	done; \
-	cp $$progs ${INSTALLTMP}; \
-	cp `ldd -f "%p\n" -f "%p\n" $$progs 2>/dev/null | \
-	    sort -u` ${INSTALLTMP}
+	    done); \
+	libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | \
+	    while read line; do \
+		set -- $$line; \
+		if [ "$$2 $$3" != "not found" ]; then \
+			echo $$2; \
+		else \
+			echo "Required library $$1 not found." >&2; \
+			exit 1; \
+		fi; \
+	    done); \
+	cp $$libs $$progs ${INSTALLTMP}
 	cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale
 	${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
 	    ${IMAKEENV} rm -rf ${INSTALLTMP}

==== //depot/projects/ia64/ObsoleteFiles.inc#22 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.123 2007/11/29 21:49:08 brooks Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.124 2007/12/07 22:56:10 dougb Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,9 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20071207: Merged with fortunes-o.real
+OLD_FILES+=usr/share/games/fortune/fortunes2-o
+OLD_FILES+=usr/share/games/fortune/fortunes2-o.dat
 # 20071129: Disabled static versions of libkse by default
 .if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no"
 OLD_FILES+=usr/lib/libkse.a

==== //depot/projects/ia64/bin/sh/sh.1#39 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.125 2007/10/04 16:14:48 stefanf Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.126 2007/12/05 12:29:26 ru Exp $
 .\"
 .Dd October 7, 2006
 .Dt SH 1
@@ -57,9 +57,12 @@
 This version has many features which make
 it appear
 similar in some respects to the Korn shell, but it is not a Korn
-shell clone like pdksh.
+shell clone like
+.Nm pdksh .
 Only features
-designated by POSIX, plus a few Berkeley extensions, are being
+designated by
+.Tn POSIX ,
+plus a few Berkeley extensions, are being
 incorporated into this shell.
 This man page is not intended to be a tutorial nor a complete
 specification of the shell.
@@ -107,6 +110,7 @@
 .Pa /etc/profile
 and then
 .Pa .profile
+in a user's home directory,
 if they exist.
 If the environment variable
 .Ev ENV
@@ -129,13 +133,15 @@
 .Pa .shinit
 the filename desired:
 .Pp
-.Dl ENV=$HOME/.shinit; export ENV
+.Dl "ENV=$HOME/.shinit; export ENV"
 .Pp
 The first non-option argument specified on the command line
 will be treated as the
 name of a file from which to read commands (a shell script), and
 the remaining arguments are set as the positional parameters
-of the shell ($1, $2, etc).
+of the shell
+.Li ( $1 , $2 ,
+etc.).
 Otherwise, the shell reads commands
 from its standard input.
 .Pp
@@ -180,7 +186,7 @@
 A
 .Dq Li --
 or plain
-.Dq Ql -
+.Ql -
 will stop option processing and will force the remaining
 words on the command line to be treated as arguments.
 The
@@ -198,7 +204,7 @@
 (UNIMPLEMENTED)
 .It Fl C Li noclobber
 Do not overwrite existing files with
-.Dq Li > .
+.Ql > .
 .It Fl E Li emacs
 Enable the built-in
 .Xr emacs 1
@@ -228,7 +234,7 @@
 Disable pathname expansion.
 .It Fl I Li ignoreeof
 Ignore
-.Dv EOF Ns ' Ns s
+.Dv EOF Ap s
 from input when in interactive mode.
 .It Fl i Li interactive
 Force the shell to behave interactively.
@@ -253,10 +259,10 @@
 .It Fl p Li privileged
 Turn on privileged mode.
 This mode is enabled on startup
-if either the effective user or group id is not equal to the
-real user or group id.
+if either the effective user or group ID is not equal to the
+real user or group ID.
 Turning this mode off sets the
-effective user and group ids to the real user and group ids.
+effective user and group IDs to the real user and group IDs.
 When this mode is enabled for interactive shells, the file
 .Pa /etc/suid_profile
 is sourced instead of
@@ -288,7 +294,6 @@
 .Bd -literal -offset indent
 sh -T -c "trap 'exit 1' 2 ; some-blocking-program"
 .Ed
-.Pp
 .It Fl u Li nounset
 Write a message to standard error when attempting
 to expand a variable that is not set, and if the
@@ -306,7 +311,7 @@
 .It Fl x Li xtrace
 Write each command
 (preceded by the value of the
-.Ev PS4
+.Va PS4
 variable)
 to standard error before it is executed.
 Useful for debugging.
@@ -384,7 +389,7 @@
 it impossible to put single-quotes in a single-quoted string).
 .It Double Quotes
 Enclosing characters within double quotes preserves the literal
-meaning of all characters except dollarsign
+meaning of all characters except dollar sign
 .Pq Ql $ ,
 backquote
 .Pq Ql ` ,
@@ -423,16 +428,14 @@
 For example, if there is an alias called
 .Dq Li lf
 with the value
-.Dq Li ls -F ,
+.Dq Li "ls -F" ,
 then the input
-.Bd -literal -offset indent
-lf foobar
-.Ed
+.Pp
+.Dl "lf foobar"
 .Pp
 would become
-.Bd -literal -offset indent
-ls -F foobar
-.Ed
+.Pp
+.Dl "ls -F foobar"
 .Pp
 Aliases provide a convenient way for naive users to
 create shorthands for commands without having to learn how
@@ -498,10 +501,10 @@
 The overall format
 used for redirection is:
 .Pp
-.Dl [n] redir-op file
+.D1 Oo Ar n Oc Ar redir-op file
 .Pp
 The
-.Ql redir-op
+.Ar redir-op
 is one of the redirection operators mentioned
 previously.
 The following gives some examples of how these
@@ -509,42 +512,66 @@
 Note that stdin and stdout are commonly used abbreviations
 for standard input and standard output respectively.
 .Bl -tag -width "1234567890XX" -offset indent
-.It Li [n]> file
-redirect stdout (or file descriptor n) to file
-.It Li [n]>| file
+.It Oo Ar n Oc Ns Li > Ar file
+redirect stdout (or file descriptor
+.Ar n )
+to
+.Ar file
+.It Oo Ar n Oc Ns Li >| Ar file
 same as above, but override the
 .Fl C
 option
-.It Li [n]>> file
-append stdout (or file descriptor n) to file
-.It Li [n]< file
-redirect stdin (or file descriptor n) from file
-.It Li [n]<> file
-redirect stdin (or file descriptor n) to and from file
-.It Li [n1]<&n2
-duplicate stdin (or file descriptor n1) from file descriptor n2
-.It Li [n]<&-
-close stdin (or file descriptor n)
-.It Li [n1]>&n2
-duplicate stdout (or file descriptor n1) to file descriptor n2
-.It Li [n]>&-
-close stdout (or file descriptor n)
+.It Oo Ar n Oc Ns Li >> Ar file
+append stdout (or file descriptor
+.Ar n )
+to
+.Ar file
+.It Oo Ar n Oc Ns Li < Ar file
+redirect stdin (or file descriptor
+.Ar n )
+from
+.Ar file
+.It Oo Ar n Oc Ns Li <> Ar file
+redirect stdin (or file descriptor
+.Ar n )
+to and from
+.Ar file
+.It Oo Ar n1 Oc Ns Li <& Ns Ar n2
+duplicate stdin (or file descriptor
+.Ar n1 )
+from file descriptor
+.Ar n2
+.It Oo Ar n Oc Ns Li <&-
+close stdin (or file descriptor
+.Ar n )
+.It Oo Ar n1 Oc Ns Li >& Ns Ar n2
+duplicate stdout (or file descriptor
+.Ar n1 )
+to file descriptor
+.Ar n2
+.It Oo Ar n Oc Ns Li >&-
+close stdout (or file descriptor
+.Ar n )
 .El
 .Pp
 The following redirection is often called a
 .Dq here-document .
-.Bd -literal -offset indent
-[n]<< delimiter
-	here-doc-text
-	...
-delimiter
+.Bd -unfilled -offset indent
+.Oo Ar n Oc Ns Li << Ar delimiter
+.D1 Ar here-doc-text
+.D1 ...
+.Ar delimiter
 .Ed
 .Pp
 All the text on successive lines up to the delimiter is
 saved away and made available to the command on standard
-input, or file descriptor n if it is specified.
-If the delimiter
-as specified on the initial line is quoted, then the here-doc-text
+input, or file descriptor
+.Ar n
+if it is specified.
+If the
+.Ar delimiter
+as specified on the initial line is quoted, then the
+.Ar here-doc-text
 is treated literally, otherwise the text is subjected to
 parameter expansion, command substitution, and arithmetic
 expansion (as described in the section on
@@ -554,7 +581,9 @@
 instead of
 .Dq Li << ,
 then leading tabs
-in the here-doc-text are stripped.
+in the
+.Ar here-doc-text
+are stripped.
 .Ss Search and Execution
 There are three types of commands: shell functions,
 built-in commands, and normal programs.
@@ -562,7 +591,9 @@
 The three types of commands are all executed in a different way.
 .Pp
 When a shell function is executed, all of the shell positional
-parameters (except $0, which remains unchanged) are
+parameters (except
+.Li $0 ,
+which remains unchanged) are
 set to the arguments of the shell function.
 The variables which are explicitly placed in the environment of
 the command (by placing assignments to them before the
@@ -583,11 +614,11 @@
 passing the arguments and the environment to the program.
 If the program is not a normal executable file
 (i.e., if it does not begin with the
-.Qq magic number
+.Dq "magic number"
 whose
 .Tn ASCII
 representation is
-.Qq #! ,
+.Dq Li #! ,
 resulting in an
 .Er ENOEXEC
 return value from
@@ -597,13 +628,16 @@
 so that the effect will be
 as if a new shell had been invoked to handle the ad-hoc shell script,
 except that the location of hashed commands located in
-the parent shell will be remembered by the child.
+the parent shell will be remembered by the child
+(see the description of the
+.Ic hash
+built-in command below).
 .Pp
 Note that previous versions of this document
 and the source code itself misleadingly and sporadically
 refer to a shell script without a magic number
 as a
-.Qq shell procedure .
+.Dq "shell procedure" .
 .Ss Path Search
 When locating a command, the shell first looks to see if
 it has a shell function by that name.
@@ -616,8 +650,9 @@
 Command names containing a slash are simply executed without
 performing any searches.
 .It
-The shell searches each entry in
+The shell searches each entry in the
 .Ev PATH
+environment variable
 in turn for the command.
 The value of the
 .Ev PATH
@@ -666,7 +701,8 @@
 that of the last simple command executed by the command.
 .Ss Pipelines
 A pipeline is a sequence of one or more commands separated
-by the control operator |.
+by the control operator
+.Ql \&| .
 The standard output of all but
 the last command is connected to the standard input
 of the next command.
@@ -675,10 +711,12 @@
 .Pp
 The format for a pipeline is:
 .Pp
-.Dl [!] command1 [ | command2 ...]
+.D1 Oo Li \&! Oc Ar command1 Op Li \&| Ar command2 ...
 .Pp
-The standard output of command1 is connected to the standard
-input of command2.
+The standard output of
+.Ar command1
+is connected to the standard input of
+.Ar command2 .
 The standard input, standard output, or
 both of a command is considered to be assigned by the
 pipeline before any redirection specified by redirection
@@ -704,22 +742,22 @@
 modified by redirection.
 For example:
 .Pp
-.Dl $ command1 2>&1 | command2
+.Dl "command1 2>&1 | command2"
 .Pp
 sends both the standard output and standard error of
-.Ql command1
+.Ar command1
 to the standard input of
-.Ql command2 .
+.Ar command2 .
 .Pp
 A
-.Dq Li \&;
+.Ql \&;
 or newline terminator causes the preceding
 AND-OR-list
 (described below in the section called
 .Sx Short-Circuit List Operators )
 to be executed sequentially;
 an
-.Dq Li &
+.Ql &
 causes asynchronous execution of the preceding AND-OR-list.
 .Pp
 Note that unlike some other shells,
@@ -738,12 +776,12 @@
 before executing the next command.
 .Pp
 The format for running a command in background is:
-.Bd -literal -offset indent
-command1 & [command2 & ...]
-.Ed
+.Pp
+.D1 Ar command1 Li & Op Ar command2 Li & Ar ...
 .Pp
 If the shell is not interactive, the standard input of an
-asynchronous command is set to /dev/null.
+asynchronous command is set to
+.Pa /dev/null .
 .Ss Lists (Generally Speaking)
 A list is a sequence of zero or more commands separated by
 newlines, semicolons, or ampersands,
@@ -773,22 +811,23 @@
 The syntax of the
 .Ic if
 command is:
-.\"
-.\" XXX Use .Dl to work around broken handling of .Ic inside .Bd and .Ed .
-.\"
-.Dl Ic if Ar list
-.Dl Ic then Ar list
-.Dl [ Ic elif Ar list
-.Dl Ic then Ar list ] ...
-.Dl [ Ic else Ar list ]
-.Dl Ic fi
+.Bd -unfilled -offset indent -compact
+.Ic if Ar list
+.Ic then Ar list
+.Oo Ic elif Ar list
+.Ic then Ar list Oc Ar ...
+.Op Ic else Ar list
+.Ic fi
+.Ed
 .Pp
 The syntax of the
 .Ic while
 command is:
-.Dl Ic while Ar list
-.Dl Ic do Ar list
-.Dl Ic done
+.Bd -unfilled -offset indent -compact
+.Ic while Ar list
+.Ic do Ar list
+.Ic done
+.Ed
 .Pp
 The two lists are executed repeatedly while the exit status of the
 first list is zero.
@@ -804,9 +843,11 @@
 The syntax of the
 .Ic for
 command is:
-.Dl Ic for Ar variable Op Ic in Ar word ...
-.Dl Ic do Ar list
-.Dl Ic done
+.Bd -unfilled -offset indent -compact
+.Ic for Ar variable Op Ic in Ar word ...
+.Ic do Ar list
+.Ic done
+.Ed
 .Pp
 If
 .Ic in
@@ -820,17 +861,17 @@
 and
 .Ic done
 commands may be replaced with
-.Dq Li {
+.Ql {
 and
-.Dq Li } .
+.Ql } .
 .Pp
 The syntax of the
 .Ic break
 and
 .Ic continue
 commands is:
-.Dl Ic break Op Ar num
-.Dl Ic continue Op Ar num
+.D1 Ic break Op Ar num
+.D1 Ic continue Op Ar num
 .Pp
 The
 .Ic break
@@ -848,18 +889,20 @@
 .Pp
 The syntax of the
 .Ic case
-command is
-.Dl Ic case Ar word Ic in
-.Dl pattern) list ;;
-.Dl ...
-.Dl Ic esac
+command is:
+.Bd -unfilled -offset indent -compact
+.Ic case Ar word Ic in
+.Ar pattern Ns Li ) Ar list Li ;;
+.Ar ...
+.Ic esac
+.Ed
 .Pp
 The pattern can actually be one or more patterns
 (see
 .Sx Shell Patterns
 described later),
 separated by
-.Dq Li \&|
+.Ql \&|
 characters.
 The exit code of the
 .Ic case
@@ -867,14 +910,12 @@
 zero if no patterns were matched.
 .Ss Grouping Commands Together
 Commands may be grouped by writing either
-.Bd -literal -offset indent
-(list)
-.Ed
+.Pp
+.D1 Li \&( Ns Ar list Ns Li \%)
 .Pp
 or
-.Bd -literal -offset indent
-{ list; }
-.Ed
+.Pp
+.D1 Li { Ar list Ns Li \&; }
 .Pp
 The first form executes the commands in a subshell.
 Note that built-in commands thus executed do not affect the current shell.
@@ -887,18 +928,21 @@
 .Ed
 .Ss Functions
 The syntax of a function definition is
-.Bd -literal -offset indent
-name ( ) command
-.Ed
+.Pp
+.D1 Ar name Li \&( \&) Ar command
 .Pp
 A function definition is an executable statement; when
-executed it installs a function named name and returns an
+executed it installs a function named
+.Ar name
+and returns an
 exit status of zero.
-The command is normally a list
+The
+.Ar command
+is normally a list
 enclosed between
-.Dq Li {
+.Ql {
 and
-.Dq Li } .
+.Ql } .
 .Pp
 Variables may be declared to be local to a function by
 using the
@@ -906,11 +950,8 @@
 command.
 This should appear as the first statement of a function,
 and the syntax is:
-.Bd -ragged -offset indent
-.Ic local
-.Op Ar variable ...
-.Op Fl
-.Ed
+.Pp
+.D1 Ic local Oo Ar variable ... Oc Op Fl
 .Pp
 The
 .Ic local
@@ -923,38 +964,38 @@
 Otherwise, the variable is initially unset.
 The shell
 uses dynamic scoping, so that if the variable
-.Em x
+.Va x
 is made local to function
 .Em f ,
 which then calls function
 .Em g ,
 references to the variable
-.Em x
+.Va x
 made inside
 .Em g
 will refer to the variable
-.Em x
+.Va x
 declared inside
 .Em f ,
 not to the global variable named
-.Em x .
+.Va x .
 .Pp
 The only special parameter that can be made local is
-.Dq Li - .
+.Ql - .
 Making
-.Dq Li -
+.Ql -
 local causes any shell options that are
-changed via the set command inside the function to be
+changed via the
+.Ic set
+command inside the function to be
 restored to their original values when the function
 returns.
 .Pp
 The syntax of the
 .Ic return
 command is
-.Bd -ragged -offset indent
-.Ic return
-.Op Ar exitstatus
-.Ed
+.Pp
+.D1 Ic return Op Ar exitstatus
 .Pp
 It terminates the current executional scope, returning from the previous

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 05:29:10 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2E4CC16A41B; Sat,  8 Dec 2007 05:29:10 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D85E616A419
	for ; Sat,  8 Dec 2007 05:29:09 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C89D313C447
	for ; Sat,  8 Dec 2007 05:29:09 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB85T9AE049861
	for ; Sat, 8 Dec 2007 05:29:09 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB85T9ae049858
	for perforce@freebsd.org; Sat, 8 Dec 2007 05:29:09 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 8 Dec 2007 05:29:09 GMT
Message-Id: <200712080529.lB85T9ae049858@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130464 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 05:29:10 -0000

http://perforce.freebsd.org/chv.cgi?CH=130464

Change 130464 by kmacy@kmacy:storage:toestack on 2007/12/08 05:28:28

	print ddb info for sndptr

Affected files ...

.. //depot/projects/toestack/sys/kern/uipc_debug.c#2 edit

Differences ...

==== //depot/projects/toestack/sys/kern/uipc_debug.c#2 (text+ko) ====

@@ -392,8 +392,11 @@
 	db_printf("sb_mb: %p   ", sb->sb_mb);
 	db_printf("sb_mbtail: %p   ", sb->sb_mbtail);
 	db_printf("sb_lastrecord: %p\n", sb->sb_lastrecord);
+	db_print_indent(indent);
+	db_printf("sb_sndptr: %p\n", sb->sb_sndptr);
 
 	db_print_indent(indent);
+	db_printf("sb_sndptroff: %d   ", sb->sb_sndptroff);
 	db_printf("sb_cc: %d   ", sb->sb_cc);
 	db_printf("sb_hiwat: %d   ", sb->sb_hiwat);
 	db_printf("sb_mbcnt: %d   ", sb->sb_mbcnt);

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 05:32:13 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3ED9016A421; Sat,  8 Dec 2007 05:32: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 E6E3D16A41B
	for ; Sat,  8 Dec 2007 05:32:12 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D6B1E13C458
	for ; Sat,  8 Dec 2007 05:32:12 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB85WCd5050774
	for ; Sat, 8 Dec 2007 05:32:12 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB85WCqp050771
	for perforce@freebsd.org; Sat, 8 Dec 2007 05:32:12 GMT
	(envelope-from marcel@freebsd.org)
Date: Sat, 8 Dec 2007 05:32:12 GMT
Message-Id: <200712080532.lB85WCqp050771@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130465 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 05:32:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=130465

Change 130465 by marcel@marcel_xcllnt on 2007/12/08 05:31:51

	Preserve changes across the libpthread->libkse move.

Affected files ...

.. //depot/projects/ia64/lib/libkse/arch/ia64/include/atomic_ops.h#2 edit

Differences ...

==== //depot/projects/ia64/lib/libkse/arch/ia64/include/atomic_ops.h#2 (text+ko) ====

@@ -32,13 +32,13 @@
 static inline void
 atomic_swap_int(volatile int *dst, int val, int *res)
 {
-	__asm("xchg4	%0=[%2],%1" : "=r"(*res) : "r"(val), "r"(dst));
+	__asm __volatile("xchg4 %0=[%2],%1" : "=r"(*res) : "r"(val), "r"(dst));
 }
 
 static inline void
 atomic_swap_long(volatile long *dst, long val, long *res)
 {
-	__asm("xchg8	%0=[%2],%1" : "=r"(*res) : "r"(val), "r"(dst));
+	__asm __volatile("xchg8 %0=[%2],%1" : "=r"(*res) : "r"(val), "r"(dst));
 }
 
 #define	atomic_swap_ptr(d,v,r)		\

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 05:36:18 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1C60916A421; Sat,  8 Dec 2007 05:36: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 A7A9416A41A
	for ; Sat,  8 Dec 2007 05:36:17 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7F8BB13C459
	for ; Sat,  8 Dec 2007 05:36:17 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB85aH7t051344
	for ; Sat, 8 Dec 2007 05:36:17 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB85aHLi051341
	for perforce@freebsd.org; Sat, 8 Dec 2007 05:36:17 GMT
	(envelope-from marcel@freebsd.org)
Date: Sat, 8 Dec 2007 05:36:17 GMT
Message-Id: <200712080536.lB85aHLi051341@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130466 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 05:36:18 -0000

http://perforce.freebsd.org/chv.cgi?CH=130466

Change 130466 by marcel@marcel_xcllnt on 2007/12/08 05:35:43

	Add files that didn't seem to get branched.

Affected files ...

.. //depot/projects/ia64/contrib/pf/pflogd/pidfile.c#8 add
.. //depot/projects/ia64/contrib/pf/pflogd/pidfile.h#5 add
.. //depot/projects/ia64/libexec/rtld-aout/support.c#5 add
.. //depot/projects/ia64/libexec/rtld-aout/support.h#5 add

Differences ...

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 05:38:23 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A70C416A41A; Sat,  8 Dec 2007 05:38: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 E7BA216A418
	for ; Sat,  8 Dec 2007 05:38:22 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BF75513C457
	for ; Sat,  8 Dec 2007 05:38:22 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB85cJIJ051444
	for ; Sat, 8 Dec 2007 05:38:19 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB85cJfc051441
	for perforce@freebsd.org; Sat, 8 Dec 2007 05:38:19 GMT
	(envelope-from marcel@freebsd.org)
Date: Sat, 8 Dec 2007 05:38:19 GMT
Message-Id: <200712080538.lB85cJfc051441@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130467 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 05:38:23 -0000

http://perforce.freebsd.org/chv.cgi?CH=130467

Change 130467 by marcel@marcel_xcllnt on 2007/12/08 05:37:44

	$FreeBSD$ expansion

Affected files ...

.. //depot/projects/ia64/sys/geom/part/g_part_bsd.c#4 edit

Differences ...

==== //depot/projects/ia64/sys/geom/part/g_part_bsd.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/geom/part/g_part_bsd.c,v 1.1 2007/12/06 02:32:42 marcel Exp $");
 
 #include 
 #include 

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 06:58:15 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2ED2616A41B; Sat,  8 Dec 2007 06:58: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 C5F4016A417
	for ; Sat,  8 Dec 2007 06:58:14 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B340D13C43E
	for ; Sat,  8 Dec 2007 06:58:14 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB86wE9f064555
	for ; Sat, 8 Dec 2007 06:58:14 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB86w8Hm064552
	for perforce@freebsd.org; Sat, 8 Dec 2007 06:58:08 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 8 Dec 2007 06:58:08 GMT
Message-Id: <200712080658.lB86w8Hm064552@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 130474 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 06:58:15 -0000

http://perforce.freebsd.org/chv.cgi?CH=130474

Change 130474 by jb@jb_freebsd1 on 2007/12/08 06:57:11

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/book.sgml#4 integrate
.. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/translators.ent#3 integrate
.. //depot/projects/dtrace/doc/ru_RU.KOI8-R/man/man1/Makefile#2 integrate
.. //depot/projects/dtrace/doc/ru_RU.KOI8-R/man/man1/sh.1#1 branch
.. //depot/projects/dtrace/doc/ru_RU.KOI8-R/man/man8/gjournal.8#2 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml#13 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/audit/chapter.sgml#8 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/desktop/chapter.sgml#9 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/geom/chapter.sgml#9 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/jails/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml#10 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#19 integrate
.. //depot/projects/dtrace/src/ObsoleteFiles.inc#33 integrate
.. //depot/projects/dtrace/src/bin/sh/sh.1#9 integrate
.. //depot/projects/dtrace/src/contrib/amd/AUTHORS#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/BUGS#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/COPYING#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/FAQ#1 branch
.. //depot/projects/dtrace/src/contrib/amd/INSTALL#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/NEWS#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/README.attrcache#1 branch
.. //depot/projects/dtrace/src/contrib/amd/README.ldap#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/am_ops.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/amd.8#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/amd.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/amd.h#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/amfs_auto.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/amfs_direct.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/amfs_error.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/amfs_generic.c#1 branch
.. //depot/projects/dtrace/src/contrib/amd/amd/amfs_host.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/amfs_inherit.c#4 delete
.. //depot/projects/dtrace/src/contrib/amd/amd/amfs_link.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/amfs_linkx.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/amfs_nfsl.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/amfs_nfsx.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/amfs_program.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/amfs_root.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/amfs_toplvl.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/amfs_union.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/amq_subr.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/amq_svc.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/autil.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/clock.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/conf.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/conf_parse.y#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/conf_tok.l#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/get_args.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/info_exec.c#1 branch
.. //depot/projects/dtrace/src/contrib/amd/amd/info_file.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/info_hesiod.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/info_ldap.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/info_ndbm.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/info_nis.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/info_nisplus.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/info_passwd.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/info_union.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/map.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/mapc.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/mntfs.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/nfs_prot_svc.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/nfs_start.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/nfs_subr.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/ops_TEMPLATE.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/ops_cachefs.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/ops_cdfs.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/ops_efs.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/ops_lofs.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/ops_mfs.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/ops_nfs.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/ops_nfs3.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/ops_nullfs.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/ops_pcfs.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/ops_tfs.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/ops_tmpfs.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/ops_ufs.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/ops_umapfs.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/ops_unionfs.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/ops_xfs.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/opts.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/readdir.c#1 branch
.. //depot/projects/dtrace/src/contrib/amd/amd/restart.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/rpc_fwd.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/sched.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/srvr_amfs_auto.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amd/srvr_nfs.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amq/amq.8#5 integrate
.. //depot/projects/dtrace/src/contrib/amd/amq/amq.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amq/amq.h#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amq/amq_clnt.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amq/amq_xdr.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amq/pawd.1#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/amq/pawd.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/aux_conf.h.in#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/bootstrap#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/conf/checkmount/checkmount_bsd44.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/conf/mtab/mtab_bsd.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/conf/transp/transp_sockets.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/conf/trap/trap_default.h#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/conf/umount/umount_bsd44.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/doc/am-utils.texi#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/doc/stamp-vti#1 branch
.. //depot/projects/dtrace/src/contrib/amd/doc/texinfo.tex#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/doc/version.texi#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/fixmount/fixmount.8#5 integrate
.. //depot/projects/dtrace/src/contrib/amd/fixmount/fixmount.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/fsinfo/fsi_analyze.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/fsinfo/fsi_data.h#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/fsinfo/fsi_dict.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/fsinfo/fsi_gram.y#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/fsinfo/fsi_lex.l#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/fsinfo/fsi_util.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/fsinfo/fsinfo.8#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/fsinfo/fsinfo.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/fsinfo/fsinfo.h#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/fsinfo/wr_atab.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/fsinfo/wr_bparam.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/fsinfo/wr_dumpset.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/fsinfo/wr_exportfs.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/fsinfo/wr_fstab.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/hlfsd/hlfsd.8#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/hlfsd/hlfsd.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/hlfsd/hlfsd.h#5 integrate
.. //depot/projects/dtrace/src/contrib/amd/hlfsd/homedir.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/hlfsd/nfs_prot_svc.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/hlfsd/stubs.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/include/am_compat.h#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/include/am_defs.h#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/include/am_utils.h#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/include/am_xdr_func.h#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/include/amq_defs.h#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/include/mount_headers1.h#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/include/mount_headers2.h#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/ldap-id.ms#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/ldap.schema#1 branch
.. //depot/projects/dtrace/src/contrib/amd/libamu/alloca.c#4 delete
.. //depot/projects/dtrace/src/contrib/amd/libamu/amu.h#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/libamu/hasmntopt.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/libamu/misc_rpc.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/libamu/mount_fs.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/libamu/mtab.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/libamu/nfs_prot_xdr.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/libamu/strerror.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/libamu/strutil.c#1 branch
.. //depot/projects/dtrace/src/contrib/amd/libamu/util.c#4 delete
.. //depot/projects/dtrace/src/contrib/amd/libamu/wire.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/libamu/xdr_func.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/libamu/xutil.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/m4/GNUmakefile#4 delete
.. //depot/projects/dtrace/src/contrib/amd/m4/amdgrep#4 delete
.. //depot/projects/dtrace/src/contrib/amd/m4/amindent#4 delete
.. //depot/projects/dtrace/src/contrib/amd/m4/autopat#4 delete
.. //depot/projects/dtrace/src/contrib/amd/m4/chop-aclocal.pl#4 delete
.. //depot/projects/dtrace/src/contrib/amd/m4/copy-if-newbig#4 delete
.. //depot/projects/dtrace/src/contrib/amd/m4/macros/HEADER#4 delete
.. //depot/projects/dtrace/src/contrib/amd/m4/macros/TRAILER#4 delete
.. //depot/projects/dtrace/src/contrib/amd/m4/mk-aclocal#4 delete
.. //depot/projects/dtrace/src/contrib/amd/m4/mkconf#4 delete
.. //depot/projects/dtrace/src/contrib/amd/m4/rmtspc#4 delete
.. //depot/projects/dtrace/src/contrib/amd/m4/update_build_version#4 delete
.. //depot/projects/dtrace/src/contrib/amd/mk-amd-map/mk-amd-map.8#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/mk-amd-map/mk-amd-map.c#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/scripts/am-eject.in#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/scripts/amd.conf-sample#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/scripts/amd.conf.5#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/scripts/amd2ldif.in#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/scripts/amd2sun.in#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/scripts/automount2amd.8#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/scripts/automount2amd.in#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/scripts/ctl-amd.in#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/scripts/ctl-hlfsd.in#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/scripts/expn.1#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/scripts/expn.in#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/scripts/fix-amd-map.in#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/scripts/fixrmtab.in#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/scripts/redhat-ctl-amd.in#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/scripts/test-attrcache.in#1 branch
.. //depot/projects/dtrace/src/contrib/amd/scripts/wait4amd.in#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/scripts/wait4amd2die.in#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/tasks#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/vers.m4#1 branch
.. //depot/projects/dtrace/src/contrib/amd/wire-test/wire-test.8#4 integrate
.. //depot/projects/dtrace/src/contrib/amd/wire-test/wire-test.c#4 integrate
.. //depot/projects/dtrace/src/games/fortune/datfiles/Makefile#5 integrate
.. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#23 integrate
.. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes-o.real#7 integrate
.. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes-o.sp.ok#4 integrate
.. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes.sp.ok#5 integrate
.. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes2-o#5 delete
.. //depot/projects/dtrace/src/games/fortune/datfiles/freebsd-tips#6 integrate
.. //depot/projects/dtrace/src/games/fortune/datfiles/freebsd-tips.sp.ok#1 branch
.. //depot/projects/dtrace/src/games/fortune/datfiles/limerick#6 integrate
.. //depot/projects/dtrace/src/games/fortune/datfiles/limerick.sp.ok#1 branch
.. //depot/projects/dtrace/src/games/fortune/datfiles/murphy#4 integrate
.. //depot/projects/dtrace/src/games/fortune/datfiles/murphy-o#4 integrate
.. //depot/projects/dtrace/src/games/fortune/datfiles/murphy.sp.ok#1 branch
.. //depot/projects/dtrace/src/games/fortune/datfiles/startrek#5 integrate
.. //depot/projects/dtrace/src/games/fortune/datfiles/zippy#5 integrate
.. //depot/projects/dtrace/src/games/fortune/datfiles/zippy.sp.ok#4 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_kern.c#5 integrate
.. //depot/projects/dtrace/src/lib/libpmc/libpmc.c#5 integrate
.. //depot/projects/dtrace/src/release/fixit.profile#4 integrate
.. //depot/projects/dtrace/src/sbin/dhclient/dispatch.c#4 integrate
.. //depot/projects/dtrace/src/share/examples/cvsup/refuse#4 integrate
.. //depot/projects/dtrace/src/share/examples/cvsup/refuse.README#4 integrate
.. //depot/projects/dtrace/src/share/man/man4/aac.4#8 integrate
.. //depot/projects/dtrace/src/share/man/man4/hwpmc.4#10 integrate
.. //depot/projects/dtrace/src/share/man/man4/msk.4#4 integrate
.. //depot/projects/dtrace/src/share/mk/bsd.subdir.mk#4 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/exception.S#6 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/trap.c#18 integrate
.. //depot/projects/dtrace/src/sys/amd64/include/pmc_mdep.h#4 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#23 integrate
.. //depot/projects/dtrace/src/sys/arm/include/pmc_mdep.h#4 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32.h#6 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_ipc.h#1 branch
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_misc.c#12 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_proto.h#17 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscall.h#17 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscalls.c#17 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_sysent.c#17 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/syscalls.master#17 integrate
.. //depot/projects/dtrace/src/sys/conf/Makefile.amd64#5 integrate
.. //depot/projects/dtrace/src/sys/conf/NOTES#35 integrate
.. //depot/projects/dtrace/src/sys/conf/files#56 integrate
.. //depot/projects/dtrace/src/sys/conf/options#33 integrate
.. //depot/projects/dtrace/src/sys/dev/aac/aac.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/aac/aac_cam.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/aac/aac_pci.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/aac/aacreg.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/aac/aacvar.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#22 integrate
.. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_amd.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_arm.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_ia64.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_logging.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_mod.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_piv.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_powerpc.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_ppro.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_sparc64.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_x86.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndis.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/ipw/if_ipw.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/iwi/if_iwi.c#14 integrate
.. //depot/projects/dtrace/src/sys/dev/msk/if_msk.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/msk/if_mskreg.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/re/if_re.c#13 integrate
.. //depot/projects/dtrace/src/sys/dev/sio/sio.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/utopia/utopia.c#5 integrate
.. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_subr.c#3 integrate
.. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_vfsops.c#5 integrate
.. //depot/projects/dtrace/src/sys/geom/geom_bsd.c#4 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part.c#4 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part.h#4 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part_bsd.c#1 branch
.. //depot/projects/dtrace/src/sys/i386/bios/apm.c#7 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/exception.s#12 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/trap.c#21 integrate
.. //depot/projects/dtrace/src/sys/i386/include/pmc_mdep.h#4 integrate
.. //depot/projects/dtrace/src/sys/ia64/conf/DEFAULTS#11 integrate
.. //depot/projects/dtrace/src/sys/ia64/include/pmc_mdep.h#4 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_mbuf.c#12 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_module.c#6 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_pmc.c#4 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_trap.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#23 integrate
.. //depot/projects/dtrace/src/sys/net/if_var.h#7 integrate
.. //depot/projects/dtrace/src/sys/net/route.c#9 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211.c#10 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_output.c#12 integrate
.. //depot/projects/dtrace/src/sys/netinet/in_pcb.h#7 integrate
.. //depot/projects/dtrace/src/sys/netinet/libalias/alias_util.c#7 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_output.c#11 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_usrreq.c#12 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctputil.c#15 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_syncache.c#14 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_var.h#6 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6.c#11 integrate
.. //depot/projects/dtrace/src/sys/pci/if_rlreg.h#10 integrate
.. //depot/projects/dtrace/src/sys/powerpc/include/pmc_mdep.h#4 integrate
.. //depot/projects/dtrace/src/sys/sparc64/include/pmc_mdep.h#4 integrate
.. //depot/projects/dtrace/src/sys/sun4v/include/pmc_mdep.h#5 integrate
.. //depot/projects/dtrace/src/sys/sys/disklabel.h#5 integrate
.. //depot/projects/dtrace/src/sys/sys/param.h#27 integrate
.. //depot/projects/dtrace/src/sys/sys/pmc.h#5 integrate
.. //depot/projects/dtrace/src/sys/sys/pmckern.h#4 integrate
.. //depot/projects/dtrace/src/sys/sys/pmclog.h#5 integrate
.. //depot/projects/dtrace/src/sys/sys/ucred.h#5 integrate
.. //depot/projects/dtrace/src/usr.bin/kdump/kdump.c#10 integrate
.. //depot/projects/dtrace/src/usr.sbin/Makefile#20 integrate
.. //depot/projects/dtrace/src/usr.sbin/amd/amd/Makefile#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/amd/fsinfo/Makefile#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/amd/include/amu_autofs_prot.h#1 branch
.. //depot/projects/dtrace/src/usr.sbin/amd/include/aux_conf.h#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/amd/include/build_version.h#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/amd/include/config.h#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/amd/include/newvers.sh#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/amd/libamu/Makefile#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/amd/mk-amd-map/Makefile#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/mtree/verify.c#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/pmcstat/Makefile#6 integrate
.. //depot/projects/dtrace/src/usr.sbin/pmcstat/pmcstat.8#6 integrate
.. //depot/projects/dtrace/src/usr.sbin/pmcstat/pmcstat.c#6 integrate
.. //depot/projects/dtrace/src/usr.sbin/pmcstat/pmcstat.h#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/pmcstat/pmcstat_log.c#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/syslogd/syslogd.c#6 integrate
.. //depot/projects/dtrace/www/en/releases/6.3R/schedule.sgml#3 integrate
.. //depot/projects/dtrace/www/en/releases/7.0R/schedule.sgml#8 integrate

Differences ...

==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/book.sgml#4 (text+ko) ====

@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/book.sgml,v 1.30 2007/07/08 12:10:18 blackend Exp $
+     $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/book.sgml,v 1.31 2007/12/05 12:20:31 blackend Exp $
      Original revision: 1.171 manque 1.157 et 1.158
 -->
 
@@ -151,15 +151,14 @@
         faire des
         recherches dans le Manuel.
 
-      N.d.T.: La version française est publiée sur le
-        serveur World Wide Web du groupe de
-        traduction en langue française de la documentation de
-        FreeBSD.
+      N.d.T.: Contactez &a.blackend; si vous voulez collaborer à
+        la traduction.
+
+      Version française de &a.blackend; avec la
+	collaboration de &a.fr.delfly;
 
-      N.d.T.: Contactez la &a.fr-doc; si vous voulez collaborer à
-        la traduction.
-	&trans.a.fonvieille;
-	Première version de &a.fr.haby;
+      Première version de
+	&a.fr.haby;
     
   
 

==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml#3 (text+ko) ====

@@ -2,50 +2,1783 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml,v 1.3 2002/07/29 17:53:40 blackend Exp $
-     $Id: chapter.sgml,v 1.1 2002/07/14 10:20:33 marc Exp $
+     $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml,v 1.4 2007/12/05 12:21:50 blackend Exp $
+     Original revision: 1.96
 -->
 
 
-  Printing ** Traduction en Cours **
+  
+    
+      
+	Sean
+	Kelly
+	Contribution de 
+      
+      
+    
+
+    
+      
+	Jim
+	Mock
+	Restructuré et mis à jour par 
+	
+      
+    
+  
+
+  Imprimer
+  &trans.a.delfly;
 
-  
+  
     Synopsis
-    
+
+    gestionnaire d'impression
+      LPD
+    imprimer
+
+    &os; peut être utilisé pour imprimer sur une
+      grande variété d'imprimantes, depuis la plus
+      ancienne des imprimantes matricielles jusqu'aux toutes
+      dernières imprimantes laser, en passant par tout ce qui
+      peut exister entre les deux, et vous permet d'obtenir des
+      impressions de haute qualité avec les programmes que vous
+      exécutez.
+
+    Il est également possible de configurer &os; pour
+      qu'il fasse office de serveur d'impression sur un réseau;
+      de cette manière &os; peut recevoir des travaux
+      d'impression (jobs) en provenance de
+      différents ordinateurs, comprenant d'autres machines sous
+      &os; et des machines sous &windows; ou &macos;.  &os;
+      s'assurera à ce qu'un seul travail d'impression ne soit
+      imprimé à la fois, et pourra tenir des
+      statistiques sur les utilisateurs et les machines lançant
+      le plus d'impressions, produire des pages
+      d'en-têtes pour distinguer les impressions
+      de chacun, et plus encore.
+
+    Après la lecture de ce chapitre, vous saurez:
+
+    
+      
+	Comment configurer le gestionnaire d'impression de
+	  &os;
+      
+
+      
+	Comment installer des filtres d'impression, pour
+	  gérer des travaux d'impression particuliers de
+	  manière différente, ce qui inclut la
+	  transformation de documents entrants en un format que vos
+	  imprimantes comprennent.
+      
+
+      
+	Comment inclure des en-têtes ou des pages
+	  bannière dans vos impressions.
+      
+
+      
+	Comment imprimer en utilisant des imprimantes
+	  connectées à d'autres ordinateurs.
+	
+
+      
+	Comment imprimer en utilisant des imprimantes
+	  connectées directement au réseau.
+      
+
+      
+	Comment gérer des restrictions d'impression,
+	  notamment comment limiter la taille des travaux
+	  d'impression, et empêcher certains utilisateurs
+	  d'imprimer.
+      
+
+      
+	Comment tenir des statistiques d'impression, et rendre
+	  compte de l'utilisation de l'imprimante.
+      
+
+      
+	Comment résoudre les problèmes
+	  d'impression.
+      
+    
+
+    Avant de lire ce chapitre, vous devriez:
+
+    
+      
+	Savoir comment configurer et installer un nouveau noyau
+	  ().
+      
+    
   
 
   
     Introduction
-    
+
+    Afin d'utiliser des imprimantes avec &os;, vous avez la
+      possibilité de les paramétrer pour qu'elles
+      utilisent le gestionnaire d'impression de Berkeley,
+      également connu sous le nom de gestionnaire d'impression
+      LPD, ou tout simplement
+      LPD.  C'est le système
+      contrôle d'imprimante par défaut de &os;.  Ce
+      chapitre présente LPD et vous
+      assistera tout au long de sa configuration.
+
+    Si vous connaissez déjà
+      LPD ou un autre système de
+      gestion des impressions, vous pouvez directement vous rendre
+      à la section Paramétrage de
+      base.
+
+    LPD contrôle tout ce qui
+      relève des imprimantes.  Il est
+      responsable de plusieurs tâches:
+
+    
+      
+	Il contrôle l'accès aux imprimantes
+	  directement connectées au système ainsi
+	  qu'à celles connectées à d'autres
+	  machines via le réseau.
+      
+
+      travaux d'impression
+
+      
+	Il permet aux utilisateurs de soumettre des fichiers
+	  à imprimer; ces requêtes sont connues sous le
+	  nom de travaux.
+      
+
+      
+	Il empêche l'accès simultané de
+	  plusieurs utilisateurs à une même imprimante,
+	  en gérant une queue pour chaque
+	  imprimante.
+      
+
+      
+	Il peut produire des pages
+	  d'en-tête (également connues sous le
+	  nom de pages bannières ou encore
+	  cartouches) afin que les utilisateurs
+	  puissent facilement retrouver dans une pile d'impressions
+	  celles correspondant aux travaux qu'ils ont soumis.
+      
+
+      
+	Il s'occupe de paramétrer les communications
+	  lorsque les imprimantes sont connectées via un port
+	  série.
+      
+
+      
+	Il peut transmettre des travaux par réseau
+	  à un gestionnaire d'impression
+	  LPD situé sur une autre
+	  machine.
+      
+
+      
+	Il peut appliquer des filtres spéciaux afin
+	  d'assurer le formatage des travaux en fonction des
+	  différents langages et caractéristiques des
+	  imprimantes.
+      
+
+      
+	Il peut comptabiliser l'utilisation de
+	  l'imprimante.
+      
+    
+
+    Vous pouvez, au travers d'un fichier de configuration
+      (/etc/printcap) et en fournissant les
+      programmes de filtres spéciaux, faire exécuter par
+      LPD tout ou partie des tâches
+      mentionnées ci-dessus sur une grande
+      variété de modèles d'imprimantes.
+
+    
+      Pourquoi vous devriez utiliser le gestionnaire
+	d'impression
+
+      Si vous êtes l'unique utilisateur de votre
+	système, vous vous demandez sans doute pourquoi il vous
+	faudrait vous préoccuper du gestionnaire d'impression,
+	alors que vous n'avez pas besoin de contrôle
+	d'accès, de pages d'en-tête ni de statistiques
+	relatives à l'utilisation de l'imprimante.  Quand bien
+	même il est possible de mettre en oeuvre l'accès
+	direct à l'imprimante, vous devriez tout de même
+	utiliser le gestionnaire d'impression, parce que:
+
+      
+        
+	  LPD imprime les travaux en
+	    tâche de fond: vous n'êtes pas obligé
+	    d'attendre que les données soient passées
+	    à l'imprimante.
+	
+
+	&tex;
+
+	
+	  LPD peut commodément
+	    se charger d'appliquer des filtres à un travail
+	    pour adjoindre une en-tête contenant la date et
+	    l'heure, ou convertir un fichier au format particulier
+	    (comme un fichier DVI &tex;) en un format que l'imprimante
+	    comprenne.  Ainsi, vous n'aurez pas à vous charger
+	    de ces manipulations à la main.
+	
+
+	
+	  Beaucoup d'applications, tant libres que commerciales,
+	    fournissant une fonctionnalité d'impression
+	    s'attendent généralement à traiter
+	    avec le gestionnaire d'impression.  En le mettant en
+	    oeuvre, vous vous faciliterez le support des autres
+	    applications que vous pourriez ajouter plus tard, ou que
+	    vous avez déjà installées.
+	
+      
+    
   
 
   
-    Basic Setup
-    
+    Configuration de base
+
+    Pour utiliser des imprimantes avec le gestionnaire
+      d'impression, il vous faudra configurer à la fois la
+      partie matérielle (c'est à dire les imprimantes)
+      et la partie logicielle (c'est à dire
+      LPD).  Ce document présente
+      deux niveaux de configuration:
+
+    
+      
+	La section Configuration
+	  simple de l'imprimante vous apprendra à
+	  connecter une imprimante, à renseigner
+	  LPD sur la façon dont il
+	  doit communiquer avec elle, et à imprimer de simples
+	  fichiers textes.
+      
+
+      
+	La section Configuration avancée de
+	  l'imprimante vous apprendra à imprimer
+	  différents formats de fichiers, des pages
+	  d'en-tête, par l'intermédiaire d'un
+	  réseau, à contrôler l'accès aux
+	  imprimantes, et comptabiliser leur utilisation.
+      
+    
+
+    
+      Configuration simple de l'imprimante
+
+      Cette section vous apprendra à configurer
+	l'imprimante et LPD.  Elle
+	présente les bases:
+
+      
+        
+	  La section Configuration
+	    matérielle donne des indications sur la
+	    façon de connecter l'imprimante à l'un des
+	    ports de votre ordinateur.
+	
+
+	
+	  La section Configuration
+	    logicielle montre comment renseigner le fichier de
+	    configuration du gestionnaire d'impression
+	    LPD
+	    (/etc/printcap).
+	
+      
+
+      Si vous mettez en oeuvre une imprimante
+	réceptionnant les données à imprimer via
+	un protocole réseau plutôt que par les interfaces
+	locales de l'ordinateur, lisez la section Imprimantes avec
+	des interfaces utilisant des flux réseau.
+
+      Bien que cette section soit intitulée
+	Configuration simple de l'imprimante, elle
+	s'avère en réalité plutôt complexe.
+	La partie la plus difficile consiste à faire
+	fonctionner l'imprimante avec votre ordinateur et
+	LPD.  Les options avancées
+	telles les pages d'en-tête ou les statistiques sont
+	relativement faciles à mettre en oeuvre une fois que
+	l'imprimante fonctionne.
+
+      
+        Configuration matérielle
+
+	Cette section détaille les différentes
+	  manières de connecter une imprimante à votre
+	  PC.  Elle discute les types de ports et de câbles, et
+	  de la configuration noyau dont vous pourriez avoir besoin
+	  afin que &os; puisse communiquer avec l'imprimante.
+
+	Si vous avez déjà connecté votre
+	  imprimante et réussi à imprimer sous un autre
+	  système d'exploitation, vous pouvez probablement
+	  passer à la section Configuration
+	  logicielle.
+
+	
+	  Les ports et les câbles
+
+	  Les imprimantes pour PC vendues aujourd'hui sont en
+	    général pourvues d'une ou plusieurs des
+	    trois interfaces suivantes:
+
+	  
+	   
+	     imprimantes
+	     série
+	   
+
+	   
+	     Les interfaces série,
+	       également connues sous les noms RS-232 ou ports
+	       COM, utilisent un port série sur votre
+	       ordinateur pour envoyer des données à
+	       l'imprimante.  Les interfaces série sont
+	       courantes, dans l'industrie informatique, et les
+	       câbles sont à la fois disponibles et
+	       faciles à réaliser.  Elles
+	       réclament parfois des câbles
+	       spéciaux et peuvent nécessiter le
+	       paramétrage d'options de communication assez
+	       complexes.  La plupart des ports série PC ont
+	       une vitesse de transmission maximale de 115200 bps, ce
+	       qui rend l'impression de travaux comportant beaucoup de
+	       graphismes malaisée.
+	   
+
+	   
+	     imprimantes
+	     parallèle
+	   
+
+	   
+	     Les interfaces
+	       parallèles utilisent un
+	       port parallèle sur votre ordinateur pour envoyer
+	       des données à l'imprimante.  Les
+	       interfaces parallèles sont courantes dans
+	       l'industrie informatique et plus rapides que les
+	       interfaces série RS-232.  Les câbles sont
+	       disponibles mais sont moins faciles à fabriquer
+	       à la main. En général, il n'y a
+	       aucune option de communication à
+	       paramétrer avec ces interfaces, ce qui rend leur
+	       configuration particulièrement simple.
+
+	     
+	       centronics
+	       imprimantes parallèle
+	     
+
+	     Les interfaces parallèles sont parfois
+	       appelées Centronics, nom
+	       tiré du type de connecteur de
+	       l'imprimante
+	   
+
+	   
+	     imprimantes
+	     USB
+	   
+
+	   
+	     Les interfaces USB, tenant leur nom de
+	       Universal Serial Bus, ou Bus
+	       Série Universel, s'avèrent plus
+	       véloces encore que les interfaces
+	       parallèles ou série RS-232.  Les
+	       câbles sont simples et peu onéreux. L'USB
+	       surpasse les interfaces série RS-232 et
+	       parallèles pour l'impression, mais son support
+	       par les systèmes &unix; n'est pas aussi bon.
+	       Une façon d'éviter ce problème est
+	       d'acheter une imprimante qui dispose à la fois
+	       d'une interface USB et d'une interface
+	       parallèle, comme beaucoup de
+	       modèles.
+	   
+	  
+
+	  En règle générale, les interfaces
+	    parallèles n'offrent qu'une communication
+	    unidirectionnelle (de l'ordinateur vers l'imprimante)
+	    alors que les interfaces série et USB permettent un
+	    échange bidirectionnel.  Les imprimantes et ports
+	    parallèles plus récents (EPP et ECP) peuvent
+	    communiquer dans les deux sens sous &os; lorsque l'on a
+	    recourt à un câble conforme à la norme
+	    IEEE-1284.
+
+	  PostScript
+
+	  La communication bidirectionnelle avec l'imprimante en
+	    utilisant un port parallèle se fait en
+	    général de l'une des deux manières
+	    suivantes.  La première utilise un pilote
+	    d'imprimante compilé pour &os; comprenant le
+	    langage propriétaire de l'imprimante.  C'est
+	    couramment le cas des imprimantes jet d'encre et cela peut
+	    être utilisé pour retourner les niveaux
+	    d'encre et autres informations d'état.  La seconde
+	    méthode est employée lorsque l'imprimante
+	    supporte &postscript;.
+
+	  Les travaux &postscript; sont en fait des programmes
+	    envoyés à l'imprimante.  Ils ne
+	    génèrent pas nécessairement de sortie
+	    papier et peuvent retourner leurs résultats
+	    directement à l'ordinateur.  &postscript; utilise
+	    aussi la communication bidirectionnelle pour avertir
+	    l'ordinateur de problèmes, comme des erreurs dans
+	    le programme &postscript; ou des bourrages papier.  Vos
+	    utilisateurs apprécieraient certainement de telles
+	    informations.  De surcroît, la meilleure
+	    façon de tenir des statistiques sérieusement
+	    avec une imprimante &postscript; nécessite la
+	    communication bidirectionnelle: on demande à
+	    l'imprimante quel est son compteur de pages (combien en
+	    a-t-elle imprimées depuis sa fabrication), puis on
+	    lui envoie le travail de l'utilisateur, enfin on lui
+	    redemande son compteur de pages.  La différence
+	    entre les deux valeurs donne la consommation de papier que
+	    vous pouvez attribuer à cet utilisateur.
+	
+
+	
+	  Les ports parallèles
+
+	  Pour raccorder une imprimante utilisant une interface
+	    parallèle, branchez le câble Centronics sur
+	    l'imprimante et sur l'ordinateur.  Les instructions
+	    accompagnant l'imprimante, l'ordinateur, ou les deux,
+	    devraient parfaitement vous renseigner.
+
+	  Souvenez-vous du port parallèle que vous avez
+	    utilisé sur l'ordinateur.  Pour &os;, le premier se
+	    nomme ppc0; le deuxième,
+	    ppc1, et ainsi de suite.  Le nom du
+	    fichier spécial de périphérique de
+	    l'imprimante suit les mêmes règles:
+	    /dev/lpt0 pour celle connectée
+	    sur le premier port parallèle, etc.
+	
+
+	
+	  Les ports série
+
+	  Pour raccorder une imprimante utilisant une interface
+	    série, branchez le câble série
+	    adéquat sur l'imprimante et sur l'ordinateur.  Les
+	    instructions accompagnant l'imprimante, l'ordinateur, ou
+	    les deux, devraient parfaitement vous renseigner.
+
+	  Si vous n'êtes pas sûr de savoir quel est
+	    le bon câble, voici ce que vous pouvez
+	    essayer:
+
+	  
+	    
+	      Un câble modem relie
+		chacune des broches du connecteur depuis l'une des
+		extrémités du câble directement
+		à la broche lui correspondant dans le
+		connecteur de l'autre extrémité.  Ce
+		type de câble est également connu sous le
+		nom de câble DTE-to-DCE.
+	    
+
+	    câble
+	      null-modem
+
+	    
+	      Un câble null-modem
+		relie certaines des broches directement, en
+		intervertit d'autres (par exemple,
+		émission de données et
+		réception de données), et
+		en court-circuite d'autres en interne sur chacun des
+		sertissages des connecteurs.  Ce type de câble
+		est également connu sous le nom de câble
+		DTE-to-DTE.
+	    
+
+	    
+	      Un câble série pour
+		imprimante, requis par certaines
+		imprimantes peu conventionnelles, ressemble au
+		câble null-modem, à ceci près
+		qu'il envoie certains signaux à l'autre
+		extrémité au lieu de les court-circuiter
+		en interne.
+	    
+	  
+
+	  vitesse de
+	    transmission
+	  parité
+	  protocole de contrôle de
+	    flux
+
+	  Vous devriez également définir les
+	    paramètres de communication pour l'imprimante,
+	    d'ordinaire en utilisant les contrôles sur la face
+	    avant ou les commutateurs sur l'imprimante.  Choisissez la
+	    valeur la plus élevée de
+	    bps (bits par seconde, encore
+	    appelés vitesse de transmission)
+	    autorisée conjointement par votre ordinateur et
+	    votre imprimante.  Choisissez 7 ou 8 bits de
+	    données; aucun contrôle de parité ou
+	    un bit de parité paire ou impaire; et 1 ou 2 bits
+	    d'arrêt.  Choisissez également un protocole
+	    de contrôle de flux: soit aucun, soit XON/XOFF
+	    (également appelé in-band, ou
+	    encore contrôle logiciel).  Retenez
+	    ces paramètres pour la configuration logicielle,
+	    dans la section qui suit.
+	
+      
+
+      
+        Configuration logicielle
+
+	Cette section détaille la configuration
+	  logicielle nécessaire pour imprimer sous &os; avec le
+	  gestionnaire d'impression
+	  LPD.
+
+	Voici un aperçu des étapes à
+	  suivre:
+
+	
+	  
+	    Configurez le noyau, si nécessaire, pour
+	      utiliser le port sur lequel vous raccorderez votre
+	      imprimante; la section Configurer le noyau de
+	      &os; vous donnera la marche à
+	      suivre.
+	  
+
+	  
+	    Paramétrez le mode de communication du port
+	      parallèle si vous utilisez une imprimante de ce
+	      type; la section Paramétrer
+	      le mode de communication du port parallèle
+	      vous donnera les détails.
+	  
+
+	  
+	    Configurez LPD pour qu'il
+	      communique avec l'imprimante en renseignant le fichier
+	      /etc/printcap.  Vous apprendrez
+	      comment faire un peu plus loin dans ce chapitre.
+	  
+	
+
+	
+	  Configuration du noyau
+
+	  Le noyau du système d'exploitation est
+	    compilé avec le support d'un certain ensemble de
+	    périphériques.  Les interfaces série
+	    ou parallèle de votre imprimante en font partie.
+	    De ce fait, vous pourriez avoir à ajouter le
+	    support d'un port série ou parallèle
+	    supplémentaire si votre noyau n'a pas
+	    déjà été configuré en
+	    ce sens.
+
+	  Pour savoir si le support d'une interface série
+	    est activé dans le noyau que vous êtes en
+	    train d'utiliser, entrez:
+
+	  &prompt.root; grep sioN /var/run/dmesg.boot
+
+	  Où N
+	    représente le numéro du port série,
+	    en commençant à zéro.  Si vous
+	    obtenez un affichage similaire à:
+
+	  sio2 at port 0x3e8-0x3ef irq 5 on isa sio2: type 16550A

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 10:30:01 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4C6B916A468; Sat,  8 Dec 2007 10:30: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 F058816A420
	for ; Sat,  8 Dec 2007 10:30:00 +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 DAB5B13C4D1
	for ; Sat,  8 Dec 2007 10:30:00 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB8ATx2D026112
	for ; Sat, 8 Dec 2007 10:29:59 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB8ATxfx026109
	for perforce@freebsd.org; Sat, 8 Dec 2007 10:29:59 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 8 Dec 2007 10:29:59 GMT
Message-Id: <200712081029.lB8ATxfx026109@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 130482 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 10:30:01 -0000

http://perforce.freebsd.org/chv.cgi?CH=130482

Change 130482 by hselasky@hselasky_laptop001 on 2007/12/08 10:29:20

	
	This commit is related to USB device side support.
	
	o Move "struct usb_temp_setup" into "usb_subr.h" .
	o The scratch field in "struct usbd_device" is now a union.
	o Added global functions to "usb_template.c" that are used
	  for entry points to building and accessing USB descriptors.
	o Added "usb_template.c" to "conf/files" and the USB module.

Affected files ...

.. //depot/projects/usb/src/sys/conf/files#20 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#68 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#67 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_template.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_template.h#3 edit
.. //depot/projects/usb/src/sys/modules/usb/Makefile#4 edit

Differences ...

==== //depot/projects/usb/src/sys/conf/files#20 (text+ko) ====

@@ -1145,6 +1145,7 @@
 dev/usb/usb_quirks.c		optional usb
 dev/usb/usb_requests.c		optional usb
 dev/usb/usb_subr.c		optional usb
+dev/usb/usb_template.c		optional usb
 dev/usb/usb_transfer.c		optional usb
 dev/usb/usb_compat_linux.c	optional usb
 dev/usb/uscanner.c		optional uscanner

==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#68 (text+ko) ====

@@ -1507,24 +1507,24 @@
 
 	/* get serial number string */
 	err = usbreq_get_string_any
-	    (udev, &usb_global_lock, udev->scratch, sizeof(udev->scratch),
-	    udev->ddesc.iSerialNumber);
+	    (udev, &usb_global_lock, udev->scratch[0].data,
+	    sizeof(udev->scratch), udev->ddesc.iSerialNumber);
 
-	strlcpy(udev->serial, udev->scratch, sizeof(udev->serial));
+	strlcpy(udev->serial, udev->scratch[0].data, sizeof(udev->serial));
 
 	/* get manufacturer string */
 	err = usbreq_get_string_any
-	    (udev, &usb_global_lock, udev->scratch, sizeof(udev->scratch),
-	    udev->ddesc.iManufacturer);
+	    (udev, &usb_global_lock, udev->scratch[0].data,
+	    sizeof(udev->scratch), udev->ddesc.iManufacturer);
 
-	strlcpy(udev->manufacturer, udev->scratch, sizeof(udev->manufacturer));
+	strlcpy(udev->manufacturer, udev->scratch[0].data, sizeof(udev->manufacturer));
 
 	/* get product string */
 	err = usbreq_get_string_any
-	    (udev, &usb_global_lock, udev->scratch, sizeof(udev->scratch),
-	    udev->ddesc.iProduct);
+	    (udev, &usb_global_lock, udev->scratch[0].data,
+	    sizeof(udev->scratch), udev->ddesc.iProduct);
 
-	strlcpy(udev->product, udev->scratch, sizeof(udev->product));
+	strlcpy(udev->product, udev->scratch[0].data, sizeof(udev->product));
 
 	/* finish up all the strings */
 	usbd_finish_vp_info(udev);
@@ -1655,6 +1655,8 @@
 	}
 	usbd_transfer_unsetup(udev->default_xfer, 1);
 
+	usbd_temp_unsetup(udev);
+
 	sx_destroy(udev->default_sx);
 
 	mtx_destroy(udev->default_mtx);
@@ -1740,9 +1742,9 @@
 void
 usbd_set_desc(device_t dev, struct usbd_device *udev)
 {
-	usbd_devinfo(udev, udev->scratch, sizeof(udev->scratch));
-	device_set_desc_copy(dev, udev->scratch);
-	device_printf(dev, "<%s> on %s\n", udev->scratch,
+	usbd_devinfo(udev, udev->scratch[0].data, sizeof(udev->scratch));
+	device_set_desc_copy(dev, udev->scratch[0].data);
+	device_printf(dev, "<%s> on %s\n", udev->scratch[0].data,
 	    device_get_nameunit(udev->bus->bdev));
 	return;
 }

==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#67 (text+ko) ====

@@ -101,7 +101,9 @@
 struct usbd_std_root_transfer;
 struct usbd_setup_params;
 struct usbd_ifqueue;
+struct usbd_temp_setup;
 struct usb_callout;
+struct usb_temp_device_desc;
 struct module;
 struct malloc_type;
 struct proc;
@@ -114,6 +116,8 @@
 
 typedef void (usbd_std_root_transfer_func_t)(struct usbd_xfer *, struct usbd_std_root_transfer *);
 
+typedef const uint8_t *(usbd_temp_get_desc_t)(struct usbd_device *udev, uint16_t langid, uint8_t type, uint8_t index);
+
 /* USB modes */
 
 enum {
@@ -131,6 +135,18 @@
 	USBD_STD_ROOT_TR_PRE_CALLBACK,
 };
 
+struct usbd_temp_setup {
+	void   *buf;
+	uint32_t size;
+	uint8_t	usb_speed;
+	uint8_t	bNumEndpoints;
+	uint8_t	bInterfaceNumber;
+	uint8_t	bAlternateSetting;
+	uint8_t	bConfigurationValue;
+	uint8_t	bEpToIface[USB_MAX_ENDPOINTS];
+	usbd_status_t err;
+};
+
 struct usbd_bus_methods {
 	void    (*pipe_init) (struct usbd_device *udev, usb_endpoint_descriptor_t *edesc, struct usbd_pipe *pipe);
 	void    (*do_poll) (struct usbd_bus *);
@@ -326,6 +342,8 @@
 	device_t subdevs_end[0];
 	struct usb_device *linux_dev;
 	struct usbd_xfer *default_xfer[1];
+	void   *usb_template_ptr;
+	usbd_temp_get_desc_t *usb_temp_get_desc;
 
 	uint16_t refcount;
 #define	USB_DEV_REFCOUNT_MAX 0xffff
@@ -366,7 +384,12 @@
 	uint8_t	serial[64];		/* serial number */
 	uint8_t	manufacturer[64];	/* manufacturer string */
 	uint8_t	product[64];		/* product string */
-	uint8_t	scratch[128];
+
+	union {
+		struct usbd_temp_setup temp_setup[1];
+		uint8_t	data[128];
+	}	scratch[1];
+
 	uint8_t	detaching;
 	uint8_t	no_strings;		/* flag for no strings */
 };
@@ -750,6 +773,13 @@
 void	usb_needs_explore(struct usbd_device *udev);
 void	usb_needs_probe_and_attach(void);
 
+/* prototypes from usb_template.c */
+
+const void *usbd_temp_get_device_desc(struct usbd_device *udev);
+const void *usbd_temp_get_config_desc(struct usbd_device *udev, uint8_t index);
+usbd_status_t usbd_temp_setup(struct usbd_device *udev, const struct usb_temp_device_desc *tdd);
+void	usbd_temp_unsetup(struct usbd_device *udev);
+
 /* prototypes from usb_transfer.c */
 
 #ifdef USB_DEBUG

==== //depot/projects/usb/src/sys/dev/usb/usb_template.c#2 (text+ko) ====

@@ -38,26 +38,15 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
 #include 
 #include 
 
-struct usb_temp_setup {
-	void   *buf;
-	uint32_t size;
-	uint8_t	usb_speed;
-	uint8_t	bNumEndpoints;
-	uint8_t	bInterfaceNumber;
-	uint8_t	bAlternateSetting;
-	uint8_t	bConfigurationValue;
-	uint8_t	bEpToIface[USB_MAX_ENDPOINTS];
-	usbd_status_t err;
-};
-
 static void
-usbd_make_raw_desc(struct usb_temp_setup *temp,
+usbd_make_raw_desc(struct usbd_temp_setup *temp,
     const uint8_t *raw)
 {
 	void *dst;
@@ -76,7 +65,7 @@
 }
 
 static void
-usbd_make_endpoint_desc(struct usb_temp_setup *temp,
+usbd_make_endpoint_desc(struct usbd_temp_setup *temp,
     const struct usb_temp_endpoint_desc *ted)
 {
 	usb_endpoint_descriptor_t *ed;
@@ -213,7 +202,7 @@
 }
 
 static void
-usbd_make_interface_desc(struct usb_temp_setup *temp,
+usbd_make_interface_desc(struct usbd_temp_setup *temp,
     const struct usb_temp_interface_desc *tid)
 {
 	usb_interface_descriptor_t *id;
@@ -278,7 +267,7 @@
 }
 
 static void
-usbd_make_config_desc(struct usb_temp_setup *temp,
+usbd_make_config_desc(struct usbd_temp_setup *temp,
     const struct usb_temp_config_desc *tcd)
 {
 	usb_config_descriptor_t *cd;
@@ -327,7 +316,7 @@
 }
 
 static void
-usbd_make_device_desc(struct usb_temp_setup *temp,
+usbd_make_device_desc(struct usbd_temp_setup *temp,
     const struct usb_temp_device_desc *tdd)
 {
 	usb_device_descriptor_t *dd;
@@ -394,3 +383,129 @@
 	}
 	return;
 }
+
+const void *
+usbd_temp_get_device_desc(struct usbd_device *udev)
+{
+	const usb_device_descriptor_t *dd;
+
+	dd = udev->usb_template_ptr;
+	if (dd == NULL) {
+		return (NULL);
+	}
+	if (dd->bDescriptorType != UDESC_DEVICE) {
+		/* sanity check failed */
+		return (NULL);
+	}
+	return (dd);
+}
+
+const void *
+usbd_temp_get_config_desc(struct usbd_device *udev, uint8_t index)
+{
+	const usb_device_descriptor_t *dd;
+	const usb_config_descriptor_t *cd;
+	uint16_t temp;
+
+	dd = usbd_temp_get_device_desc(udev);
+	if (dd == NULL) {
+		return (NULL);
+	}
+	if (index >= dd->bNumConfigurations) {
+		/* out of range */
+		return (NULL);
+	}
+	cd = USBD_ADD_BYTES(dd, dd->bLength);
+
+	while (index--) {
+		if (cd->bDescriptorType != UDESC_CONFIG) {
+			/* sanity check failed */
+			return (NULL);
+		}
+		temp = UGETW(cd->wTotalLength);
+		cd = USBD_ADD_BYTES(cd, temp);
+	}
+	return (cd);
+}
+
+/*------------------------------------------------------------------------*
+ *	usbd_temp_setup
+ *
+ * This function generates USB descriptors according to
+ * the given USB template device descriptor.
+ *
+ * Returns:
+ *    0: Success
+ * Else: Failure
+ *------------------------------------------------------------------------*/
+usbd_status_t
+usbd_temp_setup(struct usbd_device *udev,
+    const struct usb_temp_device_desc *tdd)
+{
+	struct usbd_temp_setup *uts;
+
+	if (tdd == NULL) {
+		/* be NULL safe */
+		return (0);
+	}
+	if (tdd->pGetDescFn == NULL) {
+		/* not initialized properly */
+		return (USBD_INVAL);
+	}
+	uts = udev->scratch[0].temp_setup;
+
+	bzero(uts, sizeof(*uts));
+
+	uts->usb_speed = udev->speed;
+
+	/* first pass */
+
+	usbd_make_device_desc(uts, tdd);
+
+	if (uts->err) {
+		/* some error happened */
+		return (uts->err);
+	}
+	/* allocate zeroed memory */
+	if (uts->size > 0) {
+		uts->buf = malloc(uts->size, M_USB, M_WAITOK | M_ZERO);
+		if (uts->buf == NULL) {
+			/* could not allocate memory */
+			return (USBD_NOMEM);
+		}
+	}
+	/* second pass */
+
+	uts->size = 0;
+
+	usbd_make_device_desc(uts, tdd);
+
+	if (uts->err) {
+		/* some error happened during second pass */
+		free(uts->buf, M_USB);
+		return (uts->err);
+	}
+	udev->usb_template_ptr = uts->buf;
+	udev->usb_temp_get_desc = tdd->pGetDescFn;
+
+	return (uts->err);
+}
+
+/*------------------------------------------------------------------------*
+ *	usbd_temp_unsetup
+ *
+ * This function frees any memory associated with the currently
+ * setup template, if any.
+ *------------------------------------------------------------------------*/
+void
+usbd_temp_unsetup(struct usbd_device *udev)
+{
+	if (udev->usb_template_ptr) {
+
+		free(udev->usb_template_ptr, M_USB);
+
+		udev->usb_template_ptr = NULL;
+		udev->usb_temp_get_desc = NULL;
+	}
+	return;
+}

==== //depot/projects/usb/src/sys/dev/usb/usb_template.h#3 (text+ko) ====

@@ -31,8 +31,6 @@
 #ifndef _USB_TEMPLATE_H_
 #define	_USB_TEMPLATE_H_
 
-typedef const uint8_t * (usbd_temp_get_string_desc_t)(struct usbd_device *udev, uint16_t langid, uint8_t index);
-
 struct usb_temp_packet_size {
 	uint16_t mps[USB_SPEED_MAX];
 };
@@ -41,7 +39,7 @@
 	const void **ppRawDesc;
 	const struct usb_temp_packet_size *pPacketSize;
 	uint8_t	direction;		/* UE_DIR_IN or UE_DIR_OUT */
-	uint8_t	endpoint;	/* endpoint address */
+	uint8_t	endpoint;		/* endpoint address */
 	uint8_t	bmAttributes;
 };
 
@@ -59,11 +57,11 @@
 	const struct usb_temp_interface_desc **ppIfaceDesc;
 	uint8_t	bmAttributes;
 	uint8_t	bMaxPower;
-	uint8_t iConfiguration;
+	uint8_t	iConfiguration;
 };
 
 struct usb_temp_device_desc {
-	usbd_temp_get_string_desc_t *pGetStringDescFn;
+	usbd_temp_get_desc_t *pGetDescFn;
 	const struct usb_temp_config_desc **ppConfigDesc;
 	uint16_t idVendor;
 	uint16_t idProduct;

==== //depot/projects/usb/src/sys/modules/usb/Makefile#4 (text+ko) ====

@@ -15,6 +15,7 @@
 	usb_quirks.c usb_quirks.h \
 	usb_requests.c \
 	usb_subr.c usb_subr.h \
+	usb_template.c usb_template.h \
 	usb_transfer.c \
 	usb_compat_linux.c \
 

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 11:51:27 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 75A3516A468; Sat,  8 Dec 2007 11:51:27 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DC09516A418
	for ; Sat,  8 Dec 2007 11:51:26 +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 CB60113C44B
	for ; Sat,  8 Dec 2007 11:51:26 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB8BpQ9I039537
	for ; Sat, 8 Dec 2007 11:51:26 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB8BpQvD039534
	for perforce@freebsd.org; Sat, 8 Dec 2007 11:51:26 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 8 Dec 2007 11:51:26 GMT
Message-Id: <200712081151.lB8BpQvD039534@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 130484 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 11:51:27 -0000

http://perforce.freebsd.org/chv.cgi?CH=130484

Change 130484 by hselasky@hselasky_laptop001 on 2007/12/08 11:51:08

	
	This commit relates to USB device side support.
	
	In USB device side mode we allow "usbd_do_request_flags"
	to read out the USB descriptors from the USB template
	system for sake of convenience. All other requests are
	not supported and should yield an error.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#68 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#63 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#68 (text+ko) ====

@@ -116,7 +116,7 @@
 
 typedef void (usbd_std_root_transfer_func_t)(struct usbd_xfer *, struct usbd_std_root_transfer *);
 
-typedef const uint8_t *(usbd_temp_get_desc_t)(struct usbd_device *udev, uint16_t langid, uint8_t type, uint8_t index);
+typedef void (usbd_temp_get_desc_t)(struct usbd_device *udev, struct mtx *mtx, usb_device_request_t *req, const void **data, uint16_t *pLen);
 
 /* USB modes */
 

==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#63 (text+ko) ====

@@ -2262,6 +2262,7 @@
 {
 	struct usbd_xfer *xfer;
 	struct usbd_config uc[1];
+	const void *desc;
 	uint32_t level = 0;
 	uint32_t start_ticks;
 	uint32_t delta_ticks;
@@ -2283,6 +2284,24 @@
 	    req->wIndex[1], req->wIndex[0],
 	    req->wLength[1], req->wLength[0]));
 
+	if (udev->usb_mode == USB_MODE_DEVICE) {
+		PRINTFN(0, ("USB device mode\n"));
+		(udev->usb_temp_get_desc) (udev, mtx, req, &desc, &temp);
+		if (desc == NULL) {
+			return (USBD_INVAL);
+		}
+		if (length > temp) {
+			if (!(flags & USBD_SHORT_XFER_OK)) {
+				return (USBD_SHORT_XFER);
+			}
+			length = temp;
+		}
+		if (actlen) {
+			*actlen = length;
+		}
+		bcopy(desc, data, length);
+		return (0);		/* success */
+	}
 	if (actlen) {
 		(*actlen) = 0;
 	}

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 12:45:24 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BA48D16A474; Sat,  8 Dec 2007 12:45:24 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2F14A16A468
	for ; Sat,  8 Dec 2007 12:45:24 +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 1B5E813C4DD
	for ; Sat,  8 Dec 2007 12:45:24 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB8CjON8049122
	for ; Sat, 8 Dec 2007 12:45:24 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB8CjNDG049119
	for perforce@freebsd.org; Sat, 8 Dec 2007 12:45:23 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 8 Dec 2007 12:45:23 GMT
Message-Id: <200712081245.lB8CjNDG049119@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 130487 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 12:45:25 -0000

http://perforce.freebsd.org/chv.cgi?CH=130487

Change 130487 by hselasky@hselasky_laptop001 on 2007/12/08 12:45:16

	
	This commit is related to USB device side support.
	
	USB device side devices will be attached to the
	same class like USB host side devices. Therefore all
	USB drivers should have a check where the "usb_mode"
	is matched with the USB mode(s) that the USB driver
	supports.
	
	One reason we do this is to encourage symmetric
	USB protocol design so that a single USB driver
	can support both host and device mode without major
	modifications.

Affected files ...

.. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#26 edit
.. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#7 edit
.. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#25 edit
.. //depot/projects/usb/src/sys/dev/usb/if_aue.c#38 edit
.. //depot/projects/usb/src/sys/dev/usb/if_axe.c#40 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#30 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cue.c#34 edit
.. //depot/projects/usb/src/sys/dev/usb/if_kue.c#36 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rue.c#34 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rum.c#21 edit
.. //depot/projects/usb/src/sys/dev/usb/if_udav.c#36 edit
.. //depot/projects/usb/src/sys/dev/usb/if_ural.c#45 edit
.. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#25 edit
.. //depot/projects/usb/src/sys/dev/usb/uark.c#14 edit
.. //depot/projects/usb/src/sys/dev/usb/ubsa.c#31 edit
.. //depot/projects/usb/src/sys/dev/usb/ubser.c#23 edit
.. //depot/projects/usb/src/sys/dev/usb/ucycom.c#25 edit
.. //depot/projects/usb/src/sys/dev/usb/udbp.c#19 edit
.. //depot/projects/usb/src/sys/dev/usb/ufm.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/ufoma.c#32 edit
.. //depot/projects/usb/src/sys/dev/usb/uftdi.c#28 edit
.. //depot/projects/usb/src/sys/dev/usb/ugen.c#30 edit
.. //depot/projects/usb/src/sys/dev/usb/ugensa.c#15 edit
.. //depot/projects/usb/src/sys/dev/usb/uhid.c#24 edit
.. //depot/projects/usb/src/sys/dev/usb/uhub.c#23 edit
.. //depot/projects/usb/src/sys/dev/usb/uipaq.c#16 edit
.. //depot/projects/usb/src/sys/dev/usb/ukbd.c#33 edit
.. //depot/projects/usb/src/sys/dev/usb/ulpt.c#33 edit
.. //depot/projects/usb/src/sys/dev/usb/umass.c#36 edit
.. //depot/projects/usb/src/sys/dev/usb/umct.c#25 edit
.. //depot/projects/usb/src/sys/dev/usb/umodem.c#35 edit
.. //depot/projects/usb/src/sys/dev/usb/umoscom.c#12 edit
.. //depot/projects/usb/src/sys/dev/usb/ums.c#33 edit
.. //depot/projects/usb/src/sys/dev/usb/uplcom.c#32 edit
.. //depot/projects/usb/src/sys/dev/usb/urio.c#19 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#14 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#69 edit
.. //depot/projects/usb/src/sys/dev/usb/uscanner.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/uvisor.c#28 edit
.. //depot/projects/usb/src/sys/dev/usb/uvscom.c#31 edit
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#19 edit
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#15 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#26 (text) ====

@@ -286,6 +286,9 @@
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 	usb_interface_descriptor_t *id;
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface == NULL) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#7 (text+ko) ====

@@ -114,6 +114,9 @@
 	if (windrv_lookup(0, "USB Bus") == NULL) {
 		return (UMATCH_NONE);
 	}
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface != NULL) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#25 (text+ko) ====

@@ -649,6 +649,9 @@
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 	usb_interface_descriptor_t *id;
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface == NULL) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#38 (text+ko) ====

@@ -761,6 +761,9 @@
 {
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface != NULL) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#40 (text+ko) ====

@@ -619,6 +619,9 @@
 {
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface != NULL) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#30 (text+ko) ====

@@ -196,6 +196,9 @@
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 	usb_interface_descriptor_t *id;
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface == NULL) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#34 (text+ko) ====

@@ -452,6 +452,9 @@
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 	struct cue_type *t;
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface != NULL) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#36 (text+ko) ====

@@ -477,6 +477,9 @@
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 	struct kue_type *t;
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface != NULL) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#34 (text+ko) ====

@@ -670,6 +670,9 @@
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 	struct rue_type *t;
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface != NULL) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/dev/usb/if_rum.c#21 (text+ko) ====

@@ -437,6 +437,9 @@
 {
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface != NULL) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#36 (text+ko) ====

@@ -298,6 +298,9 @@
 {
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface != NULL) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#45 (text+ko) ====

@@ -496,6 +496,9 @@
 {
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface != NULL) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/dev/usb/if_zyd.c#25 (text+ko) ====

@@ -1227,6 +1227,9 @@
 {
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface)
 		return (UMATCH_NONE);
 

==== //depot/projects/usb/src/sys/dev/usb/uark.c#14 (text+ko) ====

@@ -185,6 +185,9 @@
 {
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/dev/usb/ubsa.c#31 (text+ko) ====

@@ -318,6 +318,9 @@
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 	const struct ubsa_product *up = ubsa_products;
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/dev/usb/ubser.c#23 (text+ko) ====

@@ -234,6 +234,9 @@
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 	usb_interface_descriptor_t *id;
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface == NULL)
 		return (UMATCH_NONE);
 

==== //depot/projects/usb/src/sys/dev/usb/ucycom.c#25 (text+ko) ====

@@ -194,6 +194,9 @@
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 	const struct ucycom_device *ud;
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface != NULL) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/dev/usb/udbp.c#19 (text+ko) ====

@@ -287,6 +287,9 @@
 {
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (!uaa->iface)
 		return (UMATCH_NONE);
 

==== //depot/projects/usb/src/sys/dev/usb/ufm.c#18 (text+ko) ====

@@ -135,6 +135,9 @@
 {
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface == NULL) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/dev/usb/ufoma.c#32 (text+ko) ====

@@ -342,6 +342,9 @@
 	usb_config_descriptor_t *cd;
 	usb_mcpc_acm_descriptor *mad;
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface == NULL) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/dev/usb/uftdi.c#28 (text+ko) ====

@@ -232,6 +232,9 @@
 {
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface != NULL) {
 		if ((uaa->vendor == USB_VENDOR_FTDI) &&
 		    (uaa->product == USB_PRODUCT_FTDI_SERIAL_2232C)) {

==== //depot/projects/usb/src/sys/dev/usb/ugen.c#30 (text+ko) ====

@@ -174,6 +174,9 @@
 {
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->usegeneric)
 		return (UMATCH_GENERIC);
 	else

==== //depot/projects/usb/src/sys/dev/usb/ugensa.c#15 (text+ko) ====

@@ -185,6 +185,9 @@
 {
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/dev/usb/uhid.c#24 (text+ko) ====

@@ -557,6 +557,9 @@
 
 	DPRINTF(10, "\n");
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface == NULL) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/dev/usb/uhub.c#23 (text+ko) ====

@@ -429,11 +429,15 @@
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 	usb_device_descriptor_t *dd = usbd_get_device_descriptor(uaa->device);
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	/*
 	 * the subclass for hubs, is ignored,
 	 * because it is 0 for some
 	 * and 1 for others
 	 */
+
 	if ((uaa->iface == NULL) && (dd->bDeviceClass == UDCLASS_HUB)) {
 		return (UMATCH_DEVCLASS_DEVSUBCLASS);
 	}

==== //depot/projects/usb/src/sys/dev/usb/uipaq.c#16 (text+ko) ====

@@ -196,6 +196,9 @@
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 	const struct usb_devno *up;
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface == NULL) {
 		up = uipaq_lookup(uaa->vendor, uaa->product);
 		if (up) {

==== //depot/projects/usb/src/sys/dev/usb/ukbd.c#33 (text+ko) ====

@@ -597,6 +597,9 @@
 	if (sw == NULL) {
 		return (UMATCH_NONE);
 	}
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface == NULL) {
 		/* attach to ifaces only */
 		return (UMATCH_NONE);

==== //depot/projects/usb/src/sys/dev/usb/ulpt.c#33 (text+ko) ====

@@ -483,6 +483,9 @@
 
 	DPRINTF(10, "\n");
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface == NULL) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/dev/usb/umass.c#36 (text+ko) ====

@@ -1420,6 +1420,9 @@
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 	struct umass_probe_proto temp;
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface == NULL) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/dev/usb/umct.c#25 (text+ko) ====

@@ -244,6 +244,9 @@
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 	uint32_t i;
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface != NULL) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/dev/usb/umodem.c#35 (text+ko) ====

@@ -293,6 +293,9 @@
 
 	DPRINTF(10, "\n");
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface == NULL) {
 		goto done;
 	}

==== //depot/projects/usb/src/sys/dev/usb/umoscom.c#12 (text+ko) ====

@@ -305,6 +305,9 @@
 {
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface != NULL)
 		return (UMATCH_NONE);
 

==== //depot/projects/usb/src/sys/dev/usb/ums.c#33 (text+ko) ====

@@ -352,6 +352,9 @@
 
 	DPRINTF(10, "\n");
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface == NULL) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/dev/usb/uplcom.c#32 (text+ko) ====

@@ -347,6 +347,9 @@
 {
 	const struct uplcom_product *up = uplcom_products;
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (NULL);
+	}
 	if (uaa->iface == NULL) {
 		while (up->vendor) {
 			if ((up->vendor == uaa->vendor) &&

==== //depot/projects/usb/src/sys/dev/usb/urio.c#19 (text+ko) ====

@@ -197,6 +197,9 @@
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 	usb_device_descriptor_t *dd;
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (!uaa->iface)
 		return (UMATCH_NONE);
 

==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#14 (text+ko) ====

@@ -196,6 +196,9 @@
 	struct usb_driver *udrv;
 	int err = UMATCH_NONE;
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface == NULL) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#69 (text+ko) ====

@@ -659,6 +659,8 @@
 	uint8_t	configno;
 	uint8_t	iface_index;
 	uint8_t	usegeneric;
+	uint8_t	usb_mode:1;		/* see USB_MODE_XXX */
+	uint8_t	unused:7;
 };
 
 /* return values for device_probe() method: */

==== //depot/projects/usb/src/sys/dev/usb/uscanner.c#18 (text+ko) ====

@@ -356,6 +356,9 @@
 	DPRINTF(10, "\n");
 
 	uaa = device_get_ivars(dev);
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface == NULL) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/dev/usb/uvisor.c#28 (text+ko) ====

@@ -320,6 +320,9 @@
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 	const struct uvisor_product *up = uvisor_find_up(uaa);
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	return (up ? UMATCH_VENDOR_PRODUCT : UMATCH_NONE);
 }
 

==== //depot/projects/usb/src/sys/dev/usb/uvscom.c#31 (text+ko) ====

@@ -295,6 +295,9 @@
 {
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface) {
 		return (UMATCH_NONE);
 	}

==== //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#19 (text+ko) ====

@@ -454,6 +454,9 @@
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 	usb_device_descriptor_t *dd = usbd_get_device_descriptor(uaa->device);
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if ((uaa->iface == NULL) ||
 	    usb_lookup(ubt_ignored_devices, uaa->vendor, uaa->product)) {
 		return (UMATCH_NONE);

==== //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#15 (text+ko) ====

@@ -175,6 +175,9 @@
 {
 	struct usb_attach_arg *uaa = device_get_ivars(dev);
 
+	if (uaa->usb_mode != USB_MODE_HOST) {
+		return (UMATCH_NONE);
+	}
 	if (uaa->iface != NULL)
 		return (UMATCH_NONE);
 

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 13:54:43 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D8B3816A496; Sat,  8 Dec 2007 13:54:42 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 210B416A41A
	for ; Sat,  8 Dec 2007 13:54:42 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0E49D13C44B
	for ; Sat,  8 Dec 2007 13:54:42 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB8DsgpF069376
	for ; Sat, 8 Dec 2007 13:54:42 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB8Dsfax069372
	for perforce@freebsd.org; Sat, 8 Dec 2007 13:54:41 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 8 Dec 2007 13:54:41 GMT
Message-Id: <200712081354.lB8Dsfax069372@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 130501 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 13:54:43 -0000

http://perforce.freebsd.org/chv.cgi?CH=130501

Change 130501 by hselasky@hselasky_laptop001 on 2007/12/08 13:54:21

	
	This commit is device side related.
	
	o Remove UE_DIR_SID hence we now have two callbacks
	  in the USB config structure. One for the USB device side
	  and one for the USB host side. Which callback to use is
	  selected depending on the "usb_mode" variable.
	
	o Most parts of the change was scripted according to:
	
	[ -f src/$F ] && (cat src/$F | sed -e "s/[.]callback =/.cb[USB_MODE_HOST] =/g" > temp) && ((
	diff -b -u src/$F temp > /dev/null) || (cat temp > src/$F))
	
	o New enum USB_MODE_MAX which gives the maximum
	  number of USB modes.

Affected files ...

.. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#27 edit
.. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#26 edit
.. //depot/projects/usb/src/sys/dev/usb/if_aue.c#39 edit
.. //depot/projects/usb/src/sys/dev/usb/if_axe.c#41 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#31 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cue.c#35 edit
.. //depot/projects/usb/src/sys/dev/usb/if_kue.c#37 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rue.c#35 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rum.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/if_udav.c#37 edit
.. //depot/projects/usb/src/sys/dev/usb/if_ural.c#46 edit
.. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#26 edit
.. //depot/projects/usb/src/sys/dev/usb/uark.c#15 edit
.. //depot/projects/usb/src/sys/dev/usb/ubsa.c#32 edit
.. //depot/projects/usb/src/sys/dev/usb/ubser.c#24 edit
.. //depot/projects/usb/src/sys/dev/usb/ucycom.c#26 edit
.. //depot/projects/usb/src/sys/dev/usb/udbp.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/ufoma.c#33 edit
.. //depot/projects/usb/src/sys/dev/usb/uftdi.c#29 edit
.. //depot/projects/usb/src/sys/dev/usb/ugen.c#31 edit
.. //depot/projects/usb/src/sys/dev/usb/ugensa.c#16 edit
.. //depot/projects/usb/src/sys/dev/usb/uhid.c#25 edit
.. //depot/projects/usb/src/sys/dev/usb/uhub.c#24 edit
.. //depot/projects/usb/src/sys/dev/usb/uipaq.c#17 edit
.. //depot/projects/usb/src/sys/dev/usb/ukbd.c#34 edit
.. //depot/projects/usb/src/sys/dev/usb/ulpt.c#34 edit
.. //depot/projects/usb/src/sys/dev/usb/umass.c#37 edit
.. //depot/projects/usb/src/sys/dev/usb/umct.c#26 edit
.. //depot/projects/usb/src/sys/dev/usb/umodem.c#36 edit
.. //depot/projects/usb/src/sys/dev/usb/umoscom.c#13 edit
.. //depot/projects/usb/src/sys/dev/usb/ums.c#34 edit
.. //depot/projects/usb/src/sys/dev/usb/uplcom.c#33 edit
.. //depot/projects/usb/src/sys/dev/usb/urio.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/usb.h#23 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#15 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#70 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#64 edit
.. //depot/projects/usb/src/sys/dev/usb/uscanner.c#19 edit
.. //depot/projects/usb/src/sys/dev/usb/uvisor.c#29 edit
.. //depot/projects/usb/src/sys/dev/usb/uvscom.c#32 edit
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#20 edit
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#16 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#27 (text) ====

@@ -173,7 +173,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &atausb_t_bbb_reset1_callback,
+		.cb[USB_MODE_HOST] = &atausb_t_bbb_reset1_callback,
 		.timeout = 5000,	/* 5 seconds */
 		.interval = 500,	/* 500 milliseconds */
 	},
@@ -184,7 +184,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &atausb_t_bbb_reset2_callback,
+		.cb[USB_MODE_HOST] = &atausb_t_bbb_reset2_callback,
 		.timeout = 5000,	/* 5 seconds */
 		.interval = 50,		/* 50 milliseconds */
 	},
@@ -195,7 +195,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &atausb_t_bbb_reset3_callback,
+		.cb[USB_MODE_HOST] = &atausb_t_bbb_reset3_callback,
 		.timeout = 5000,	/* 5 seconds */
 		.interval = 50,		/* 50 milliseconds */
 	},
@@ -206,7 +206,7 @@
 		.direction = UE_DIR_OUT,
 		.bufsize = sizeof(struct bbb_cbw),
 		.flags = {},
-		.callback = &atausb_t_bbb_command_callback,
+		.cb[USB_MODE_HOST] = &atausb_t_bbb_command_callback,
 		.timeout = 5000,	/* 5 seconds */
 	},
 
@@ -216,7 +216,7 @@
 		.direction = UE_DIR_IN,
 		.bufsize = ATAUSB_BULK_SIZE,
 		.flags = {.proxy_buffer = 1,.short_xfer_ok = 1,},
-		.callback = &atausb_t_bbb_data_read_callback,
+		.cb[USB_MODE_HOST] = &atausb_t_bbb_data_read_callback,
 		.timeout = 0,		/* overwritten later */
 	},
 
@@ -226,7 +226,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &atausb_t_bbb_data_rd_cs_callback,
+		.cb[USB_MODE_HOST] = &atausb_t_bbb_data_rd_cs_callback,
 		.timeout = 5000,	/* 5 seconds */
 	},
 
@@ -236,7 +236,7 @@
 		.direction = UE_DIR_OUT,
 		.bufsize = ATAUSB_BULK_SIZE,
 		.flags = {.proxy_buffer = 1,.short_xfer_ok = 1,},
-		.callback = &atausb_t_bbb_data_write_callback,
+		.cb[USB_MODE_HOST] = &atausb_t_bbb_data_write_callback,
 		.timeout = 0,		/* overwritten later */
 	},
 
@@ -246,7 +246,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &atausb_t_bbb_data_wr_cs_callback,
+		.cb[USB_MODE_HOST] = &atausb_t_bbb_data_wr_cs_callback,
 		.timeout = 5000,	/* 5 seconds */
 	},
 
@@ -256,7 +256,7 @@
 		.direction = UE_DIR_IN,
 		.bufsize = sizeof(struct bbb_csw),
 		.flags = {.short_xfer_ok = 1,},
-		.callback = &atausb_t_bbb_status_callback,
+		.cb[USB_MODE_HOST] = &atausb_t_bbb_status_callback,
 		.timeout = 5000,	/* ms */
 	},
 };

==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#26 (text+ko) ====

@@ -466,7 +466,7 @@
 		.bufsize = 0,		/* use "wMaxPacketSize * frames" */
 		.frames = UAUDIO_NFRAMES,
 		.flags = {.short_xfer_ok = 1,},
-		.callback = &uaudio_chan_record_callback,
+		.cb[USB_MODE_HOST] = &uaudio_chan_record_callback,
 	},
 
 	[1] = {
@@ -476,7 +476,7 @@
 		.bufsize = 0,		/* use "wMaxPacketSize * frames" */
 		.frames = UAUDIO_NFRAMES,
 		.flags = {.short_xfer_ok = 1,},
-		.callback = &uaudio_chan_record_callback,
+		.cb[USB_MODE_HOST] = &uaudio_chan_record_callback,
 	},
 };
 
@@ -489,7 +489,7 @@
 		.bufsize = 0,		/* use "wMaxPacketSize * frames" */
 		.frames = (UAUDIO_NFRAMES * 8),
 		.flags = {.short_xfer_ok = 1,},
-		.callback = &uaudio_chan_record_callback,
+		.cb[USB_MODE_HOST] = &uaudio_chan_record_callback,
 	},
 
 	[1] = {
@@ -499,7 +499,7 @@
 		.bufsize = 0,		/* use "wMaxPacketSize * frames" */
 		.frames = (UAUDIO_NFRAMES * 8),
 		.flags = {.short_xfer_ok = 1,},
-		.callback = &uaudio_chan_record_callback,
+		.cb[USB_MODE_HOST] = &uaudio_chan_record_callback,
 	},
 };
 
@@ -512,7 +512,7 @@
 		.bufsize = 0,		/* use "wMaxPacketSize * frames" */
 		.frames = UAUDIO_NFRAMES,
 		.flags = {.short_xfer_ok = 1,},
-		.callback = &uaudio_chan_play_callback,
+		.cb[USB_MODE_HOST] = &uaudio_chan_play_callback,
 	},
 
 	[1] = {
@@ -522,7 +522,7 @@
 		.bufsize = 0,		/* use "wMaxPacketSize * frames" */
 		.frames = UAUDIO_NFRAMES,
 		.flags = {.short_xfer_ok = 1,},
-		.callback = &uaudio_chan_play_callback,
+		.cb[USB_MODE_HOST] = &uaudio_chan_play_callback,
 	},
 };
 
@@ -535,7 +535,7 @@
 		.bufsize = 0,		/* use "wMaxPacketSize * frames" */
 		.frames = (UAUDIO_NFRAMES * 8),
 		.flags = {.short_xfer_ok = 1,},
-		.callback = &uaudio_chan_play_callback,
+		.cb[USB_MODE_HOST] = &uaudio_chan_play_callback,
 	},
 
 	[1] = {
@@ -545,7 +545,7 @@
 		.bufsize = 0,		/* use "wMaxPacketSize * frames" */
 		.frames = (UAUDIO_NFRAMES * 8),
 		.flags = {.short_xfer_ok = 1,},
-		.callback = &uaudio_chan_play_callback,
+		.cb[USB_MODE_HOST] = &uaudio_chan_play_callback,
 	},
 };
 
@@ -556,7 +556,7 @@
 		.endpoint = 0x00,	/* Control pipe */
 		.direction = UE_DIR_ANY,
 		.bufsize = (sizeof(usb_device_request_t) + 4),
-		.callback = &uaudio_mixer_write_cfg_callback,
+		.cb[USB_MODE_HOST] = &uaudio_mixer_write_cfg_callback,
 		.timeout = 1000,	/* 1 second */
 	},
 };
@@ -589,7 +589,7 @@
 		.direction = UE_DIR_OUT,
 		.bufsize = UMIDI_BULK_SIZE,
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
-		.callback = &umidi_bulk_write_callback,
+		.cb[USB_MODE_HOST] = &umidi_bulk_write_callback,
 	},
 
 	[1] = {
@@ -598,7 +598,7 @@
 		.direction = UE_DIR_IN,
 		.bufsize = UMIDI_BULK_SIZE,
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
-		.callback = &umidi_bulk_read_callback,
+		.cb[USB_MODE_HOST] = &umidi_bulk_read_callback,
 	},
 
 	[2] = {
@@ -607,7 +607,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &umidi_write_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &umidi_write_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},
@@ -618,7 +618,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &umidi_read_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &umidi_read_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},

==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#39 (text+ko) ====

@@ -288,7 +288,7 @@
 		.direction = UE_DIR_OUT,
 		.bufsize = (MCLBYTES + 2),
 		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
-		.callback = &aue_bulk_write_callback,
+		.cb[USB_MODE_HOST] = &aue_bulk_write_callback,
 		.timeout = 10000,	/* 10 seconds */
 	},
 
@@ -298,7 +298,7 @@
 		.direction = UE_DIR_IN,
 		.bufsize = (MCLBYTES + 4 + ETHER_CRC_LEN),
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
-		.callback = &aue_bulk_read_callback,
+		.cb[USB_MODE_HOST] = &aue_bulk_read_callback,
 	},
 
 	[2] = {
@@ -307,7 +307,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &aue_bulk_write_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &aue_bulk_write_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},
@@ -318,7 +318,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &aue_bulk_read_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &aue_bulk_read_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},
@@ -329,7 +329,7 @@
 		.direction = UE_DIR_IN,
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
 		.bufsize = 0,		/* use wMaxPacketSize */
-		.callback = &aue_intr_callback,
+		.cb[USB_MODE_HOST] = &aue_intr_callback,
 	},
 
 	[5] = {
@@ -338,7 +338,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &aue_intr_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &aue_intr_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},

==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#41 (text+ko) ====

@@ -236,7 +236,7 @@
 		.direction = UE_DIR_OUT,
 		.bufsize = AXE_BULK_BUF_SIZE,
 		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
-		.callback = &axe_bulk_write_callback,
+		.cb[USB_MODE_HOST] = &axe_bulk_write_callback,
 		.timeout = 10000,	/* 10 seconds */
 	},
 
@@ -249,7 +249,7 @@
 #endif
 		.bufsize = MCLBYTES,
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
-		.callback = &axe_bulk_read_callback,
+		.cb[USB_MODE_HOST] = &axe_bulk_read_callback,
 		.timeout = 0,		/* no timeout */
 	},
 
@@ -259,7 +259,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &axe_bulk_write_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &axe_bulk_write_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},
@@ -270,7 +270,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &axe_bulk_read_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &axe_bulk_read_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},
@@ -281,7 +281,7 @@
 		.direction = UE_DIR_IN,
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
 		.bufsize = 0,		/* use wMaxPacketSize */
-		.callback = &axe_intr_callback,
+		.cb[USB_MODE_HOST] = &axe_intr_callback,
 	},
 
 	[5] = {
@@ -290,7 +290,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &axe_intr_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &axe_intr_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},

==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#31 (text+ko) ====

@@ -113,7 +113,7 @@
 		.direction = UE_DIR_OUT,
 		.bufsize = (MCLBYTES + 4),
 		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
-		.callback = &cdce_bulk_write_callback,
+		.cb[USB_MODE_HOST] = &cdce_bulk_write_callback,
 		.timeout = 10000,	/* 10 seconds */
 	},
 
@@ -123,7 +123,7 @@
 		.direction = UE_DIR_IN,
 		.bufsize = (MCLBYTES + 4),
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
-		.callback = &cdce_bulk_read_callback,
+		.cb[USB_MODE_HOST] = &cdce_bulk_read_callback,
 	},
 
 	[2] = {
@@ -132,7 +132,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &cdce_bulk_write_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &cdce_bulk_write_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},
@@ -143,7 +143,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &cdce_bulk_read_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &cdce_bulk_read_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},

==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#35 (text+ko) ====

@@ -169,7 +169,7 @@
 		.direction = UE_DIR_OUT,
 		.bufsize = (MCLBYTES + 2),
 		.flags = {.pipe_bof = 1,},
-		.callback = &cue_bulk_write_callback,
+		.cb[USB_MODE_HOST] = &cue_bulk_write_callback,
 		.timeout = 10000,	/* 10 seconds */
 	},
 
@@ -179,7 +179,7 @@
 		.direction = UE_DIR_IN,
 		.bufsize = (MCLBYTES + 2),
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
-		.callback = &cue_bulk_read_callback,
+		.cb[USB_MODE_HOST] = &cue_bulk_read_callback,
 	},
 
 	[2] = {
@@ -188,7 +188,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &cue_bulk_write_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &cue_bulk_write_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},
@@ -199,7 +199,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &cue_bulk_read_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &cue_bulk_read_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},

==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#37 (text+ko) ====

@@ -203,7 +203,7 @@
 		.direction = UE_DIR_OUT,
 		.bufsize = (MCLBYTES + 2 + 64),
 		.flags = {.pipe_bof = 1,},
-		.callback = &kue_bulk_write_callback,
+		.cb[USB_MODE_HOST] = &kue_bulk_write_callback,
 		.timeout = 10000,	/* 10 seconds */
 	},
 
@@ -213,7 +213,7 @@
 		.direction = UE_DIR_IN,
 		.bufsize = (MCLBYTES + 2),
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
-		.callback = &kue_bulk_read_callback,
+		.cb[USB_MODE_HOST] = &kue_bulk_read_callback,
 		.timeout = 0,		/* no timeout */
 	},
 
@@ -223,7 +223,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &kue_bulk_write_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &kue_bulk_write_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},
@@ -234,7 +234,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &kue_bulk_read_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &kue_bulk_read_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},

==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#35 (text+ko) ====

@@ -216,7 +216,7 @@
 		.direction = UE_DIR_OUT,
 		.bufsize = MCLBYTES,
 		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
-		.callback = &rue_bulk_write_callback,
+		.cb[USB_MODE_HOST] = &rue_bulk_write_callback,
 		.timeout = 10000,	/* 10 seconds */
 	},
 
@@ -226,7 +226,7 @@
 		.direction = UE_DIR_IN,
 		.bufsize = (MCLBYTES + 4),
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
-		.callback = &rue_bulk_read_callback,
+		.cb[USB_MODE_HOST] = &rue_bulk_read_callback,
 		.timeout = 0,		/* no timeout */
 	},
 
@@ -236,7 +236,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &rue_bulk_write_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &rue_bulk_write_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},
@@ -247,7 +247,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &rue_bulk_read_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &rue_bulk_read_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},
@@ -258,7 +258,7 @@
 		.direction = UE_DIR_IN,
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
 		.bufsize = 0,		/* use wMaxPacketSize */
-		.callback = &rue_intr_callback,
+		.cb[USB_MODE_HOST] = &rue_intr_callback,
 	},
 
 	[5] = {
@@ -267,7 +267,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &rue_intr_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &rue_intr_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},

==== //depot/projects/usb/src/sys/dev/usb/if_rum.c#22 (text+ko) ====

@@ -378,7 +378,7 @@
 		.direction = UE_DIR_OUT,
 		.bufsize = (MCLBYTES + RT2573_TX_DESC_SIZE + 8),
 		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
-		.callback = &rum_bulk_write_callback,
+		.cb[USB_MODE_HOST] = &rum_bulk_write_callback,
 		.timeout = 5000,	/* ms */
 	},
 
@@ -388,7 +388,7 @@
 		.direction = UE_DIR_IN,
 		.bufsize = (MCLBYTES + RT2573_RX_DESC_SIZE),
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
-		.callback = &rum_bulk_read_callback,
+		.cb[USB_MODE_HOST] = &rum_bulk_read_callback,
 	},
 
 	[2] = {
@@ -396,7 +396,7 @@
 		.endpoint = 0x00,	/* Control pipe */
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
-		.callback = &rum_bulk_write_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &rum_bulk_write_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},
@@ -406,7 +406,7 @@
 		.endpoint = 0x00,	/* Control pipe */
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
-		.callback = &rum_bulk_read_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &rum_bulk_read_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},

==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#37 (text+ko) ====

@@ -162,7 +162,7 @@
 		.direction = UE_DIR_OUT,
 		.bufsize = (MCLBYTES + 2),
 		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
-		.callback = &udav_bulk_write_callback,
+		.cb[USB_MODE_HOST] = &udav_bulk_write_callback,
 		.timeout = 10000,	/* 10 seconds */
 	},
 
@@ -172,7 +172,7 @@
 		.direction = UE_DIR_IN,
 		.bufsize = (MCLBYTES + 3),
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
-		.callback = &udav_bulk_read_callback,
+		.cb[USB_MODE_HOST] = &udav_bulk_read_callback,
 		.timeout = 0,		/* no timeout */
 	},
 
@@ -182,7 +182,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &udav_bulk_write_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &udav_bulk_write_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},
@@ -193,7 +193,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &udav_bulk_read_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &udav_bulk_read_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},
@@ -204,7 +204,7 @@
 		.direction = UE_DIR_IN,
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
 		.bufsize = 0,		/* use wMaxPacketSize */
-		.callback = &udav_intr_callback,
+		.cb[USB_MODE_HOST] = &udav_intr_callback,
 	},
 
 	[5] = {
@@ -213,7 +213,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &udav_intr_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &udav_intr_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},

==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#46 (text+ko) ====

@@ -437,7 +437,7 @@
 		.direction = UE_DIR_OUT,
 		.bufsize = (RAL_FRAME_SIZE + RAL_TX_DESC_SIZE + 4),
 		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
-		.callback = &ural_bulk_write_callback,
+		.cb[USB_MODE_HOST] = &ural_bulk_write_callback,
 		.timeout = 5000,	/* ms */
 	},
 
@@ -447,7 +447,7 @@
 		.direction = UE_DIR_IN,
 		.bufsize = (RAL_FRAME_SIZE + RAL_RX_DESC_SIZE),
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
-		.callback = &ural_bulk_read_callback,
+		.cb[USB_MODE_HOST] = &ural_bulk_read_callback,
 	},
 
 	[2] = {
@@ -455,7 +455,7 @@
 		.endpoint = 0x00,	/* Control pipe */
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
-		.callback = &ural_bulk_write_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &ural_bulk_write_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},
@@ -465,7 +465,7 @@
 		.endpoint = 0x00,	/* Control pipe */
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
-		.callback = &ural_bulk_read_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &ural_bulk_read_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},

==== //depot/projects/usb/src/sys/dev/usb/if_zyd.c#26 (text+ko) ====

@@ -237,7 +237,7 @@
 		.direction = UE_DIR_OUT,
 		.bufsize = (MCLBYTES + sizeof(struct zyd_controlsetformat) + 1),
 		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
-		.callback = &zyd_bulk_write_callback,
+		.cb[USB_MODE_HOST] = &zyd_bulk_write_callback,
 		.index = 0,
 		.timeout = 10000,	/* 10 seconds */
 	},
@@ -248,7 +248,7 @@
 		.direction = UE_DIR_IN,
 		.bufsize = (MAX(MCLBYTES, 2312) + sizeof(struct zyd_rxleninfoapp)),
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
-		.callback = &zyd_bulk_read_callback,
+		.cb[USB_MODE_HOST] = &zyd_bulk_read_callback,
 		.index = 0,
 	},
 
@@ -258,7 +258,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &zyd_bulk_write_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &zyd_bulk_write_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},
@@ -269,7 +269,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &zyd_bulk_read_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &zyd_bulk_read_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},
@@ -280,7 +280,7 @@
 		.direction = UE_DIR_OUT,
 		.bufsize = ZYD_INTR_BUF_SIZE,
 		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
-		.callback = &zyd_intr_write_callback,
+		.cb[USB_MODE_HOST] = &zyd_intr_write_callback,
 		.timeout = 1000,	/* 1 second */
 		.index = 1,
 	},
@@ -291,7 +291,7 @@
 		.direction = UE_DIR_IN,
 		.bufsize = ZYD_INTR_BUF_SIZE,
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
-		.callback = &zyd_intr_read_callback,
+		.cb[USB_MODE_HOST] = &zyd_intr_read_callback,
 		.timeout = 1000,	/* 1 second */
 		.index = 1,
 	},
@@ -302,7 +302,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &zyd_intr_write_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &zyd_intr_write_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},
@@ -313,7 +313,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &zyd_intr_read_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &zyd_intr_read_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},

==== //depot/projects/usb/src/sys/dev/usb/uark.c#15 (text+ko) ====

@@ -108,7 +108,7 @@
 		.direction = UE_DIR_OUT,
 		.bufsize = UARK_BUF_SIZE,
 		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
-		.callback = &uark_bulk_write_callback,
+		.cb[USB_MODE_HOST] = &uark_bulk_write_callback,
 	},
 
 	[1] = {
@@ -117,7 +117,7 @@
 		.direction = UE_DIR_IN,
 		.bufsize = UARK_BUF_SIZE,
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
-		.callback = &uark_bulk_read_callback,
+		.cb[USB_MODE_HOST] = &uark_bulk_read_callback,
 	},
 
 	[2] = {
@@ -126,7 +126,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &uark_bulk_write_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &uark_bulk_write_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},
@@ -137,7 +137,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &uark_bulk_read_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &uark_bulk_read_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},

==== //depot/projects/usb/src/sys/dev/usb/ubsa.c#32 (text+ko) ====

@@ -195,7 +195,7 @@
 		.direction = UE_DIR_OUT,
 		.bufsize = UBSA_BSIZE,	/* bytes */
 		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
-		.callback = &ubsa_write_callback,
+		.cb[USB_MODE_HOST] = &ubsa_write_callback,
 	},
 
 	[1] = {
@@ -204,7 +204,7 @@
 		.direction = UE_DIR_IN,
 		.bufsize = UBSA_BSIZE,	/* bytes */
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
-		.callback = &ubsa_read_callback,
+		.cb[USB_MODE_HOST] = &ubsa_read_callback,
 	},
 
 	[2] = {
@@ -212,7 +212,7 @@
 		.endpoint = 0x00,	/* Control pipe */
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
-		.callback = &ubsa_write_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &ubsa_write_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},
@@ -222,7 +222,7 @@
 		.endpoint = 0x00,	/* Control pipe */
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
-		.callback = &ubsa_read_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &ubsa_read_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},
@@ -233,7 +233,7 @@
 		.direction = UE_DIR_IN,
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
 		.bufsize = 0,		/* use wMaxPacketSize */
-		.callback = &ubsa_intr_callback,
+		.cb[USB_MODE_HOST] = &ubsa_intr_callback,
 	},
 
 	[5] = {
@@ -241,7 +241,7 @@
 		.endpoint = 0x00,	/* Control pipe */
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
-		.callback = &ubsa_intr_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &ubsa_intr_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},

==== //depot/projects/usb/src/sys/dev/usb/ubser.c#24 (text+ko) ====

@@ -164,7 +164,7 @@
 		.direction = UE_DIR_OUT,
 		.bufsize = 0,		/* use wMaxPacketSize */
 		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
-		.callback = &ubser_write_callback,
+		.cb[USB_MODE_HOST] = &ubser_write_callback,
 	},
 
 	[UBSER_TR_DT_READ] = {
@@ -173,7 +173,7 @@
 		.direction = UE_DIR_IN,
 		.bufsize = 0,		/* use wMaxPacketSize */
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
-		.callback = &ubser_read_callback,
+		.cb[USB_MODE_HOST] = &ubser_read_callback,
 	},
 
 	[UBSER_TR_CS_WRITE] = {
@@ -182,7 +182,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &ubser_write_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &ubser_write_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},
@@ -193,7 +193,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &ubser_read_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &ubser_read_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},

==== //depot/projects/usb/src/sys/dev/usb/ucycom.c#26 (text+ko) ====

@@ -116,7 +116,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = (sizeof(usb_device_request_t) + UCYCOM_MAX_IOLEN),
 		.flags = {},
-		.callback = &ucycom_ctrl_write_callback,
+		.cb[USB_MODE_HOST] = &ucycom_ctrl_write_callback,
 		.timeout = 1000,	/* 1 second */
 	},
 
@@ -126,7 +126,7 @@
 		.direction = UE_DIR_IN,
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
 		.bufsize = UCYCOM_MAX_IOLEN,
-		.callback = &ucycom_intr_read_callback,
+		.cb[USB_MODE_HOST] = &ucycom_intr_read_callback,
 	},
 
 	[2] = {
@@ -135,7 +135,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &ucycom_intr_read_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &ucycom_intr_read_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},

==== //depot/projects/usb/src/sys/dev/usb/udbp.c#20 (text+ko) ====

@@ -197,7 +197,7 @@
 		.direction = UE_DIR_OUT,
 		.bufsize = UDBP_BUFFERSIZE,
 		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
-		.callback = &udbp_bulk_write_callback,
+		.cb[USB_MODE_HOST] = &udbp_bulk_write_callback,
 		.timeout = UDBP_TIMEOUT,
 	},
 
@@ -207,7 +207,7 @@
 		.direction = UE_DIR_IN,
 		.bufsize = UDBP_BUFFERSIZE,
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
-		.callback = &udbp_bulk_read_callback,
+		.cb[USB_MODE_HOST] = &udbp_bulk_read_callback,
 	},
 
 	[UDBP_T_WR_CS] = {
@@ -216,7 +216,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &udbp_bulk_write_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &udbp_bulk_write_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},
@@ -227,7 +227,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &udbp_bulk_read_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &udbp_bulk_read_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},

==== //depot/projects/usb/src/sys/dev/usb/ufoma.c#33 (text+ko) ====

@@ -220,7 +220,7 @@
 		.direction = UE_DIR_IN,
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
 		.bufsize = sizeof(usb_cdc_notification_t),
-		.callback = &ufoma_intr_callback,
+		.cb[USB_MODE_HOST] = &ufoma_intr_callback,
 	},
 
 	[1] = {
@@ -229,7 +229,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(usb_device_request_t),
 		.flags = {},
-		.callback = &ufoma_intr_clear_stall_callback,
+		.cb[USB_MODE_HOST] = &ufoma_intr_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,		/* 50ms */
 	},
@@ -240,7 +240,7 @@
 		.direction = UE_DIR_ANY,
 		.bufsize = (sizeof(usb_device_request_t) + UFOMA_CMD_BUF_SIZE),
 		.flags = {.short_xfer_ok = 1,},
-		.callback = &ufoma_ctrl_read_callback,
+		.cb[USB_MODE_HOST] = &ufoma_ctrl_read_callback,
 		.timeout = 1000,	/* 1 second */
 	},
 

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 13:57:46 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 27EAD16A46B; Sat,  8 Dec 2007 13:57: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 CFB8A16A417
	for ; Sat,  8 Dec 2007 13:57: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 BE7B513C442
	for ; Sat,  8 Dec 2007 13:57:45 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB8Dvjjj069532
	for ; Sat, 8 Dec 2007 13:57:45 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB8DvjwC069529
	for perforce@freebsd.org; Sat, 8 Dec 2007 13:57:45 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 8 Dec 2007 13:57:45 GMT
Message-Id: <200712081357.lB8DvjwC069529@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 130502 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 13:57:46 -0000

http://perforce.freebsd.org/chv.cgi?CH=130502

Change 130502 by hselasky@hselasky_laptop001 on 2007/12/08 13:56:52

	
	Update documentation.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/README#25 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/README#25 (text+ko) ====

@@ -192,7 +192,7 @@
 /*------------------------------------------------------------------------*
  * struct usbd_config {
  *   type, endpoint, direction, interval, timeout, frames, index
- *   flags, bufsize, callback
+ *   flags, bufsize, cb
  * };
  *------------------------------------------------------------------------*/
 
@@ -337,7 +337,8 @@
   NOTE: For control transfers "bufsize" includes
   the length of the request structure. 
 
-- The "callback" field sets the USB callback. This field is mandatory.
+- The "cb[]" pointer array sets the USB callbacks for USB host mode
+  and USB device mode respectivly. This field is mandatory.
 
 MUTEX NOTE:
 ===========

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 19:42:53 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9215C16A419; Sat,  8 Dec 2007 19:42: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 2926016A417
	for ; Sat,  8 Dec 2007 19:42:53 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 13E3B13C46E
	for ; Sat,  8 Dec 2007 19:42:53 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB8JgqKp045369
	for ; Sat, 8 Dec 2007 19:42:52 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB8JgqaR045366
	for perforce@freebsd.org; Sat, 8 Dec 2007 19:42:52 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 8 Dec 2007 19:42:52 GMT
Message-Id: <200712081942.lB8JgqaR045366@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 130505 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 19:42:54 -0000

http://perforce.freebsd.org/chv.cgi?CH=130505

Change 130505 by hselasky@hselasky_laptop001 on 2007/12/08 19:42:45

	
	This commit is part of USB device side support.
	
	o New function "usbd_default_transfer_setup" which
	  will handle setup of the default transfer on
	  endpoint zero independent of USB mode.
	
	o Make "usbd_do_request_callback" static.
	
	o Workarounds for bugs in "indent".
	
	o Always set "actlen" to a known value before
	  returning from "usbd_do_request_flags". This might
	  prevent some future problems.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#71 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#65 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#71 (text+ko) ====

@@ -814,8 +814,7 @@
 void	usbd_do_callback(struct usbd_xfer **pp_xfer, struct thread *td);
 void	usbd_transfer_enqueue(struct usbd_xfer *xfer);
 void	usbd_transfer_dequeue(struct usbd_xfer *xfer, usbd_status_t error);
-void	usbd_do_request_callback(struct usbd_xfer *xfer);
-usbd_status_t usbd_do_request(struct usbd_device *udev, struct mtx *mtx, usb_device_request_t *req, void *data);
+void	usbd_default_transfer_setup(struct usbd_device *udev);
 usbd_status_t usbd_do_request_flags(struct usbd_device *udev, struct mtx *mtx, usb_device_request_t *req, void *data, uint32_t flags, uint16_t *actlen, uint32_t timeout);
 void	usbd_fill_get_report(usb_device_request_t *req, uint8_t iface_no, uint8_t type, uint8_t id, uint16_t size);
 void	usbd_fill_set_report(usb_device_request_t *req, uint8_t iface_no, uint8_t type, uint8_t id, uint16_t size);

==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#65 (text+ko) ====

@@ -2227,22 +2227,81 @@
 	return;
 }
 
-void
+/*------------------------------------------------------------------------*
+ *	usbd_do_request_callback
+ *------------------------------------------------------------------------*/
+static void
 usbd_do_request_callback(struct usbd_xfer *xfer)
 {
+	;				/* workaround for a bug in "indent" */
+
 	switch (USBD_GET_STATE(xfer)) {
-		case USBD_ST_SETUP:
-		/**/
+	case USBD_ST_SETUP:
 		usbd_start_hardware(xfer);
-		return;
+		break;
+	default:
+		if (!xfer->flags.use_polling) {
+			wakeup(xfer);
+		}
+		break;
+	}
+	return;
+}
+
+/*------------------------------------------------------------------------*
+ *	usbd_serve_request_callback
+ *------------------------------------------------------------------------*/
+static void
+usbd_serve_request_callback(struct usbd_xfer *xfer)
+{
+	;				/* workaround for a bug in "indent" */
 
+	switch (USBD_GET_STATE(xfer)) {
+	case USBD_ST_SETUP:
 	case USBD_ST_TRANSFERRED:
-	default:			/* Error */
-		if (!xfer->flags.use_polling) {
-			wakeup(xfer);
+	default:
+		break;
+	}
+	return;
+}
+
+/*------------------------------------------------------------------------*
+ *	usbd_default_transfer_setup
+ *------------------------------------------------------------------------*/
+void
+usbd_default_transfer_setup(struct usbd_device *udev)
+{
+	struct usbd_config uc[1];
+
+	if ((udev->default_xfer[0] == NULL) ||
+	    (udev->default_xfer[0]->address != udev->address) ||
+	    (udev->default_ep_desc.wMaxPacketSize[0] !=
+	    udev->ddesc.bMaxPacketSize)) {
+
+		udev->default_ep_desc.wMaxPacketSize[0] =
+		    udev->ddesc.bMaxPacketSize;
+
+		bzero(uc, sizeof(uc));
+
+		uc[0].type = UE_CONTROL;
+		uc[0].endpoint = 0x00;	/* Control pipe */
+		uc[0].direction = UE_DIR_ANY;
+		uc[0].bufsize = 1024;	/* bytes */
+		uc[0].flags.proxy_buffer = 1;
+		uc[0].flags.short_xfer_ok = 1;
+		uc[0].cb[USB_MODE_HOST] = &usbd_do_request_callback;
+		uc[0].cb[USB_MODE_DEVICE] = &usbd_serve_request_callback;
+
+		usbd_transfer_unsetup(udev->default_xfer, 1);
+
+		if (usbd_transfer_setup
+		    (udev, 0, udev->default_xfer, uc, 1,
+		    NULL, udev->default_mtx)) {
+			PRINTFN(0, ("Could not setup default "
+			    "USB transfer!\n"));
 		}
-		return;
 	}
+	return;
 }
 
 /*------------------------------------------------------------------------*
@@ -2254,7 +2313,6 @@
     uint32_t flags, uint16_t *actlen, uint32_t timeout)
 {
 	struct usbd_xfer *xfer;
-	struct usbd_config uc[1];
 	const void *desc;
 	uint32_t level = 0;
 	uint32_t start_ticks;
@@ -2277,6 +2335,13 @@
 	    req->wIndex[1], req->wIndex[0],
 	    req->wLength[1], req->wLength[0]));
 
+	/*
+	 * Set "actlen" to a known value in case the caller does not
+	 * check the return value:
+	 */
+	if (actlen) {
+		*actlen = 0;
+	}
 	if (udev->usb_mode == USB_MODE_DEVICE) {
 		PRINTFN(0, ("USB device mode\n"));
 		(udev->usb_temp_get_desc) (udev, mtx, req, &desc, &temp);
@@ -2295,9 +2360,6 @@
 		bcopy(desc, data, length);
 		return (0);		/* success */
 	}
-	if (actlen) {
-		(*actlen) = 0;
-	}
 	/*
 	 * Drop any mutex:
 	 */
@@ -2321,39 +2383,16 @@
 	sx_xlock(udev->default_sx);
 
 	/*
-	 * Check if we need to setup a new USB transfer:
+	 * Setup a new USB transfer or use the existing one, if any:
 	 */
+	usbd_default_transfer_setup(udev);
 
-	if ((udev->default_xfer[0] == NULL) ||
-	    (udev->default_xfer[0]->address != udev->address) ||
-	    (udev->default_ep_desc.wMaxPacketSize[0] !=
-	    udev->ddesc.bMaxPacketSize)) {
-
-		udev->default_ep_desc.wMaxPacketSize[0] =
-		    udev->ddesc.bMaxPacketSize;
-
-		bzero(uc, sizeof(uc));
-
-		uc[0].type = UE_CONTROL;
-		uc[0].endpoint = 0x00;	/* Control pipe */
-		uc[0].direction = UE_DIR_ANY;
-		uc[0].bufsize = 1024;	/* bytes */
-		uc[0].flags.proxy_buffer = 1;
-		uc[0].flags.short_xfer_ok = 1;
-		uc[0].cb[USB_MODE_HOST] = &usbd_do_request_callback;
-
-		usbd_transfer_unsetup(udev->default_xfer, 1);
-
-		err = usbd_transfer_setup
-		    (udev, 0, udev->default_xfer, uc, 1,
-		    NULL, udev->default_mtx);
-
-		if (err) {
-			goto done;
-		}
+	xfer = udev->default_xfer[0];
+	if (xfer == NULL) {
+		/* most likely out of memory */
+		err = USBD_NOMEM;
+		goto done;
 	}
-	xfer = udev->default_xfer[0];
-
 	mtx_lock(xfer->priv_mtx);
 
 	if ((flags & USBD_USE_POLLING) || cold) {

From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 22:40:07 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CF1B416A41A; Sat,  8 Dec 2007 22:40: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 6A67E16A419
	for ; Sat,  8 Dec 2007 22:40:06 +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 4201413C447
	for ; Sat,  8 Dec 2007 22:40:06 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB8Me66f014659
	for ; Sat, 8 Dec 2007 22:40:06 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB8Me6Kl014656
	for perforce@freebsd.org; Sat, 8 Dec 2007 22:40:06 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Sat, 8 Dec 2007 22:40:06 GMT
Message-Id: <200712082240.lB8Me6Kl014656@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 130514 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.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, 08 Dec 2007 22:40:07 -0000

http://perforce.freebsd.org/chv.cgi?CH=130514

Change 130514 by gonzo@gonzo_jeeves on 2007/12/08 22:39:49

	o Add high-level uart inititalization stuff

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips32/idt/uart_bus_rc32434.c#1 add

Differences ...