From owner-p4-projects@FreeBSD.ORG Sun Jan 25 00:06:38 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 595851065673; Sun, 25 Jan 2009 00:06: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 19A26106564A for ; Sun, 25 Jan 2009 00:06:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 05F8E8FC16 for ; Sun, 25 Jan 2009 00:06:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0P06bBf002029 for ; Sun, 25 Jan 2009 00:06:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0P06b9M002027 for perforce@freebsd.org; Sun, 25 Jan 2009 00:06:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 25 Jan 2009 00:06:37 GMT Message-Id: <200901250006.n0P06b9M002027@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156627 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2009 00:06:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=156627 Change 156627 by rwatson@rwatson_freebsd_capabilities on 2009/01/25 00:05:36 In two places I lost return() calls when breaking out proc_reap() from the remainder of the wait code. Put them back. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exit.c#10 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exit.c#10 (text+ko) ==== @@ -745,6 +745,7 @@ */ PROC_UNLOCK(p); sx_xunlock(&proctree_lock); + return; } PROC_LOCK(q); @@ -768,6 +769,7 @@ cv_broadcast(&p->p_pwait); PROC_UNLOCK(t); sx_xunlock(&proctree_lock); + return; } /* From owner-p4-projects@FreeBSD.ORG Sun Jan 25 00:07:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51B371065677; Sun, 25 Jan 2009 00:07: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 0E4AC106564A for ; Sun, 25 Jan 2009 00:07:39 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EE5C08FC12 for ; Sun, 25 Jan 2009 00:07:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0P07ccI002092 for ; Sun, 25 Jan 2009 00:07:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0P07cQS002090 for perforce@freebsd.org; Sun, 25 Jan 2009 00:07:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 25 Jan 2009 00:07:38 GMT Message-Id: <200901250007.n0P07cQS002090@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156628 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2009 00:07:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=156628 Change 156628 by rwatson@rwatson_freebsd_capabilities on 2009/01/25 00:06:47 When no ELF interpret is loaded, set AT_BASE to NULL rather than setting it to the address we would have used if there had been an interpreter. One might argue that AT_BASE shouldn't be set in this case, but Linux does so, so do it here as well. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/imgact_elf.c#5 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/imgact_elf.c#5 (text+ko) ==== @@ -827,7 +827,8 @@ uprintf("ELF interpreter %s not found\n", interp); return (error); } - } + } else + addr = 0; /* * Construct auxargs table (used by the fixup routine) From owner-p4-projects@FreeBSD.ORG Sun Jan 25 00:50:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE47E1065673; Sun, 25 Jan 2009 00:50: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 6BB51106566C for ; Sun, 25 Jan 2009 00:50:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 582D68FC14 for ; Sun, 25 Jan 2009 00:50:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0P0oMxT019364 for ; Sun, 25 Jan 2009 00:50:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0P0oMnj019362 for perforce@freebsd.org; Sun, 25 Jan 2009 00:50:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 25 Jan 2009 00:50:22 GMT Message-Id: <200901250050.n0P0oMnj019362@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156629 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2009 00:50:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=156629 Change 156629 by rwatson@rwatson_freebsd_capabilities on 2009/01/25 00:49:32 When mapping an object that requires a specific virtual address, use MAP_FIXED in case an earlier object has already been mapped at a fixed address and disturbs mmap's heuristics for placing objects automatically. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/map_object.c#2 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/map_object.c#2 (text+ko) ==== @@ -83,6 +83,7 @@ Elf_Addr bss_vaddr; Elf_Addr bss_vlimit; caddr_t bss_addr; + int mmap_flags; hdr = get_elf_header(fd, path); if (hdr == NULL) @@ -153,8 +154,11 @@ mapsize = base_vlimit - base_vaddr; base_addr = hdr->e_type == ET_EXEC ? (caddr_t) base_vaddr : NULL; + mmap_flags = convert_flags(segs[0]->p_flags); + if (base_addr != NULL) + mmap_flags |= MAP_FIXED; mapbase = mmap(base_addr, mapsize, convert_prot(segs[0]->p_flags), - convert_flags(segs[0]->p_flags), fd, base_offset); + mmap_flags, fd, base_offset); if (mapbase == (caddr_t) -1) { _rtld_error("%s: mmap of entire address space failed: %s", path, strerror(errno)); From owner-p4-projects@FreeBSD.ORG Sun Jan 25 10:42:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49B691065674; Sun, 25 Jan 2009 10:42: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 0513F106566C for ; Sun, 25 Jan 2009 10:42: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 E6FD38FC1F for ; Sun, 25 Jan 2009 10:42:33 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0PAgXrZ086968 for ; Sun, 25 Jan 2009 10:42:33 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0PAgXKY086966 for perforce@freebsd.org; Sun, 25 Jan 2009 10:42:33 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 25 Jan 2009 10:42:33 GMT Message-Id: <200901251042.n0PAgXKY086966@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 156643 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2009 10:42:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=156643 Change 156643 by hselasky@hselasky_laptop001 on 2009/01/25 10:42:05 Get LibUSBHID into the tree. Affected files ... .. //depot/projects/usb/src/lib/libusbhid/Makefile#1 branch .. //depot/projects/usb/src/lib/libusbhid/data.c#1 branch .. //depot/projects/usb/src/lib/libusbhid/descr.c#1 branch .. //depot/projects/usb/src/lib/libusbhid/parse.c#1 branch .. //depot/projects/usb/src/lib/libusbhid/usage.c#1 branch .. //depot/projects/usb/src/lib/libusbhid/usbhid.3#1 branch .. //depot/projects/usb/src/lib/libusbhid/usbhid.h#1 branch .. //depot/projects/usb/src/lib/libusbhid/usbvar.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jan 25 11:12:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A6B01065675; Sun, 25 Jan 2009 11:12: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 EED6B1065673 for ; Sun, 25 Jan 2009 11:12:03 +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 D22708FC12 for ; Sun, 25 Jan 2009 11:12:03 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0PBC39T091179 for ; Sun, 25 Jan 2009 11:12:03 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0PBC3me091177 for perforce@freebsd.org; Sun, 25 Jan 2009 11:12:03 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 25 Jan 2009 11:12:03 GMT Message-Id: <200901251112.n0PBC3me091177@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 156644 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2009 11:12:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=156644 Change 156644 by hselasky@hselasky_laptop001 on 2009/01/25 11:11:59 Patches to make LibUSBHID work with new USB stack. Affected files ... .. //depot/projects/usb/src/lib/libusbhid/descr.c#2 edit .. //depot/projects/usb/src/lib/libusbhid/usbhid.3#2 edit .. //depot/projects/usb/src/lib/libusbhid/usbhid.h#2 edit Differences ... ==== //depot/projects/usb/src/lib/libusbhid/descr.c#2 (text+ko) ==== @@ -39,21 +39,68 @@ #include #include -#include +#include #include "usbhid.h" #include "usbvar.h" +int +hid_get_report_id(int fd) +{ + int temp = -1; + + if (ioctl(fd, USB_GET_REPORT_ID, &temp) < 0) + return (-1); + + return (temp); +} + report_desc_t hid_get_report_desc(int fd) { - struct usb_ctl_report_desc rep; + struct usb2_gen_descriptor ugd; + report_desc_t rep; + void *data; + int size; + + size = 256; /* be conservative */ + +retry: + + memset(&ugd, 0, sizeof(ugd)); + + data = malloc(size); + if (data == NULL) + return (NULL); + + /* + * We subtract one from size so that the maximum descriptor + * size is 65535 bytes, because "ugd_maxlen" is a 16-bit + * variable! + */ + ugd.ugd_data = data; + ugd.ugd_maxlen = size-1; + if (ioctl(fd, USB_GET_REPORT_DESC, &ugd) < 0) { + /* could not read descriptor */ + free(data); + return (NULL); + } - rep.ucrd_size = 0; - if (ioctl(fd, USB_GET_REPORT_DESC, &rep) < 0) + if (ugd.ugd_maxlen == ugd.ugd_actlen) { + /* buffer is too small */ + free (data); + size *= 4; + if (size <= 65536) + goto retry; + /* maximum reached - should not happen */ return (NULL); + } + + rep = hid_use_report_desc(data, ugd.ugd_actlen); - return hid_use_report_desc(rep.ucrd_data, (unsigned int)rep.ucrd_size); + free(data); + + return (rep); } report_desc_t ==== //depot/projects/usb/src/lib/libusbhid/usbhid.3#2 (text+ko) ==== @@ -32,6 +32,7 @@ .Sh NAME .Nm usbhid , .Nm hid_get_report_desc , +.Nm hid_get_report_id , .Nm hid_use_report_desc , .Nm hid_dispose_report_desc , .Nm hid_start_parse , @@ -51,6 +52,8 @@ .In usbhid.h .Ft report_desc_t .Fn hid_get_report_desc "int file" +.Ft int +.Fn hid_get_report_id "int file" .Ft report_desc_t .Fn hid_use_report_desc "unsigned char *data" "unsigned int size" .Ft void @@ -95,6 +98,8 @@ parsing of the descriptor, translating to/from symbolic names, and data manipulation. .Ss Descriptor Functions +The report descriptor ID can be obtained by calling +.Fn hid_get_report_id . A report descriptor can be obtained by calling .Fn hid_get_report_desc with a file descriptor obtained by opening a ==== //depot/projects/usb/src/lib/libusbhid/usbhid.h#2 (text+ko) ==== @@ -87,6 +87,7 @@ report_desc_t hid_get_report_desc(int file); report_desc_t hid_use_report_desc(unsigned char *data, unsigned int size); void hid_dispose_report_desc(report_desc_t); +int hid_get_report_id(int file); /* Parsing of a HID report descriptor, parse.c: */ hid_data_t hid_start_parse(report_desc_t d, int kindset, int id); From owner-p4-projects@FreeBSD.ORG Sun Jan 25 11:26:19 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D737310656DD; Sun, 25 Jan 2009 11:26: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 89ACB106567D for ; Sun, 25 Jan 2009 11:26:18 +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 5BF5C8FC0A for ; Sun, 25 Jan 2009 11:26:18 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0PBQILS092235 for ; Sun, 25 Jan 2009 11:26:18 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0PBQIRr092233 for perforce@freebsd.org; Sun, 25 Jan 2009 11:26:18 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 25 Jan 2009 11:26:18 GMT Message-Id: <200901251126.n0PBQIRr092233@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 156645 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2009 11:26:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=156645 Change 156645 by hselasky@hselasky_laptop001 on 2009/01/25 11:26:13 All HID ioctl's should go through the HID library! That makes porting easier. Affected files ... .. //depot/projects/usb/src/lib/libusbhid/descr.c#3 edit .. //depot/projects/usb/src/lib/libusbhid/usbhid.3#3 edit .. //depot/projects/usb/src/lib/libusbhid/usbhid.h#3 edit .. //depot/projects/usb/src/usr.bin/usbhidaction/Makefile#1 branch .. //depot/projects/usb/src/usr.bin/usbhidaction/usbhidaction.1#1 branch .. //depot/projects/usb/src/usr.bin/usbhidaction/usbhidaction.c#1 add .. //depot/projects/usb/src/usr.bin/usbhidctl/Makefile#1 branch .. //depot/projects/usb/src/usr.bin/usbhidctl/usbhid.c#1 add .. //depot/projects/usb/src/usr.bin/usbhidctl/usbhidctl.1#1 branch Differences ... ==== //depot/projects/usb/src/lib/libusbhid/descr.c#3 (text+ko) ==== @@ -45,6 +45,12 @@ #include "usbvar.h" int +hid_set_immed(int fd, int enable) +{ + return (ioctl(fd, USB_SET_IMMED, &enable)); +} + +int hid_get_report_id(int fd) { int temp = -1; ==== //depot/projects/usb/src/lib/libusbhid/usbhid.3#3 (text+ko) ==== @@ -54,6 +54,8 @@ .Fn hid_get_report_desc "int file" .Ft int .Fn hid_get_report_id "int file" +.Ft int +.Fn hid_set_immed "int fd" "int enable" .Ft report_desc_t .Fn hid_use_report_desc "unsigned char *data" "unsigned int size" .Ft void @@ -97,6 +99,10 @@ The routines can be divided into four parts: extraction of the descriptor, parsing of the descriptor, translating to/from symbolic names, and data manipulation. +.Ss Synchronous HID operation +Synchronous HID operation can be enabled or disabled by a call to +.Fn hid_set_immed . +The function returns a negative value on failure. .Ss Descriptor Functions The report descriptor ID can be obtained by calling .Fn hid_get_report_id . ==== //depot/projects/usb/src/lib/libusbhid/usbhid.h#3 (text+ko) ==== @@ -88,6 +88,7 @@ report_desc_t hid_use_report_desc(unsigned char *data, unsigned int size); void hid_dispose_report_desc(report_desc_t); int hid_get_report_id(int file); +int hid_set_immed(int fd, int enable); /* Parsing of a HID report descriptor, parse.c: */ hid_data_t hid_start_parse(report_desc_t d, int kindset, int id); From owner-p4-projects@FreeBSD.ORG Sun Jan 25 11:31:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16E0B1065670; Sun, 25 Jan 2009 11:31: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 CB09E106566C for ; Sun, 25 Jan 2009 11:31: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 9E95C8FC08 for ; Sun, 25 Jan 2009 11:31:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0PBVNHX092594 for ; Sun, 25 Jan 2009 11:31:23 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0PBVNs5092592 for perforce@freebsd.org; Sun, 25 Jan 2009 11:31:23 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 25 Jan 2009 11:31:23 GMT Message-Id: <200901251131.n0PBVNs5092592@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 156646 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2009 11:31:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=156646 Change 156646 by hselasky@hselasky_laptop001 on 2009/01/25 11:30:28 The USB HID descriptor file depends on the USB endian file if included separately. Fix that. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_hid.h#6 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_hid.h#6 (text+ko) ==== @@ -29,6 +29,8 @@ #ifndef _USB2_HID_H_ #define _USB2_HID_H_ +#include + #define UR_GET_HID_DESCRIPTOR 0x06 #define UDESC_HID 0x21 #define UDESC_REPORT 0x22 From owner-p4-projects@FreeBSD.ORG Sun Jan 25 12:12:07 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BB2B106566C; Sun, 25 Jan 2009 12:12: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 BFED5106564A for ; Sun, 25 Jan 2009 12:12: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 9380C8FC0A for ; Sun, 25 Jan 2009 12:12:06 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0PCC5ju099028 for ; Sun, 25 Jan 2009 12:12:05 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0PCC5DZ099026 for perforce@freebsd.org; Sun, 25 Jan 2009 12:12:05 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 25 Jan 2009 12:12:05 GMT Message-Id: <200901251212.n0PCC5DZ099026@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 156649 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2009 12:12:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=156649 Change 156649 by hselasky@hselasky_laptop001 on 2009/01/25 12:11:15 USB HID: Fix a corner case. Affected files ... .. //depot/projects/usb/src/lib/libusbhid/descr.c#4 edit Differences ... ==== //depot/projects/usb/src/lib/libusbhid/descr.c#4 (text+ko) ==== @@ -92,7 +92,8 @@ return (NULL); } - if (ugd.ugd_maxlen == ugd.ugd_actlen) { + if ((ugd.ugd_maxlen != 65535) && + (ugd.ugd_maxlen == ugd.ugd_actlen)) { /* buffer is too small */ free (data); size *= 4; From owner-p4-projects@FreeBSD.ORG Sun Jan 25 15:03:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1FC91065672; Sun, 25 Jan 2009 15:03:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 68C20106566C for ; Sun, 25 Jan 2009 15:03:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3AAE98FC2D for ; Sun, 25 Jan 2009 15:03:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0PF337m027058 for ; Sun, 25 Jan 2009 15:03:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0PF33H9027056 for perforce@freebsd.org; Sun, 25 Jan 2009 15:03:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 25 Jan 2009 15:03:03 GMT Message-Id: <200901251503.n0PF33H9027056@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156653 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2009 15:03:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=156653 Change 156653 by rwatson@rwatson_freebsd_capabilities on 2009/01/25 15:02:30 Stub libcapability: capability services library for processes in or interacting with capability mode. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/groff/tmac/mdoc.local#5 edit .. //depot/projects/trustedbsd/capabilities/src/lib/Makefile#5 edit .. //depot/projects/trustedbsd/capabilities/src/share/mk/bsd.libnames.mk#5 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/groff/tmac/mdoc.local#5 (text+ko) ==== @@ -38,6 +38,7 @@ .ds doc-str-Lb-libc_r Reentrant C\~Library (libc_r, \-lc_r) .ds doc-str-Lb-libcalendar Calendar Arithmetic Library (libcalendar, \-lcalendar) .ds doc-str-Lb-libcam Common Access Method User Library (libcam, \-lcam) +.ds doc-str-Lb-libcapability Capability Services Library (libcapability, \-lcapability) .ds doc-str-Lb-libcipher FreeSec Crypt Library (libcipher, \-lcipher) .ds doc-str-Lb-libdevinfo Device and Resource Information Utility Library (libdevinfo, \-ldevinfo) .ds doc-str-Lb-libdevstat Device Statistics Library (libdevstat, \-ldevstat) ==== //depot/projects/trustedbsd/capabilities/src/lib/Makefile#5 (text+ko) ==== @@ -32,7 +32,8 @@ ncurses ${_libnetgraph} libradius librpcsvc libsbuf \ libtacplus libutil ${_libypclnt} libalias libarchive ${_libatm} \ libbegemot ${_libbluetooth} ${_libbsnmp} libbz2 \ - libcalendar libcam libcompat libdevinfo libdevstat libdisk \ + libcalendar libcam libcapability libcompat libdevinfo libdevstat \ + libdisk \ libdwarf libedit libexpat libfetch libftpio libgeom ${_libgpib} \ ${_libgssapi} ${_librpcsec_gss} libipsec \ ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ ==== //depot/projects/trustedbsd/capabilities/src/share/mk/bsd.libnames.mk#5 (text+ko) ==== @@ -30,6 +30,7 @@ LIBC_PIC?= ${DESTDIR}${LIBDIR}/libc_pic.a LIBCALENDAR?= ${DESTDIR}${LIBDIR}/libcalendar.a LIBCAM?= ${DESTDIR}${LIBDIR}/libcam.a +LIBCAP?= ${DESTDIR}${LIBDIR}/libcap.a LIBCOM_ERR?= ${DESTDIR}${LIBDIR}/libcom_err.a LIBCOMPAT?= ${DESTDIR}${LIBDIR}/libcompat.a LIBCRYPT?= ${DESTDIR}${LIBDIR}/libcrypt.a From owner-p4-projects@FreeBSD.ORG Sun Jan 25 15:03:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B4D4E106571E; Sun, 25 Jan 2009 15:03: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 7B92E1065670 for ; Sun, 25 Jan 2009 15:03:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 680A88FC20 for ; Sun, 25 Jan 2009 15:03:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0PF33Xo027063 for ; Sun, 25 Jan 2009 15:03:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0PF33lI027061 for perforce@freebsd.org; Sun, 25 Jan 2009 15:03:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 25 Jan 2009 15:03:03 GMT Message-Id: <200901251503.n0PF33lI027061@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156654 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2009 15:03:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=156654 Change 156654 by rwatson@rwatson_freebsd_capabilities on 2009/01/25 15:03:00 Stub libcapability: capability services library for processes in or interacting with capability mode. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/Makefile#1 add .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/capability.c#1 add .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.3#1 add .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jan 25 15:08:09 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44F8510656DF; Sun, 25 Jan 2009 15:08: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 F2E0410656D6 for ; Sun, 25 Jan 2009 15:08:08 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DE5078FC0C for ; Sun, 25 Jan 2009 15:08:08 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0PF88jP027444 for ; Sun, 25 Jan 2009 15:08:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0PF8898027442 for perforce@freebsd.org; Sun, 25 Jan 2009 15:08:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 25 Jan 2009 15:08:08 GMT Message-Id: <200901251508.n0PF8898027442@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156655 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2009 15:08:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=156655 Change 156655 by rwatson@rwatson_freebsd_capabilities on 2009/01/25 15:07:44 Licenses. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/capability.c#2 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.h#2 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapability/capability.c#2 (text+ko) ==== @@ -1,0 +1,34 @@ +/*- + * Copyright (c) 2009 Robert N. M. Watson + * All rights reserved. + * + * WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED + * ON IN PRODUCTION SYSTEMS. IT WILL BREAK YOUR SOFTWARE IN NEW AND + * UNEXPECTED WAYS. + * + * This software was developed at the University of Cambridge Computer + * Laboratory with support from a grant from Google, Inc. + * + * 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. + * + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapability/capability.c#2 $ + */ ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.h#2 (text+ko) ==== @@ -1,0 +1,39 @@ +/*- + * Copyright (c) 2009 Robert N. M. Watson + * All rights reserved. + * + * WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED + * ON IN PRODUCTION SYSTEMS. IT WILL BREAK YOUR SOFTWARE IN NEW AND + * UNEXPECTED WAYS. + * + * This software was developed at the University of Cambridge Computer + * Laboratory with support from a grant from Google, Inc. + * + * 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. + * + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.h#2 $ + */ + +#ifndef _LIBCAPABILITY_H_ +#define _LIBCAPABILITY_H_ + +#endif /* !_LIBCAPABILITY_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Jan 25 21:39:56 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 486F5106567D; Sun, 25 Jan 2009 21:39: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 4E1001065679 for ; Sun, 25 Jan 2009 21:39:53 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F1FA88FC23 for ; Sun, 25 Jan 2009 21:39:52 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0PLdqfQ084431 for ; Sun, 25 Jan 2009 21:39:52 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0PLdqwe084429 for perforce@freebsd.org; Sun, 25 Jan 2009 21:39:52 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 25 Jan 2009 21:39:52 GMT Message-Id: <200901252139.n0PLdqwe084429@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 156665 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2009 21:40:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=156665 Change 156665 by rene@rene_self on 2009/01/25 21:39:14 solid-state: 47% Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/solid-state/article.sgml#7 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/solid-state/article.sgml#7 (text+ko) ==== @@ -276,38 +276,42 @@ - Building a File System From Scratch + Een bestandssysteem uit het niets opbouwen - Because ATA compatible compact-flash cards are seen by FreeBSD as - normal IDE hard drives, as is a M-Systems &diskonchip; product (when you - are running a kernel with the fla driver built in) you could - theoretically install FreeBSD from the network using the kern and - mfsroot floppies or from a CD. Other than the fact that you should not - write a boot-loader of any kind to the M-Systems device, no special - instructions are needed. + Omdat ATA-compatibele compact-flash-kaarten door &os; als + normale IDE harde schijven worden gezien, wat een M-Systems + &diskonchip; product is (wanneer u een kernel draait met daarin + het stuurprogramma fla ingebouwd), kunt u theoretisch &os; vanaf + het netwerk installeren door de floppies kern en mfsroot of een + CD te gebruiken. Afgezien van het feit dat u geen bootloader van + welke soort dan ook naar het M-Systems apparaat moet schrijven, + zijn er geen speciale instructies nodig. - However, even a small installation of FreeBSD using normal - installation procedures can produce a system in size of greater than 200 - megabytes. Because most people will be using smaller flash memory - devices (128 megabytes is considered fairly large - 32 or even 16 - megabytes is common) an installation using normal mechanisms is not - possible—there is simply not enough disk space for even the - smallest of conventional installations. + Zelfs een kleine installatie van &os; die normale + installatieprocedures gebruikt kan echter een systeem produceren + met een omvang van meer dan 200 MB. Omdat de meeste mensen + kleinere flashgeheugenapparaten zullen gebruiken (128 MB wordt als + redelijk groot gezien - 32 of zelfs 16 MB is gebruikelijk) is een + installatie dat de normale mechanismen gebruikt niet + mogelijk er is simpelweg niet genoeg schijfruimte voor zelfs + de kleinste van de conventionele installaties. - The easiest way to overcome this space limitation is to install - FreeBSD using conventional means to a normal hard disk. After the - installation is complete, pare down the operating system to a size that - will fit onto your flash media, then tar the entire filesystem. The - following steps will guide you through the process of preparing a piece - of flash memory for your tarred filesystem. Remember, because a normal - installation is not being performed, operations such as partitioning, - labeling, file-system creation, etc. need to be performed by hand. In - addition to the kern and mfsroot floppy disks, you will also need to use - the fixit floppy. If you are using a M-Systems &diskonchip;, the kernel - on your kern floppy must have the fla option detailed - in compiled into it. Please see - for instructions on creating a new kernel for - kern.flp. + De gemakkelijkste manier om over deze beperking heen te komen + is om &os; met conventionele middelen naar een normale harde + schijf te installeren. Kleedt, nadat de installatie voltooid is, + het besturingssysteem uit tot een grootte die op uw flashmedium + past, en pak vervolgens het gehele bestandssysteem in. De volgende + stappen leiden u door het proces heen van een normaal flashgeheugen + voorbereiden op uw ingepakte bestandssysteem. Omdat er geen normale + installatie wordt uitgevoerd, moeten bewerkingen zoals partitioneren, + labelen, het aanmaken van bestandssystemen, etc. met de hand + uitgevoerd worden. Naast de floppies kern en mfsroot heeft u ook + de floppy fixit nodig. Als u een M-Systems &diskonchip; gebruikt, + moet de kernel op uw floppy kern de optie fla + zoals uitgelegd in in zich gecompileerd + hebben. Bekijk alstublieft voor + instructies over hoe een nieuwe kernel voor + kern.flp aan te maken. From owner-p4-projects@FreeBSD.ORG Sun Jan 25 22:16:33 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B15F9106566C; Sun, 25 Jan 2009 22:16:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 30F3B1065676 for ; Sun, 25 Jan 2009 22:16:32 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1C50A8FC14 for ; Sun, 25 Jan 2009 22:16:32 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0PMGWf7087991 for ; Sun, 25 Jan 2009 22:16:32 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0PMGUFM087987 for perforce@freebsd.org; Sun, 25 Jan 2009 22:16:30 GMT (envelope-from nwhitehorn@freebsd.org) Date: Sun, 25 Jan 2009 22:16:30 GMT Message-Id: <200901252216.n0PMGUFM087987@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 156666 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2009 22:16:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=156666 Change 156666 by nwhitehorn@nwhitehorn_trantor on 2009/01/25 22:15:34 IFC Affected files ... .. //depot/projects/ppc-g5/Makefile.inc1#5 integrate .. //depot/projects/ppc-g5/ObsoleteFiles.inc#8 integrate .. //depot/projects/ppc-g5/UPDATING#9 integrate .. //depot/projects/ppc-g5/bin/chmod/chmod.1#2 integrate .. //depot/projects/ppc-g5/bin/dd/dd.1#2 integrate .. //depot/projects/ppc-g5/bin/kenv/kenv.1#2 integrate .. //depot/projects/ppc-g5/bin/ln/ln.1#2 integrate .. //depot/projects/ppc-g5/bin/test/test.1#2 integrate .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#3 integrate .. //depot/projects/ppc-g5/contrib/bind9/CHANGES#4 integrate .. //depot/projects/ppc-g5/contrib/bind9/lib/dns/api#4 integrate .. //depot/projects/ppc-g5/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/ppc-g5/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate .. //depot/projects/ppc-g5/contrib/bind9/lib/isc/unix/socket.c#4 integrate .. //depot/projects/ppc-g5/contrib/bind9/version#4 integrate .. //depot/projects/ppc-g5/contrib/csup/GNUmakefile#2 integrate .. //depot/projects/ppc-g5/contrib/csup/Makefile#2 integrate .. //depot/projects/ppc-g5/contrib/csup/TODO#2 integrate .. //depot/projects/ppc-g5/contrib/csup/config.c#2 integrate .. //depot/projects/ppc-g5/contrib/csup/csup.1#2 integrate .. //depot/projects/ppc-g5/contrib/csup/detailer.c#2 integrate .. //depot/projects/ppc-g5/contrib/csup/diff.c#2 integrate .. //depot/projects/ppc-g5/contrib/csup/diff.h#2 integrate .. //depot/projects/ppc-g5/contrib/csup/fattr.c#2 integrate .. //depot/projects/ppc-g5/contrib/csup/fattr.h#2 integrate .. //depot/projects/ppc-g5/contrib/csup/keyword.c#2 integrate .. //depot/projects/ppc-g5/contrib/csup/keyword.h#2 integrate .. //depot/projects/ppc-g5/contrib/csup/lex.rcs.c#1 branch .. //depot/projects/ppc-g5/contrib/csup/lister.c#2 integrate .. //depot/projects/ppc-g5/contrib/csup/misc.c#2 integrate .. //depot/projects/ppc-g5/contrib/csup/misc.h#2 integrate .. //depot/projects/ppc-g5/contrib/csup/mux.c#2 integrate .. //depot/projects/ppc-g5/contrib/csup/proto.c#2 integrate .. //depot/projects/ppc-g5/contrib/csup/proto.h#2 integrate .. //depot/projects/ppc-g5/contrib/csup/rcsfile.c#1 branch .. //depot/projects/ppc-g5/contrib/csup/rcsfile.h#1 branch .. //depot/projects/ppc-g5/contrib/csup/rcsparse.c#1 branch .. //depot/projects/ppc-g5/contrib/csup/rcsparse.h#1 branch .. //depot/projects/ppc-g5/contrib/csup/rcstokenizer.h#1 branch .. //depot/projects/ppc-g5/contrib/csup/rcstokenizer.l#1 branch .. //depot/projects/ppc-g5/contrib/csup/rsyncfile.c#1 branch .. //depot/projects/ppc-g5/contrib/csup/rsyncfile.h#1 branch .. //depot/projects/ppc-g5/contrib/csup/status.c#2 integrate .. //depot/projects/ppc-g5/contrib/csup/stream.c#2 integrate .. //depot/projects/ppc-g5/contrib/csup/stream.h#2 integrate .. //depot/projects/ppc-g5/contrib/csup/updater.c#2 integrate .. //depot/projects/ppc-g5/contrib/lukemftpd/src/extern.h#2 integrate .. //depot/projects/ppc-g5/contrib/lukemftpd/src/ftpcmd.y#2 integrate .. //depot/projects/ppc-g5/contrib/lukemftpd/src/ftpd.c#2 integrate .. //depot/projects/ppc-g5/contrib/ntp/ntpd/ntp_crypto.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/INSTALL#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/NEWS#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/VERSION#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditd/auditd.8#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditd/auditd.c#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditd/auditd_darwin.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditd/auditd_fbsd.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditreduce/auditreduce.c#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bsm/auditd_lib.h#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bsm/libbsm.h#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/configure#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/configure.ac#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libauditd/Makefile.am#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libauditd/Makefile.in#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libauditd/auditd_lib.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libauditd/libauditd.3#1 branch .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/Makefile.am#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/Makefile.in#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/au_domain.3#1 branch .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/au_socket_type.3#1 branch .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/au_token.3#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/bsm_audit.c#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/bsm_domain.c#1 branch .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/bsm_errno.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/bsm_io.c#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/bsm_socket_type.c#1 branch .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/bsm_token.c#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/libbsm.3#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/man/audit_user.5#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/sys/bsm/Makefile.am#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/sys/bsm/Makefile.in#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/sys/bsm/audit.h#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/sys/bsm/audit_domain.h#1 branch .. //depot/projects/ppc-g5/contrib/openbsm/sys/bsm/audit_errno.h#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/sys/bsm/audit_record.h#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/sys/bsm/audit_socket_type.h#1 branch .. //depot/projects/ppc-g5/contrib/openbsm/test/bsm/generate.c#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/E2BIG_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/EACCES_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/EBADF_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/EBUSY_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/ECHILD_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/EDEADLK_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/EEXIST_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/EFAULT_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/EFBIG_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/EINTR_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/EINVAL_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/EIO_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/EISDIR_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/EMFILE_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/EMLINK_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/ENFILE_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/ENODEV_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/ENOENT_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/ENOEXEC_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/ENOMEM_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/ENOSPC_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/ENOTBLK_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/ENOTDIR_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/ENOTTY_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/ENXIO_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/EPERM_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/EPIPE_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/EROFS_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/ESPIPE_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/ESRCH_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/ETXTBSY_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/EXDEV_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/arg32_record#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/data_record#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/data_token#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/file_record#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/in_addr_record#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/ip_record#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/ipc_record#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/iport_record#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/opaque_record#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/path_record#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/process32_record#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/process32ex_record-IPv4#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/process32ex_record-IPv6#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/process64_record#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/process64ex_record-IPv4#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/process64ex_record-IPv6#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/return32_record#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/seq_record#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/socketex_record#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/socketex_token#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/subject32_record#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/subject32ex_record#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/text_record#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/reference/zonename_record#3 integrate .. //depot/projects/ppc-g5/contrib/smbfs/mount_smbfs/mount_smbfs.8#2 integrate .. //depot/projects/ppc-g5/contrib/smbfs/mount_smbfs/mount_smbfs.c#2 integrate .. //depot/projects/ppc-g5/crypto/openssl/apps/speed.c#2 integrate .. //depot/projects/ppc-g5/crypto/openssl/apps/spkac.c#2 integrate .. //depot/projects/ppc-g5/crypto/openssl/apps/verify.c#2 integrate .. //depot/projects/ppc-g5/crypto/openssl/apps/x509.c#2 integrate .. //depot/projects/ppc-g5/crypto/openssl/ssl/s2_clnt.c#2 integrate .. //depot/projects/ppc-g5/crypto/openssl/ssl/s2_srvr.c#2 integrate .. //depot/projects/ppc-g5/crypto/openssl/ssl/s3_clnt.c#2 integrate .. //depot/projects/ppc-g5/crypto/openssl/ssl/s3_srvr.c#2 integrate .. //depot/projects/ppc-g5/crypto/openssl/ssl/ssltest.c#2 integrate .. //depot/projects/ppc-g5/etc/defaults/rc.conf#5 integrate .. //depot/projects/ppc-g5/etc/devd/Makefile#2 integrate .. //depot/projects/ppc-g5/etc/periodic/weekly/Makefile#3 integrate .. //depot/projects/ppc-g5/etc/rc.shutdown#2 integrate .. //depot/projects/ppc-g5/etc/regdomain.xml#3 integrate .. //depot/projects/ppc-g5/games/fortune/datfiles/freebsd-tips#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_iso9660.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_disk.c#7 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/Makefile#6 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test_write_disk_failures.c#1 branch .. //depot/projects/ppc-g5/lib/libarchive/test/test_write_disk_secure.c#3 integrate .. //depot/projects/ppc-g5/lib/libbsm/Makefile#3 integrate .. //depot/projects/ppc-g5/lib/libc/locale/mbstowcs.c#2 integrate .. //depot/projects/ppc-g5/lib/libc/locale/wcsftime.c#2 integrate .. //depot/projects/ppc-g5/lib/libc/locale/wcstombs.c#2 integrate .. //depot/projects/ppc-g5/lib/libc/net/getaddrinfo.3#2 integrate .. //depot/projects/ppc-g5/lib/libc/stdio/fputws.c#2 integrate .. //depot/projects/ppc-g5/lib/libc/stdio/printfcommon.h#1 branch .. //depot/projects/ppc-g5/lib/libc/stdio/vfprintf.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/stdio/vfscanf.c#2 integrate .. //depot/projects/ppc-g5/lib/libc/stdio/vfwprintf.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/stdio/vfwscanf.c#2 integrate .. //depot/projects/ppc-g5/lib/libc/stdio/vswscanf.c#2 integrate .. //depot/projects/ppc-g5/lib/libc/stdio/wsetup.c#2 integrate .. //depot/projects/ppc-g5/lib/libc/string/Makefile.inc#4 integrate .. //depot/projects/ppc-g5/lib/libc/string/ffs.3#3 integrate .. //depot/projects/ppc-g5/lib/libc/string/strlcat.c#2 integrate .. //depot/projects/ppc-g5/lib/libc/string/strlcpy.3#2 integrate .. //depot/projects/ppc-g5/lib/libc/sys/jail.2#3 integrate .. //depot/projects/ppc-g5/lib/libc/sys/timer_create.2#2 integrate .. //depot/projects/ppc-g5/lib/libmd/mdX.3#2 integrate .. //depot/projects/ppc-g5/lib/libstand/bootp.c#3 integrate .. //depot/projects/ppc-g5/lib/libusb20/libusb20.c#3 integrate .. //depot/projects/ppc-g5/lib/msun/src/e_rem_pio2.c#2 integrate .. //depot/projects/ppc-g5/lib/msun/src/e_rem_pio2f.c#2 integrate .. //depot/projects/ppc-g5/lib/msun/src/k_cosf.c#2 integrate .. //depot/projects/ppc-g5/lib/msun/src/k_sinf.c#2 integrate .. //depot/projects/ppc-g5/lib/msun/src/k_tanf.c#2 integrate .. //depot/projects/ppc-g5/lib/msun/src/math.h#2 integrate .. //depot/projects/ppc-g5/libexec/comsat/comsat.c#2 integrate .. //depot/projects/ppc-g5/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate .. //depot/projects/ppc-g5/sbin/fdisk/fdisk.c#4 integrate .. //depot/projects/ppc-g5/sbin/fsck_ffs/fsck.h#2 integrate .. //depot/projects/ppc-g5/sbin/fsck_ffs/fsck_ffs.8#3 integrate .. //depot/projects/ppc-g5/sbin/fsck_ffs/fsutil.c#2 integrate .. //depot/projects/ppc-g5/sbin/fsck_ffs/main.c#3 integrate .. //depot/projects/ppc-g5/sbin/ifconfig/ifconfig.8#6 integrate .. //depot/projects/ppc-g5/sbin/ifconfig/ifconfig.c#4 integrate .. //depot/projects/ppc-g5/sbin/ifconfig/ifieee80211.c#4 integrate .. //depot/projects/ppc-g5/sbin/ipfw/ipfw2.c#6 integrate .. //depot/projects/ppc-g5/sbin/md5/md5.1#3 integrate .. //depot/projects/ppc-g5/sbin/mdconfig/mdconfig.8#2 integrate .. //depot/projects/ppc-g5/sbin/mdconfig/mdconfig.c#2 integrate .. //depot/projects/ppc-g5/sbin/mount/mount.c#4 integrate .. //depot/projects/ppc-g5/sbin/mount_ntfs/mount_ntfs.8#2 integrate .. //depot/projects/ppc-g5/sbin/ping/ping.8#2 integrate .. //depot/projects/ppc-g5/sbin/recoverdisk/recoverdisk.c#2 integrate .. //depot/projects/ppc-g5/sbin/route/route.c#3 integrate .. //depot/projects/ppc-g5/share/examples/cvsup/refuse.README#2 integrate .. //depot/projects/ppc-g5/share/man/man4/Makefile#9 integrate .. //depot/projects/ppc-g5/share/man/man4/ath.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/bce.4#4 integrate .. //depot/projects/ppc-g5/share/man/man4/bge.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/cd.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/cpuctl.4#4 integrate .. //depot/projects/ppc-g5/share/man/man4/gem.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/hme.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/man4.powerpc/Makefile#3 integrate .. //depot/projects/ppc-g5/share/man/man4/man4.powerpc/snd_ai2s.4#1 branch .. //depot/projects/ppc-g5/share/man/man4/man4.powerpc/snd_davbus.4#1 branch .. //depot/projects/ppc-g5/share/man/man4/nge.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/sdhci.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/sk.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/snd_hda.4#7 integrate .. //depot/projects/ppc-g5/share/man/man4/snd_ich.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/sysmouse.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/urtw.4#1 branch .. //depot/projects/ppc-g5/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/ppc-g5/share/man/man7/build.7#2 integrate .. //depot/projects/ppc-g5/share/man/man7/ports.7#3 integrate .. //depot/projects/ppc-g5/share/man/man7/tuning.7#2 integrate .. //depot/projects/ppc-g5/share/man/man9/insmntque.9#3 integrate .. //depot/projects/ppc-g5/share/man/man9/redzone.9#2 integrate .. //depot/projects/ppc-g5/share/misc/bsd-family-tree#4 integrate .. //depot/projects/ppc-g5/share/misc/pci_vendors#2 integrate .. //depot/projects/ppc-g5/share/mk/bsd.own.mk#3 integrate .. //depot/projects/ppc-g5/share/zoneinfo/asia#4 integrate .. //depot/projects/ppc-g5/share/zoneinfo/backward#2 integrate .. //depot/projects/ppc-g5/share/zoneinfo/europe#3 integrate .. //depot/projects/ppc-g5/share/zoneinfo/leapseconds#2 integrate .. //depot/projects/ppc-g5/share/zoneinfo/northamerica#2 integrate .. //depot/projects/ppc-g5/share/zoneinfo/zone.tab#4 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/amd64_mem.c#3 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/cpu_switch.S#3 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/identcpu.c#6 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/initcpu.c#4 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/msi.c#3 integrate .. //depot/projects/ppc-g5/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/ppc-g5/sys/amd64/conf/USB2#2 integrate .. //depot/projects/ppc-g5/sys/amd64/include/cputypes.h#3 integrate .. //depot/projects/ppc-g5/sys/amd64/include/md_var.h#4 integrate .. //depot/projects/ppc-g5/sys/amd64/include/specialreg.h#5 integrate .. //depot/projects/ppc-g5/sys/arm/arm/cpufunc.c#4 integrate .. //depot/projects/ppc-g5/sys/arm/arm/cpufunc_asm_feroceon.S#2 delete .. //depot/projects/ppc-g5/sys/arm/arm/cpufunc_asm_sheeva.S#1 branch .. //depot/projects/ppc-g5/sys/arm/arm/elf_trampoline.c#3 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91.c#5 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_mci.c#8 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_twi.c#3 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_twireg.h#3 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91var.h#3 integrate .. //depot/projects/ppc-g5/sys/arm/at91/uart_bus_at91usart.c#3 integrate .. //depot/projects/ppc-g5/sys/arm/at91/uart_cpu_at91rm9200usart.c#3 integrate .. //depot/projects/ppc-g5/sys/arm/at91/uart_dev_at91usart.c#5 integrate .. //depot/projects/ppc-g5/sys/arm/include/cpufunc.h#3 integrate .. //depot/projects/ppc-g5/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/mv/common.c#3 integrate .. //depot/projects/ppc-g5/sys/arm/mv/discovery/db78xxx.c#3 integrate .. //depot/projects/ppc-g5/sys/arm/mv/discovery/discovery.c#3 integrate .. //depot/projects/ppc-g5/sys/arm/mv/files.mv#3 integrate .. //depot/projects/ppc-g5/sys/arm/mv/gpio.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/mv/kirkwood/db88f6xxx.c#3 integrate .. //depot/projects/ppc-g5/sys/arm/mv/kirkwood/kirkwood.c#3 integrate .. //depot/projects/ppc-g5/sys/arm/mv/mv_machdep.c#4 integrate .. //depot/projects/ppc-g5/sys/arm/mv/mv_pci.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/mv/mvreg.h#3 integrate .. //depot/projects/ppc-g5/sys/arm/mv/mvvar.h#3 integrate .. //depot/projects/ppc-g5/sys/arm/mv/obio.c#3 integrate .. //depot/projects/ppc-g5/sys/arm/mv/orion/db88f5xxx.c#3 integrate .. //depot/projects/ppc-g5/sys/arm/mv/orion/orion.c#3 integrate .. //depot/projects/ppc-g5/sys/arm/xscale/i8134x/i81342_mcu.c#2 integrate .. //depot/projects/ppc-g5/sys/boot/common/load.c#2 delete .. //depot/projects/ppc-g5/sys/boot/forth/loader.4th#2 integrate .. //depot/projects/ppc-g5/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/ppc-g5/sys/boot/forth/pnp.4th#2 integrate .. //depot/projects/ppc-g5/sys/boot/forth/support.4th#3 integrate .. //depot/projects/ppc-g5/sys/boot/i386/libi386/bootinfo64.c#3 integrate .. //depot/projects/ppc-g5/sys/bsm/audit.h#4 integrate .. //depot/projects/ppc-g5/sys/bsm/audit_domain.h#1 branch .. //depot/projects/ppc-g5/sys/bsm/audit_errno.h#2 integrate .. //depot/projects/ppc-g5/sys/bsm/audit_internal.h#5 integrate .. //depot/projects/ppc-g5/sys/bsm/audit_kevents.h#4 integrate .. //depot/projects/ppc-g5/sys/bsm/audit_record.h#5 integrate .. //depot/projects/ppc-g5/sys/bsm/audit_socket_type.h#1 branch .. //depot/projects/ppc-g5/sys/cam/cam_periph.c#3 integrate .. //depot/projects/ppc-g5/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/ppc-g5/sys/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/ppc-g5/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/ppc-g5/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/ppc-g5/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/ppc-g5/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/ppc-g5/sys/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/ppc-g5/sys/cam/scsi/scsi_pass.c#4 integrate .. //depot/projects/ppc-g5/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/ppc-g5/sys/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/ppc-g5/sys/cam/scsi/scsi_ses.c#3 integrate .. //depot/projects/ppc-g5/sys/cam/scsi/scsi_sg.c#4 integrate .. //depot/projects/ppc-g5/sys/compat/linprocfs/linprocfs.c#10 integrate .. //depot/projects/ppc-g5/sys/conf/Makefile.arm#4 integrate .. //depot/projects/ppc-g5/sys/conf/NOTES#8 integrate .. //depot/projects/ppc-g5/sys/conf/files#11 integrate .. //depot/projects/ppc-g5/sys/conf/files.amd64#6 integrate .. //depot/projects/ppc-g5/sys/conf/files.i386#7 integrate .. //depot/projects/ppc-g5/sys/conf/files.pc98#5 integrate .. //depot/projects/ppc-g5/sys/conf/files.powerpc#14 integrate .. //depot/projects/ppc-g5/sys/conf/kern.post.mk#2 integrate .. //depot/projects/ppc-g5/sys/conf/kern.pre.mk#4 integrate .. //depot/projects/ppc-g5/sys/conf/newvers.sh#3 integrate .. //depot/projects/ppc-g5/sys/conf/options#9 integrate .. //depot/projects/ppc-g5/sys/contrib/altq/altq/altq_subr.c#4 integrate .. //depot/projects/ppc-g5/sys/contrib/pf/net/pf_ioctl.c#5 integrate .. //depot/projects/ppc-g5/sys/crypto/via/padlock.c#3 integrate .. //depot/projects/ppc-g5/sys/crypto/via/padlock_hash.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/adb/adb_kbd.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/agp/agp_amd64.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/agp/agp_via.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ata/ata-queue.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ah_regdomain.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_rate/amrr/amrr.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_rate/onoe/onoe.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ath/if_ath.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/ath/if_ath_pci.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/if_athvar.h#6 integrate .. //depot/projects/ppc-g5/sys/dev/bce/if_bce.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/dcons/dcons_crom.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/digi/con.CX-IBM.h#2 delete .. //depot/projects/ppc-g5/sys/dev/digi/con.CX.h#2 delete .. //depot/projects/ppc-g5/sys/dev/digi/con.EPCX.h#2 delete .. //depot/projects/ppc-g5/sys/dev/digi/con.MBank.h#2 delete .. //depot/projects/ppc-g5/sys/dev/e1000/if_igb.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/exca/exca.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/iicbus/ad7418.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/iicbus/ds1672.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/iicbus/icee.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/md/md.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/mge/if_mge.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/mge/if_mgevar.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/mmc/mmc.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/mpt/mpt_user.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/msk/if_msk.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/msk/if_mskreg.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/ofw_iicbus.c#1 branch .. //depot/projects/ppc-g5/sys/dev/pccard/pccardvar.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/pci/pci.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/if_plip.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/immio.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/lpbb.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/lpt.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/pcfclock.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/ppb_1284.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/ppb_base.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/ppb_msq.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/ppbconf.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/ppbconf.h#5 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/ppi.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/pps.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/vpo.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/vpoio.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ppc/ppc.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/ppc/ppc_acpi.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ppc/ppc_isa.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ppc/ppc_pci.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ppc/ppc_puc.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ppc/ppcreg.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/ppc/ppcvar.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/re/if_re.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/sound/macio/aoa.c#1 branch .. //depot/projects/ppc-g5/sys/dev/sound/macio/aoa.h#1 branch .. //depot/projects/ppc-g5/sys/dev/sound/macio/davbus.c#1 branch .. //depot/projects/ppc-g5/sys/dev/sound/macio/davbusreg.h#1 branch .. //depot/projects/ppc-g5/sys/dev/sound/macio/i2s.c#1 branch .. //depot/projects/ppc-g5/sys/dev/sound/macio/snapper.c#1 branch .. //depot/projects/ppc-g5/sys/dev/sound/macio/tumbler.c#1 branch .. //depot/projects/ppc-g5/sys/dev/sound/pci/au88x0.c#2 delete .. //depot/projects/ppc-g5/sys/dev/sound/pci/au88x0.h#2 delete .. //depot/projects/ppc-g5/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/sound/pci/hda/hdac.c#10 integrate .. //depot/projects/ppc-g5/sys/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/sound/pcm/mixer.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/speaker/spkr.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/syscons/teken/sequences#2 integrate .. //depot/projects/ppc-g5/sys/dev/syscons/teken/teken.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/syscons/teken/teken.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/syscons/teken/teken_demo.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/syscons/teken/teken_scs.h#1 branch .. //depot/projects/ppc-g5/sys/dev/syscons/teken/teken_subr.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/syscons/teken/teken_subr_compat.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/uart/uart_cpu_mv.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/ehci.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb/ehci_mbus.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb/ehci_pci.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb/if_urtw.c#1 branch .. //depot/projects/ppc-g5/sys/dev/usb/if_urtwreg.h#1 branch .. //depot/projects/ppc-g5/sys/dev/usb/if_urtwvar.h#1 branch .. //depot/projects/ppc-g5/sys/dev/usb/uftdi.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb/uhci_pci.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usbdevs#10 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usbdi.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/bluetooth/ng_ubt2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/bluetooth/ng_ubt2_var.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/bluetooth/ubtbcmfw2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/at91dci.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/at91dci.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/at91dci_atmelarm.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/atmegadci.c#1 branch .. //depot/projects/ppc-g5/sys/dev/usb2/controller/atmegadci.h#1 branch .. //depot/projects/ppc-g5/sys/dev/usb2/controller/atmegadci_atmelarm.c#1 branch .. //depot/projects/ppc-g5/sys/dev/usb2/controller/ehci2.c#7 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/ehci2.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/ehci2_pci.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/musb2_otg.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/musb2_otg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/musb2_otg_atmelarm.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/ohci2.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/ohci2.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/ohci2_atmelarm.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/ohci2_pci.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/uhci2.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/uhci2.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/uhci2_pci.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/usb2_bus.h#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/usb2_controller.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/usb2_controller.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/uss820dci.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/uss820dci.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/uss820dci_atmelarm.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_busdma.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_compat_linux.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_core.h#6 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_debug.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_device.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_generic.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_handle_request.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_hub.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_mbuf.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_parse.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_request.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_sw_transfer.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_transfer.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_transfer.h#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_aue2.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_aue2_reg.h#2 delete .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_auereg.h#1 branch .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_axe2.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_axe2_reg.h#3 delete .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_axereg.h#1 branch .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_cdce2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_cdce2_reg.h#2 delete .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_cdcereg.h#1 branch .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_cue2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_cue2_reg.h#2 delete .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_cuereg.h#1 branch .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_kue2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_kue2_fw.h#2 delete .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_kue2_reg.h#2 delete .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_kuefw.h#1 branch .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_kuereg.h#1 branch .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_rue2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_rue2_reg.h#2 delete .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_ruereg.h#1 branch .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_udav2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_udav2_reg.h#2 delete .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_udavreg.h#1 branch .. //depot/projects/ppc-g5/sys/dev/usb2/image/uscanner2.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/usb2_defs.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/usb2_devid.h#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/usb2_devtable.h#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/usb2_standard.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/input/uhid2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/input/ukbd2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/input/ums2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/misc/ufm2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/u3g2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uark2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/ubsa2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/ubser2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uchcom2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/ucycom2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/ufoma2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uftdi2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/ugensa2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uipaq2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/ulpt2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/umct2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/umodem2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/umoscom2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uplcom2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/usb2_serial.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/usb2_serial.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uvisor2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uvscom2.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/sound/uaudio2.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/storage/ata-usb2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/storage/umass2.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/storage/urio2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_rum2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_rum2_fw.h#2 delete .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_rum2_reg.h#2 delete .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_rum2_var.h#2 delete .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_rumfw.h#1 branch .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_rumreg.h#1 branch .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_rumvar.h#1 branch .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_ural2.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_ural2_reg.h#2 delete .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_ural2_var.h#2 delete .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_uralreg.h#1 branch .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_uralvar.h#1 branch .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_zyd2.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_zyd2_fw.h#2 delete .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_zyd2_reg.h#3 delete .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_zydfw.h#1 branch .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_zydreg.h#1 branch .. //depot/projects/ppc-g5/sys/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/ppc-g5/sys/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/ppc-g5/sys/fs/msdosfs/msdosfs_denode.c#3 integrate .. //depot/projects/ppc-g5/sys/fs/pseudofs/pseudofs_vncache.c#4 integrate .. //depot/projects/ppc-g5/sys/geom/geom_dev.c#4 integrate .. //depot/projects/ppc-g5/sys/geom/geom_vfs.c#4 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part.c#6 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_vtoc8.c#3 integrate .. //depot/projects/ppc-g5/sys/gnu/fs/ext2fs/ext2_fs.h#2 integrate .. //depot/projects/ppc-g5/sys/gnu/fs/ext2fs/ext2_fs_sb.h#2 integrate .. //depot/projects/ppc-g5/sys/gnu/fs/ext2fs/ext2_inode.c#4 integrate .. //depot/projects/ppc-g5/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#2 integrate .. //depot/projects/ppc-g5/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate .. //depot/projects/ppc-g5/sys/i386/conf/GENERIC#8 integrate .. //depot/projects/ppc-g5/sys/i386/conf/USB2#2 integrate .. //depot/projects/ppc-g5/sys/i386/cpufreq/est.c#4 integrate .. //depot/projects/ppc-g5/sys/i386/cpufreq/smist.c#3 integrate .. //depot/projects/ppc-g5/sys/i386/i386/i686_mem.c#3 integrate .. //depot/projects/ppc-g5/sys/i386/i386/identcpu.c#6 integrate .. //depot/projects/ppc-g5/sys/i386/i386/initcpu.c#4 integrate .. //depot/projects/ppc-g5/sys/i386/i386/msi.c#3 integrate .. //depot/projects/ppc-g5/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/imgact_elf.c#4 integrate .. //depot/projects/ppc-g5/sys/kern/kern_clock.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_jail.c#9 integrate .. //depot/projects/ppc-g5/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_proc.c#9 integrate .. //depot/projects/ppc-g5/sys/kern/kern_synch.c#4 integrate .. //depot/projects/ppc-g5/sys/kern/kern_sysctl.c#5 integrate .. //depot/projects/ppc-g5/sys/kern/kern_timeout.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/sched_ule.c#5 integrate .. //depot/projects/ppc-g5/sys/kern/subr_pcpu.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/subr_witness.c#7 integrate .. //depot/projects/ppc-g5/sys/kern/sys_generic.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/tty.c#9 integrate .. //depot/projects/ppc-g5/sys/kern/tty_pty.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/uipc_mbuf.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_cache.c#6 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_extattr.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_syscalls.c#6 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_vnops.c#7 integrate .. //depot/projects/ppc-g5/sys/kern/vnode_if.src#5 integrate .. //depot/projects/ppc-g5/sys/mips/idt/idtpci.c#3 integrate .. //depot/projects/ppc-g5/sys/mips/include/pmap.h#2 integrate .. //depot/projects/ppc-g5/sys/mips/malta/gt_pci.c#4 integrate .. //depot/projects/ppc-g5/sys/mips/mips/busdma_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/mips/mips/cpu.c#2 integrate .. //depot/projects/ppc-g5/sys/mips/mips/machdep.c#4 integrate .. //depot/projects/ppc-g5/sys/mips/mips/nexus.c#2 integrate .. //depot/projects/ppc-g5/sys/mips/mips/pmap.c#5 integrate .. //depot/projects/ppc-g5/sys/modules/Makefile#9 integrate .. //depot/projects/ppc-g5/sys/modules/agp/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/iwnfw/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/sound/driver/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/sound/driver/ai2s/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/sound/driver/au88x0/Makefile#2 delete .. //depot/projects/ppc-g5/sys/modules/sound/driver/davbus/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/urtw/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/usb2/controller_atmegadci/Makefile#1 branch .. //depot/projects/ppc-g5/sys/net/if.c#9 integrate .. //depot/projects/ppc-g5/sys/net/if_loop.c#4 integrate .. //depot/projects/ppc-g5/sys/net/route.h#7 integrate .. //depot/projects/ppc-g5/sys/net/rtsock.c#8 integrate .. //depot/projects/ppc-g5/sys/net80211/_ieee80211.h#4 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211.c#5 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211.h#4 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_adhoc.c#4 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_ddb.c#7 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_freebsd.c#5 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_input.c#5 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_input.h#2 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_ioctl.c#7 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_ioctl.h#4 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_node.c#7 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_node.h#6 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_output.c#7 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_proto.h#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_regdomain.c#4 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_scan.h#2 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_scan_sta.c#6 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_tdma.c#1 branch .. //depot/projects/ppc-g5/sys/net80211/ieee80211_tdma.h#1 branch .. //depot/projects/ppc-g5/sys/net80211/ieee80211_var.h#6 integrate .. //depot/projects/ppc-g5/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_deflate.c#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_iface.c#6 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_iface.h#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_mppc.c#5 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_ppp.c#3 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_pred1.c#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_vjc.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/in.c#8 integrate .. //depot/projects/ppc-g5/sys/netinet/in.h#4 integrate .. //depot/projects/ppc-g5/sys/netinet/in_pcb.c#9 integrate .. //depot/projects/ppc-g5/sys/netinet/in_pcb.h#8 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_output.c#6 integrate .. //depot/projects/ppc-g5/sys/netinet/libalias/alias_ftp.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/libalias/alias_irc.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/libalias/alias_nbt.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/raw_ip.c#8 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_input.c#9 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_subr.c#10 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_syncache.c#8 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_timer.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_var.h#6 integrate .. //depot/projects/ppc-g5/sys/netinet/udp_usrreq.c#7 integrate .. //depot/projects/ppc-g5/sys/netinet/udp_var.h#3 integrate .. //depot/projects/ppc-g5/sys/netinet/vinet.h#4 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6.c#8 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_gif.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_ifattach.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet6/raw_ip6.c#7 integrate .. //depot/projects/ppc-g5/sys/netinet6/udp6_usrreq.c#9 integrate .. //depot/projects/ppc-g5/sys/netipsec/xform_ipip.c#5 integrate .. //depot/projects/ppc-g5/sys/nfsclient/nfs_vnops.c#7 integrate .. //depot/projects/ppc-g5/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/ppc-g5/sys/pci/if_rlreg.h#6 integrate .. //depot/projects/ppc-g5/sys/powerpc/booke/locore.S#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/booke/machdep.c#6 integrate .. //depot/projects/ppc-g5/sys/powerpc/booke/pmap.c#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/booke/support.S#2 delete .. //depot/projects/ppc-g5/sys/powerpc/booke/trap_subr.S#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/conf/NOTES#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/pcpu.h#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/pmap.h#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/pte.h#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/tlb.h#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/ata_macio.c#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/kiic.c#1 branch .. //depot/projects/ppc-g5/sys/powerpc/powermac/macgpio.c#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/macio.c#10 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/genassym.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/intr_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/security/audit/audit.h#3 integrate .. //depot/projects/ppc-g5/sys/security/audit/audit_bsm_domain.c#1 branch .. //depot/projects/ppc-g5/sys/security/audit/audit_bsm_errno.c#2 integrate .. //depot/projects/ppc-g5/sys/security/audit/audit_bsm_socket_type.c#1 branch .. //depot/projects/ppc-g5/sys/security/audit/audit_bsm_token.c#5 integrate .. //depot/projects/ppc-g5/sys/security/audit/audit_pipe.c#5 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_audit.c#2 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_framework.c#2 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_inet6.c#3 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_policy.h#3 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_priv.c#2 integrate .. //depot/projects/ppc-g5/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/ppc-g5/sys/security/mac_bsdextended/mac_bsdextended.c#6 integrate .. //depot/projects/ppc-g5/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/ppc-g5/sys/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/ppc-g5/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/ppc-g5/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/ppc-g5/sys/security/mac_partition/mac_partition.c#3 integrate .. //depot/projects/ppc-g5/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/ppc-g5/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 integrate .. //depot/projects/ppc-g5/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/ppc-g5/sys/security/mac_test/mac_test.c#3 integrate .. //depot/projects/ppc-g5/sys/sun4v/include/pcpu.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/jail.h#4 integrate .. //depot/projects/ppc-g5/sys/sys/ktr.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/lock.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/mbuf.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/param.h#9 integrate .. //depot/projects/ppc-g5/sys/sys/pcpu.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/protosw.h#4 integrate .. //depot/projects/ppc-g5/sys/sys/sched.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/soundcard.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/sysctl.h#5 integrate .. //depot/projects/ppc-g5/sys/sys/vnode.h#8 integrate .. //depot/projects/ppc-g5/sys/ufs/ffs/ffs_inode.c#5 integrate .. //depot/projects/ppc-g5/sys/ufs/ffs/ffs_vfsops.c#6 integrate .. //depot/projects/ppc-g5/sys/ufs/ffs/ffs_vnops.c#4 integrate .. //depot/projects/ppc-g5/sys/ufs/ufs/ufs_dirhash.c#5 integrate .. //depot/projects/ppc-g5/sys/ufs/ufs/ufs_extattr.c#4 integrate .. //depot/projects/ppc-g5/sys/ufs/ufs/ufs_lookup.c#4 integrate .. //depot/projects/ppc-g5/sys/ufs/ufs/ufs_vnops.c#6 integrate .. //depot/projects/ppc-g5/sys/vm/uma.h#3 integrate .. //depot/projects/ppc-g5/sys/vm/uma_core.c#2 integrate .. //depot/projects/ppc-g5/sys/vm/uma_dbg.c#2 integrate .. //depot/projects/ppc-g5/sys/vm/uma_int.h#2 integrate .. //depot/projects/ppc-g5/sys/vm/vm_meter.c#2 integrate .. //depot/projects/ppc-g5/sys/vm/vm_mmap.c#5 integrate .. //depot/projects/ppc-g5/tools/regression/fstest/tests/conf#3 integrate .. //depot/projects/ppc-g5/tools/regression/fstest/tests/misc.sh#4 integrate .. //depot/projects/ppc-g5/tools/regression/usr.bin/jot/regress.sh#2 integrate .. //depot/projects/ppc-g5/tools/regression/usr.bin/jot/regress.wX.out#2 delete .. //depot/projects/ppc-g5/tools/regression/usr.bin/jot/regress.wX1.out#1 branch .. //depot/projects/ppc-g5/tools/sched/schedgraph.py#2 integrate .. //depot/projects/ppc-g5/tools/tools/ath/Makefile#3 integrate .. //depot/projects/ppc-g5/tools/tools/ath/Makefile.inc#2 integrate .. //depot/projects/ppc-g5/tools/tools/ath/athdebug/athdebug.c#3 integrate .. //depot/projects/ppc-g5/tools/tools/ath/athrd/Makefile#1 branch .. //depot/projects/ppc-g5/tools/tools/ath/athrd/athrd.1#1 branch .. //depot/projects/ppc-g5/tools/tools/ath/athrd/athrd.c#1 branch .. //depot/projects/ppc-g5/tools/tools/ath/athrd/run.sh#1 branch .. //depot/projects/ppc-g5/tools/tools/ath/athstats/Makefile#4 integrate .. //depot/projects/ppc-g5/tools/tools/ath/athstats/athstats.c#3 integrate .. //depot/projects/ppc-g5/tools/tools/ath/athstats/main.c#3 integrate .. //depot/projects/ppc-g5/tools/tools/nanobsd/gateworks/Files/root/.profile#1 branch .. //depot/projects/ppc-g5/tools/tools/nanobsd/gateworks/G2348#1 branch .. //depot/projects/ppc-g5/tools/tools/nanobsd/gateworks/G2358#1 branch .. //depot/projects/ppc-g5/tools/tools/nanobsd/gateworks/avila#1 branch .. //depot/projects/ppc-g5/tools/tools/nanobsd/gateworks/cambria#1 branch .. //depot/projects/ppc-g5/tools/tools/nanobsd/gateworks/cfg/motd#1 branch .. //depot/projects/ppc-g5/tools/tools/nanobsd/gateworks/cfg/rc.conf#1 branch .. //depot/projects/ppc-g5/tools/tools/nanobsd/gateworks/cfg/ssh/sshd_config#1 branch .. //depot/projects/ppc-g5/tools/tools/nanobsd/gateworks/common#1 branch .. //depot/projects/ppc-g5/tools/tools/net80211/Makefile#2 integrate .. //depot/projects/ppc-g5/tools/tools/net80211/scripts/setup.tdma-master#1 branch .. //depot/projects/ppc-g5/tools/tools/net80211/scripts/setup.tdma-slave#1 branch .. //depot/projects/ppc-g5/tools/tools/net80211/wlantxtime/Makefile#1 branch .. //depot/projects/ppc-g5/tools/tools/net80211/wlantxtime/wlantxtime.c#1 branch .. //depot/projects/ppc-g5/tools/tools/sysbuild/README#1 branch .. //depot/projects/ppc-g5/tools/tools/sysbuild/sysbuild.sh#1 branch .. //depot/projects/ppc-g5/tools/tools/usb/print-usb-if-vids.sh#2 integrate .. //depot/projects/ppc-g5/usr.bin/csplit/csplit.1#3 integrate .. //depot/projects/ppc-g5/usr.bin/csup/Makefile#2 integrate .. //depot/projects/ppc-g5/usr.bin/fetch/fetch.c#5 integrate .. //depot/projects/ppc-g5/usr.bin/gprof/gprof.c#2 integrate .. //depot/projects/ppc-g5/usr.bin/mail/Makefile#2 integrate .. //depot/projects/ppc-g5/usr.bin/mail/aux.c#2 delete .. //depot/projects/ppc-g5/usr.bin/mail/util.c#1 branch .. //depot/projects/ppc-g5/usr.bin/make/Makefile#2 integrate .. //depot/projects/ppc-g5/usr.bin/make/buf.c#2 integrate .. //depot/projects/ppc-g5/usr.bin/make/job.c#5 integrate .. //depot/projects/ppc-g5/usr.bin/make/main.c#4 integrate .. //depot/projects/ppc-g5/usr.bin/make/suff.c#3 integrate .. //depot/projects/ppc-g5/usr.bin/make/var.c#3 integrate .. //depot/projects/ppc-g5/usr.bin/netstat/inet6.c#3 integrate .. //depot/projects/ppc-g5/usr.bin/netstat/main.c#5 integrate .. //depot/projects/ppc-g5/usr.bin/netstat/netstat.1#2 integrate .. //depot/projects/ppc-g5/usr.bin/split/split.1#2 integrate .. //depot/projects/ppc-g5/usr.bin/truss/truss.1#2 integrate .. //depot/projects/ppc-g5/usr.sbin/boot0cfg/boot0cfg.8#3 integrate .. //depot/projects/ppc-g5/usr.sbin/burncd/burncd.c#3 integrate .. //depot/projects/ppc-g5/usr.sbin/cpucontrol/cpucontrol.8#4 integrate .. //depot/projects/ppc-g5/usr.sbin/crunch/crunchgen/crunchgen.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/jail/jail.8#3 integrate .. //depot/projects/ppc-g5/usr.sbin/kldxref/ef_i386.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/kldxref/ef_obj.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/kldxref/fileformat#2 integrate .. //depot/projects/ppc-g5/usr.sbin/kldxref/kldxref.c#3 integrate .. //depot/projects/ppc-g5/usr.sbin/mld6query/mld6query.8#2 integrate .. //depot/projects/ppc-g5/usr.sbin/pkg_install/add/pkg_add.1#3 integrate .. //depot/projects/ppc-g5/usr.sbin/pkg_install/lib/lib.h#3 integrate .. //depot/projects/ppc-g5/usr.sbin/pkg_install/lib/plist.c#3 integrate .. //depot/projects/ppc-g5/usr.sbin/rrenumd/rrenumd.8#2 integrate .. //depot/projects/ppc-g5/usr.sbin/rtadvd/rtadvd.8#2 integrate .. //depot/projects/ppc-g5/usr.sbin/rtsold/rtsold.8#2 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/devices.c#5 integrate .. //depot/projects/ppc-g5/usr.sbin/traceroute6/traceroute6.8#2 integrate .. //depot/projects/ppc-g5/usr.sbin/usbconfig/usbconfig.c#3 integrate .. //depot/projects/ppc-g5/usr.sbin/wlandebug/wlandebug.c#2 integrate Differences ... ==== //depot/projects/ppc-g5/Makefile.inc1#5 (text+ko) ==== @@ -1,10 +1,11 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.614 2008/11/12 04:43:55 obrien Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.616 2009/01/23 18:23:16 imp Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir # -DNO_CLEAN do not clean at all # -DNO_SHARE do not go into share subdir +# -DKERNFAST define NO_KERNELCONFIG, NO_KERNELCLEAN and NO_KERNELCONFIG # -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel # -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel # -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel @@ -697,6 +698,15 @@ # be set to cross-build, we have to make sure TARGET is set # properly. +.if defined(KERNFAST) +NO_KERNELCLEAN= t +NO_KERNELCONFIG= t +NO_KERNELDEPEND= t +# Shortcut for KERNCONF=Blah -DKERNFAST is now KERNFAST=Blah +.if !defined(KERNCONF) && ${KERNFAST} != "1" +KERNCONF=${KERNFAST} +.endif +.endif .if !defined(KERNCONF) && defined(KERNEL) KERNCONF= ${KERNEL} KERNWARN= ==== //depot/projects/ppc-g5/ObsoleteFiles.inc#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.166 2009/01/03 11:25:50 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.167 2009/01/25 19:03:30 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090122: tzdata2009a import +OLD_FILES+=usr/share/zoneinfo/Asia/Katmandu +# 20090102: file 4.26 import +OLD_FILES+=usr/share/misc/magic.mime +OLD_FILES+=usr/share/misc/magic.mime.mgc # 20081223: bind 9.4.3 import, nsupdate.8 moved to nsupdate.1 OLD_FILES+=usr/share/man/man8/nsupdate.8.gz # 20081223: ipprotosw.h removed ==== //depot/projects/ppc-g5/UPDATING#9 (text+ko) ==== @@ -22,6 +22,20 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090119: + NTFS has been removed from GENERIC kernel on amd64 to match + GENERIC on i386. Should not cause any issues since mount_ntfs(8) + will load ntfs.ko module automatically when NTFS support is + actually needed, unless ntfs.ko is not installed or security + level prohibits loading kernel modules. If either is the case, + "options NTFS" has to be added into kernel config. + +20090115: + TCP Appropriate Byte Counting (RFC 3465) support added to kernel. + New field in struct tcpcb breaks ABI, so bump __FreeBSD_version to + 800061. User space tools that rely on the size of struct tcpcb in + tcp_var.h (e.g. sockstat) need to be recompiled. + 20081225: ng_tty(4) module updated to match the new TTY subsystem. Due to API change, user-level applications must be updated. @@ -1201,4 +1215,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.557 2008/12/25 10:05:00 mav Exp $ +$FreeBSD: src/UPDATING,v 1.559 2009/01/19 17:00:42 sobomax Exp $ ==== //depot/projects/ppc-g5/bin/chmod/chmod.1#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)chmod.1 8.4 (Berkeley) 3/31/94 -.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.40 2006/12/22 07:28:38 ru Exp $ +.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.41 2009/01/23 11:39:00 trhodes Exp $ .\" -.Dd December 22, 2006 +.Dd January 23, 2009 .Dt CHMOD 1 .Os .Sh NAME @@ -281,6 +281,10 @@ ``o'' by itself), in combination with the .Ar perm symbols ``s'' or ``t'', are ignored. +.Pp +The ``w'' permission on directories will permit file creation, relocation, +and copy into that directory. +Files created within the directory itself will inherit its group ID. .Sh EXAMPLES .Bl -tag -width "u=rwx,go=u-w" -compact .It Li 644 @@ -343,4 +347,5 @@ .Sh BUGS There is no .Ar perm -option for the naughty bits. +option for the naughty bits which are ``S'' and +``T'' respectively. ==== //depot/projects/ppc-g5/bin/dd/dd.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 -.\" $FreeBSD: src/bin/dd/dd.1,v 1.31 2005/07/28 18:28:11 keramida Exp $ +.\" $FreeBSD: src/bin/dd/dd.1,v 1.32 2009/01/23 03:46:44 keramida Exp $ .\" .Dd August 15, 2004 .Dt DD 1 @@ -392,6 +392,11 @@ Check for (even) parity errors on a file: .Pp .Dl "dd if=file conv=pareven | cmp -x - file" +.Pp +To create an image of a Mode-1 CD-ROM, which is a commonly used format +for data CD-ROM disks, use a block size of 2048 bytes: +.Pp +.Dl "dd if=/dev/acd0 of=filename.iso bs=2048" .Sh SEE ALSO .Xr cp 1 , .Xr mt 1 , ==== //depot/projects/ppc-g5/bin/kenv/kenv.1#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/kenv/kenv.1,v 1.13 2005/11/17 12:15:22 ru Exp $ +.\" $FreeBSD: src/bin/kenv/kenv.1,v 1.16 2009/01/13 18:25:56 maxim Exp $ .\" -.Dd September 13, 2005 +.Dd January 13, 2009 .Dt KENV 1 .Os .Sh NAME @@ -67,8 +67,28 @@ .Fl q option is set, warnings normally printed as a result of being unable to perform the requested operation will be suppressed. +.Pp +Variables can be added to the kernel environment using the +.Xr /boot/loader.conf +file, or also statically compiled into the kernel using the statement +.Pp +.Dl Ic env Ar filename +.Pp +in the kernel config file. +The file can contain lines of the form +.Pp +.Dl name = "value" # this is a comment +.Pp +where whitespace around name and '=', and +everything after a '#' character, are ignored. Almost any printable +character except '=' is acceptable as part of a name. Quotes +are optional and necessary only if the value contains +whitespace. +.Pp .Sh SEE ALSO .Xr kenv 2 , +.Xr config 5 , +.Xr loader.conf 5 , .Xr loader 8 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 25 23:29:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1A42106567F; Sun, 25 Jan 2009 23:29: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 6B8D3106567A for ; Sun, 25 Jan 2009 23:29:46 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 59A1B8FC13 for ; Sun, 25 Jan 2009 23:29:46 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0PNTkZZ094496 for ; Sun, 25 Jan 2009 23:29:46 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0PNTkl2094494 for perforce@freebsd.org; Sun, 25 Jan 2009 23:29:46 GMT (envelope-from gabor@freebsd.org) Date: Sun, 25 Jan 2009 23:29:46 GMT Message-Id: <200901252329.n0PNTkl2094494@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 156668 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2009 23:29:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=156668 Change 156668 by gabor@gabor_server on 2009/01/25 23:28:52 - Implement --strip-trailing-cr - Remove debug line Affected files ... .. //depot/projects/soc2008/gabor_textproc/diff/diffreg.c#8 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/diff/diffreg.c#8 (text+ko) ==== @@ -779,15 +779,11 @@ (c == '\n' && d == EOF))) { break; } - if ((strip_cr) && - ((c == EOF && d == '\r') || - (c == '\r' && d == EOF))) - break; ctold++; ctnew++; - while ((strip_cr) && (c == '\r')) + while ((strip_cr) && (c == '\r') && (d == '\n')) c = getc(f1); - while ((strip_cr) && (d == '\r')) + while ((strip_cr) && (d == '\r') && (c == '\n')) d = getc(f2); if (bflag && isspace(c) && isspace(d)) { do { @@ -1288,7 +1284,6 @@ * There is a remote possibility that we end up with a zero sum. * Zero is used as an EOF marker, so return 1 instead. */ - printf("HASH: %d\n", (sum == 0 ? 1 : sum)); return (sum == 0 ? 1 : sum); } From owner-p4-projects@FreeBSD.ORG Mon Jan 26 14:58:52 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 264DB10656F1; Mon, 26 Jan 2009 14:58: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 7B11910656F6; Mon, 26 Jan 2009 14:58:49 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 403D68FC1F; Mon, 26 Jan 2009 14:58:49 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (pool-98-109-39-197.nwrknj.fios.verizon.net [98.109.39.197]) by cyrus.watson.org (Postfix) with ESMTPSA id D297146B3C; Mon, 26 Jan 2009 09:58:48 -0500 (EST) Received: from localhost (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.14.3/8.14.3) with ESMTP id n0QEw200078018; Mon, 26 Jan 2009 09:58:43 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Robert Watson Date: Mon, 26 Jan 2009 09:55:15 -0500 User-Agent: KMail/1.9.7 References: <200901242233.n0OMX2f1087796@repoman.freebsd.org> In-Reply-To: <200901242233.n0OMX2f1087796@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200901260955.15418.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Mon, 26 Jan 2009 09:58:43 -0500 (EST) X-Virus-Scanned: ClamAV 0.94.2/8904/Mon Jan 26 08:06:06 2009 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 156624 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Jan 2009 14:58:55 -0000 On Saturday 24 January 2009 5:33:02 pm Robert Watson wrote: > http://perforce.freebsd.org/chv.cgi?CH=156624 > > Change 156624 by rwatson@rwatson_freebsd_capabilities on 2009/01/24 22:33:02 > > After much faldarah, we do want to use rtld_start not > rtld_cap_start. Do use debugging symbols for now. DEBUG_FLAGS is generally a better way to add '-g' to CFLAGS as it causes the binary to not be stripped when installed. You can also use 'make DEBUG_FLAGS=-g' generally to build debug builds of binaries in the tree (including kernel modules). -- John Baldwin From owner-p4-projects@FreeBSD.ORG Mon Jan 26 15:27:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CACBE1065673; Mon, 26 Jan 2009 15:27: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 85677106566C for ; Mon, 26 Jan 2009 15:27:01 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7132A8FC12 for ; Mon, 26 Jan 2009 15:27:01 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0QFR1Ia034260 for ; Mon, 26 Jan 2009 15:27:01 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0QFR1c6034258 for perforce@freebsd.org; Mon, 26 Jan 2009 15:27:01 GMT (envelope-from jhb@freebsd.org) Date: Mon, 26 Jan 2009 15:27:01 GMT Message-Id: <200901261527.n0QFR1c6034258@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 156686 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Jan 2009 15:27:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=156686 Change 156686 by jhb@jhb_jhbbsd on 2009/01/26 15:26:58 IFC @156684 Affected files ... .. //depot/projects/smpng/sys/cam/cam_periph.c#29 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#46 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#29 integrate .. //depot/projects/smpng/sys/dev/iicbus/iic.c#18 integrate .. //depot/projects/smpng/sys/dev/iicbus/iic.h#4 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppbconf.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/macio/aoa.c#1 branch .. //depot/projects/smpng/sys/dev/sound/macio/aoa.h#1 branch .. //depot/projects/smpng/sys/dev/sound/macio/davbus.c#1 branch .. //depot/projects/smpng/sys/dev/sound/macio/davbusreg.h#1 branch .. //depot/projects/smpng/sys/dev/sound/macio/i2s.c#1 branch .. //depot/projects/smpng/sys/dev/sound/macio/snapper.c#1 branch .. //depot/projects/smpng/sys/dev/sound/macio/tumbler.c#1 branch .. //depot/projects/smpng/sys/dev/speaker/spkr.c#6 integrate .. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#47 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#50 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#63 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#62 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#52 integrate .. //depot/projects/smpng/sys/kern/kern_timeout.c#45 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#89 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#92 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#55 integrate .. //depot/projects/smpng/sys/kern/tty.c#82 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#55 integrate .. //depot/projects/smpng/sys/modules/sound/driver/Makefile#12 integrate .. //depot/projects/smpng/sys/modules/sound/driver/ai2s/Makefile#1 branch .. //depot/projects/smpng/sys/modules/sound/driver/davbus/Makefile#1 branch .. //depot/projects/smpng/sys/net/rtsock.c#68 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#40 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#90 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#75 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#56 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#53 integrate .. //depot/projects/smpng/sys/powerpc/conf/NOTES#13 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/intr_machdep.c#18 integrate .. //depot/projects/smpng/sys/security/mac/mac_audit.c#3 integrate .. //depot/projects/smpng/sys/security/mac/mac_framework.c#4 integrate .. //depot/projects/smpng/sys/security/mac/mac_priv.c#3 integrate .. //depot/projects/smpng/sys/sys/jail.h#21 integrate .. //depot/projects/smpng/sys/sys/pcpu.h#24 integrate .. //depot/projects/smpng/sys/vm/uma.h#24 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#75 integrate .. //depot/projects/smpng/sys/vm/uma_dbg.c#16 integrate .. //depot/projects/smpng/sys/vm/uma_int.h#32 integrate Differences ... ==== //depot/projects/smpng/sys/cam/cam_periph.c#29 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.75 2009/01/23 21:03:59 trasz Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.76 2009/01/26 15:01:47 jhb Exp $"); #include #include @@ -326,7 +326,6 @@ int cam_periph_hold(struct cam_periph *periph, int priority) { - struct mtx *mtx; int error; /* @@ -339,14 +338,11 @@ if (cam_periph_acquire(periph) != CAM_REQ_CMP) return (ENXIO); - mtx = periph->sim->mtx; - mtx_assert(mtx, MA_OWNED); - if (mtx == &Giant) - mtx = NULL; - + mtx_assert(periph->sim->mtx, MA_OWNED); while ((periph->flags & CAM_PERIPH_LOCKED) != 0) { periph->flags |= CAM_PERIPH_LOCK_WANTED; - if ((error = msleep(periph, mtx, priority, "caplck", 0)) != 0) { + if ((error = mtx_sleep(periph, periph->sim->mtx, priority, + "caplck", 0)) != 0) { cam_periph_release_locked(periph); return (error); } @@ -767,7 +763,6 @@ cam_periph_getccb(struct cam_periph *periph, u_int32_t priority) { struct ccb_hdr *ccb_h; - struct mtx *mtx; mtx_assert(periph->sim->mtx, MA_OWNED); CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("entering cdgetccb\n")); @@ -780,11 +775,8 @@ && (SLIST_FIRST(&periph->ccb_list)->pinfo.priority == priority)) break; mtx_assert(periph->sim->mtx, MA_OWNED); - if (periph->sim->mtx == &Giant) - mtx = NULL; - else - mtx = periph->sim->mtx; - msleep(&periph->ccb_list, mtx, PRIBIO, "cgticb", 0); + mtx_sleep(&periph->ccb_list, periph->sim->mtx, PRIBIO, "cgticb", + 0); } ccb_h = SLIST_FIRST(&periph->ccb_list); @@ -795,17 +787,12 @@ void cam_periph_ccbwait(union ccb *ccb) { - struct mtx *mtx; struct cam_sim *sim; sim = xpt_path_sim(ccb->ccb_h.path); - if (sim->mtx == &Giant) - mtx = NULL; - else - mtx = sim->mtx; if ((ccb->ccb_h.pinfo.index != CAM_UNQUEUED_INDEX) || ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_INPROG)) - msleep(&ccb->ccb_h.cbfcnp, mtx, PRIBIO, "cbwait", 0); + mtx_sleep(&ccb->ccb_h.cbfcnp, sim->mtx, PRIBIO, "cbwait", 0); } int ==== //depot/projects/smpng/sys/conf/files.powerpc#46 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.91 2009/01/15 02:52:31 nwhitehorn Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.92 2009/01/25 18:20:15 nwhitehorn Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -39,6 +39,11 @@ dev/powermac_nvram/powermac_nvram.c optional powermac_nvram powermac dev/quicc/quicc_bfe_ocp.c optional quicc mpc85xx dev/scc/scc_bfe_macio.c optional scc powermac +dev/sound/macio/aoa.c optional snd_davbus | snd_ai2s powermac +dev/sound/macio/davbus.c optional snd_davbus powermac +dev/sound/macio/i2s.c optional snd_ai2s powermac +dev/sound/macio/snapper.c optional snd_ai2s iicbus powermac +dev/sound/macio/tumbler.c optional snd_ai2s iicbus powermac dev/syscons/scgfbrndr.c optional sc dev/syscons/scterm-teken.c optional sc dev/syscons/scvtb.c optional sc ==== //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#29 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.38 2008/12/02 21:37:28 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.41 2009/01/25 16:52:41 ed Exp $"); #endif #ifdef __FreeBSD__ ==== //depot/projects/smpng/sys/dev/iicbus/iic.c#18 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/iicbus/iic.c,v 1.42 2009/01/15 23:14:59 nwhitehorn Exp $ + * $FreeBSD: src/sys/dev/iicbus/iic.c,v 1.43 2009/01/26 13:53:39 raj Exp $ * */ #include @@ -368,6 +368,11 @@ } free(usrbufs, M_TEMP); break; + + case I2CRPTSTART: + error = iicbus_repeated_start(parent, s->slave, 0); + break; + default: error = ENOTTY; } ==== //depot/projects/smpng/sys/dev/iicbus/iic.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/iicbus/iic.h,v 1.5 2006/11/28 06:51:36 imp Exp $ + * $FreeBSD: src/sys/dev/iicbus/iic.h,v 1.6 2009/01/26 13:53:39 raj Exp $ * */ #ifndef __IIC_H @@ -60,5 +60,6 @@ #define I2CWRITE _IOW('i', 4, struct iiccmd) /* send data */ #define I2CREAD _IOW('i', 5, struct iiccmd) /* receive data */ #define I2CRDWR _IOW('i', 6, struct iic_rdwr_data) /* General read/write interface */ +#define I2CRPTSTART _IOW('i', 7, struct iiccmd) /* repeated start */ #endif ==== //depot/projects/smpng/sys/dev/ppbus/ppbconf.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ppbus/ppbconf.c,v 1.32 2009/01/21 23:10:06 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ppbus/ppbconf.c,v 1.33 2009/01/26 14:12:12 jhb Exp $"); #include "opt_ppb_1284.h" #include @@ -393,8 +393,10 @@ ppb->ppc_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_SHAREABLE); if (ppb->ppc_irq_res != NULL) { + mtx_lock(ppb->ppc_lock); error = BUS_WRITE_IVAR(device_get_parent(dev), dev, PPC_IVAR_INTR_HANDLER, (uintptr_t)&ppbus_intr); + mtx_unlock(ppb->ppc_lock); if (error) { device_printf(dev, "Unable to set interrupt handler\n"); return (error); ==== //depot/projects/smpng/sys/dev/speaker/spkr.c#6 (text+ko) ==== @@ -7,7 +7,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/speaker/spkr.c,v 1.77 2008/09/27 08:51:18 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/speaker/spkr.c,v 1.78 2009/01/25 09:20:59 ed Exp $"); #include #include @@ -419,9 +419,7 @@ (void) printf("spkropen: entering with dev = %s\n", devtoname(dev)); #endif /* DEBUG */ - if (dev2unit(dev) != 0) - return(ENXIO); - else if (spkr_active) + if (spkr_active) return(EBUSY); else { #ifdef DEBUG @@ -444,9 +442,8 @@ printf("spkrwrite: entering with dev = %s, count = %d\n", devtoname(dev), uio->uio_resid); #endif /* DEBUG */ - if (dev2unit(dev) != 0) - return(ENXIO); - else if (uio->uio_resid > (DEV_BSIZE - 1)) /* prevent system crashes */ + + if (uio->uio_resid > (DEV_BSIZE - 1)) /* prevent system crashes */ return(E2BIG); else { unsigned n; @@ -475,15 +472,11 @@ (void) printf("spkrclose: entering with dev = %s\n", devtoname(dev)); #endif /* DEBUG */ - if (dev2unit(dev) != 0) - return(ENXIO); - else { - wakeup(&endtone); - wakeup(&endrest); - free(spkr_inbuf, M_SPKR); - spkr_active = FALSE; - return(0); - } + wakeup(&endtone); + wakeup(&endrest); + free(spkr_inbuf, M_SPKR); + spkr_active = FALSE; + return(0); } static int @@ -499,9 +492,7 @@ devtoname(dev), cmd); #endif /* DEBUG */ - if (dev2unit(dev) != 0) - return(ENXIO); - else if (cmd == SPKRTONE) { + if (cmd == SPKRTONE) { tone_t *tp = (tone_t *)cmdarg; if (tp->frequency == 0) ==== //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#47 (text+ko) ==== @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95 - * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.145 2008/10/23 15:53:51 des Exp $ + * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.146 2009/01/26 14:21:00 kib Exp $ */ #include @@ -423,7 +423,10 @@ struct fifoinfo *fip = vp->v_fifoinfo; ASSERT_VOP_LOCKED(vp, "fifo_close"); - KASSERT(fip != NULL, ("fifo_close: no v_fifoinfo")); + if (fip == NULL) { + printf("fifo_close: no v_fifoinfo %p\n", vp); + return (0); + } if (ap->a_fflag & FREAD) { fip->fi_readers--; if (fip->fi_readers == 0) ==== //depot/projects/smpng/sys/geom/geom_dev.c#50 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/geom_dev.c,v 1.99 2008/09/26 14:19:52 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/geom_dev.c,v 1.100 2009/01/24 18:23:19 ed Exp $"); #include #include @@ -72,25 +72,14 @@ static g_taste_t g_dev_taste; static g_orphan_t g_dev_orphan; -static g_init_t g_dev_init; static struct g_class g_dev_class = { .name = "DEV", .version = G_VERSION, .taste = g_dev_taste, .orphan = g_dev_orphan, - .init = g_dev_init, }; -static struct unrhdr *unithdr; /* Locked by topology */ - -static void -g_dev_init(struct g_class *mp) -{ - - unithdr = new_unrhdr(0, INT_MAX, NULL); -} - void g_dev_print(void) { @@ -126,7 +115,6 @@ struct g_consumer *cp; int error; struct cdev *dev; - u_int unit; g_trace(G_T_TOPOLOGY, "dev_taste(%s,%s)", mp->name, pp->name); g_topology_assert(); @@ -138,8 +126,7 @@ error = g_attach(cp, pp); KASSERT(error == 0, ("g_dev_taste(%s) failed to g_attach, err=%d", pp->name, error)); - unit = alloc_unr(unithdr); - dev = make_dev(&g_dev_cdevsw, unit, + dev = make_dev(&g_dev_cdevsw, 0, UID_ROOT, GID_OPERATOR, 0640, gp->name); if (pp->flags & G_PF_CANDELETE) dev->si_flags |= SI_CANDELETE; @@ -432,7 +419,6 @@ { struct g_geom *gp; struct cdev *dev; - u_int unit; g_topology_assert(); gp = cp->geom; @@ -444,9 +430,7 @@ set_dumper(NULL); /* Destroy the struct cdev *so we get no more requests */ - unit = dev2unit(dev); destroy_dev(dev); - free_unr(unithdr, unit); /* Wait for the cows to come home */ while (cp->nstart != cp->nend) ==== //depot/projects/smpng/sys/kern/imgact_elf.c#63 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/imgact_elf.c,v 1.191 2008/12/17 16:54:29 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/imgact_elf.c,v 1.192 2009/01/25 12:07:43 rwatson Exp $"); #include "opt_compat.h" @@ -822,7 +822,8 @@ uprintf("ELF interpreter %s not found\n", interp); return (error); } - } + } else + addr = 0; /* * Construct auxargs table (used by the fixup routine) ==== //depot/projects/smpng/sys/kern/kern_jail.c#62 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.91 2009/01/04 12:18:18 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.92 2009/01/25 10:11:58 bz Exp $"); #include "opt_ddb.h" #include "opt_inet.h" @@ -812,7 +812,7 @@ * Returns 0 on success, 1 on error. Address returned in NBO. */ int -prison_getip4(struct ucred *cred, struct in_addr *ia) +prison_get_ip4(struct ucred *cred, struct in_addr *ia) { KASSERT(cred != NULL, ("%s: cred is NULL", __func__)); @@ -958,7 +958,7 @@ * Returns 0 on success, 1 on error. */ int -prison_getip6(struct ucred *cred, struct in6_addr *ia6) +prison_get_ip6(struct ucred *cred, struct in6_addr *ia6) { KASSERT(cred != NULL, ("%s: cred is NULL", __func__)); ==== //depot/projects/smpng/sys/kern/kern_malloc.c#52 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_malloc.c,v 1.167 2008/07/05 19:34:33 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_malloc.c,v 1.168 2009/01/25 09:11:24 jeff Exp $"); #include "opt_ddb.h" #include "opt_kdtrace.h" @@ -329,7 +329,6 @@ int indx; caddr_t va; uma_zone_t zone; - uma_keg_t keg; #if defined(DIAGNOSTIC) || defined(DEBUG_REDZONE) unsigned long osize = size; #endif @@ -378,18 +377,16 @@ size = (size & ~KMEM_ZMASK) + KMEM_ZBASE; indx = kmemsize[size >> KMEM_ZSHIFT]; zone = kmemzones[indx].kz_zone; - keg = zone->uz_keg; #ifdef MALLOC_PROFILE krequests[size >> KMEM_ZSHIFT]++; #endif va = uma_zalloc(zone, flags); if (va != NULL) - size = keg->uk_size; + size = zone->uz_size; malloc_type_zone_allocated(mtp, va == NULL ? 0 : size, indx); } else { size = roundup(size, PAGE_SIZE); zone = NULL; - keg = NULL; va = uma_large_malloc(size, flags); malloc_type_allocated(mtp, va == NULL ? 0 : size); } ==== //depot/projects/smpng/sys/kern/kern_timeout.c#45 (text+ko) ==== @@ -35,9 +35,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_timeout.c,v 1.117 2009/01/13 15:56:53 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_timeout.c,v 1.118 2009/01/24 10:22:49 rwatson Exp $"); #include "opt_ddb.h" +#include "opt_kdtrace.h" #include #include @@ -51,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -59,6 +61,14 @@ #include #endif +SDT_PROVIDER_DEFINE(callout_execute); +SDT_PROBE_DEFINE(callout_execute, kernel, , callout_start); +SDT_PROBE_ARGTYPE(callout_execute, kernel, , callout_start, 0, + "struct callout *"); +SDT_PROBE_DEFINE(callout_execute, kernel, , callout_end); +SDT_PROBE_ARGTYPE(callout_execute, kernel, , callout_end, 0, + "struct callout *"); + static int avg_depth; SYSCTL_INT(_debug, OID_AUTO, to_avg_depth, CTLFLAG_RD, &avg_depth, 0, "Average number of items examined per softclock call. Units = 1/1000"); @@ -401,7 +411,11 @@ binuptime(&bt1); #endif THREAD_NO_SLEEPING(); + SDT_PROBE(callout_execute, kernel, , + callout_start, c, 0, 0, 0, 0); c_func(c_arg); + SDT_PROBE(callout_execute, kernel, , + callout_end, c, 0, 0, 0, 0); THREAD_SLEEPING_OK(); #ifdef DIAGNOSTIC binuptime(&bt2); ==== //depot/projects/smpng/sys/kern/sched_4bsd.c#89 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.130 2009/01/17 07:17:57 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.131 2009/01/25 07:35:10 jeff Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_sched.h" @@ -82,7 +82,7 @@ #endif #define NICE_WEIGHT 1 /* Priorities per nice level. */ -#define TS_NAME_LEN (MAXCOMLEN + sizeof(" td ") + sizeof(__STRING(UINT_MAX))) +#define TS_NAME_LEN (MAXCOMLEN + sizeof(" td ") + sizeof(__XSTRING(UINT_MAX))) /* * The schedulable entity that runs a context. ==== //depot/projects/smpng/sys/kern/sched_ule.c#92 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.251 2009/01/17 07:17:57 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.252 2009/01/25 07:35:10 jeff Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -86,8 +86,8 @@ #define KTR_ULE 0 -#define TS_NAME_LEN (MAXCOMLEN + sizeof(" td ") + sizeof(__STRING(UINT_MAX))) -#define TDQ_NAME_LEN (sizeof("sched lock ") + sizeof(__STRING(MAXCPU))) +#define TS_NAME_LEN (MAXCOMLEN + sizeof(" td ") + sizeof(__XSTRING(UINT_MAX))) +#define TDQ_NAME_LEN (sizeof("sched lock ") + sizeof(__XSTRING(MAXCPU))) #define TDQ_LOADNAME_LEN (PCPU_NAME_LEN + sizeof(" load")) /* ==== //depot/projects/smpng/sys/kern/sys_generic.c#55 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sys_generic.c,v 1.165 2008/09/23 14:25:38 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sys_generic.c,v 1.168 2009/01/25 18:38:42 jeff Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -886,6 +886,71 @@ return (error); } +/* + * Convert a select bit set to poll flags. + * + * The backend always returns POLLHUP/POLLERR if appropriate and we + * return this as a set bit in any set. + */ +static int select_flags[3] = { + POLLRDNORM | POLLHUP | POLLERR, + POLLWRNORM | POLLHUP | POLLERR, + POLLRDBAND | POLLHUP | POLLERR +}; + +/* + * Compute the fo_poll flags required for a fd given by the index and + * bit position in the fd_mask array. + */ +static __inline int +selflags(fd_mask **ibits, int idx, int bit) +{ + int flags; + int msk; + + flags = 0; + for (msk = 0; msk < 3; msk++) { + if (ibits[msk] == NULL) + continue; + if ((ibits[msk][idx] & (fd_mask)bit) == 0) + continue; + flags |= select_flags[msk]; + } + return (flags); +} + +/* + * Set the appropriate output bits given a mask of fired events and the + * input bits originally requested. + */ +static __inline int +selsetbits(fd_mask **ibits, fd_mask **obits, int idx, fd_mask bit, int events) +{ + int msk; + int n; + + n = 0; + for (msk = 0; msk < 3; msk++) { + if ((events & select_flags[msk]) == 0) + continue; + if (ibits[msk] == NULL) + continue; + if ((ibits[msk][idx] & bit) == 0) + continue; + /* + * XXX Check for a duplicate set. This can occur because a + * socket calls selrecord() twice for each poll() call + * resulting in two selfds per real fd. selrescan() will + * call selsetbits twice as a result. + */ + if ((obits[msk][idx] & bit) != 0) + continue; + obits[msk][idx] |= bit; + n++; + } + + return (n); +} /* * Traverse the list of fds attached to this thread's seltd and check for @@ -894,18 +959,18 @@ static int selrescan(struct thread *td, fd_mask **ibits, fd_mask **obits) { + struct filedesc *fdp; + struct selinfo *si; struct seltd *stp; struct selfd *sfp; struct selfd *sfn; - struct selinfo *si; struct file *fp; - int msk, fd; - int n = 0; - /* Note: backend also returns POLLHUP/POLLERR if appropriate. */ - static int flag[3] = { POLLRDNORM, POLLWRNORM, POLLRDBAND }; - struct filedesc *fdp = td->td_proc->p_fd; + fd_mask bit; + int fd, ev, n, idx; + fdp = td->td_proc->p_fd; stp = td->td_sel; + n = 0; FILEDESC_SLOCK(fdp); STAILQ_FOREACH_SAFE(sfp, &stp->st_selq, sf_link, sfn) { fd = (int)(uintptr_t)sfp->sf_cookie; @@ -918,18 +983,11 @@ FILEDESC_SUNLOCK(fdp); return (EBADF); } - for (msk = 0; msk < 3; msk++) { - if (ibits[msk] == NULL) - continue; - if ((ibits[msk][fd/NFDBITS] & - ((fd_mask) 1 << (fd % NFDBITS))) == 0) - continue; - if (fo_poll(fp, flag[msk], td->td_ucred, td)) { - obits[msk][(fd)/NFDBITS] |= - ((fd_mask)1 << ((fd) % NFDBITS)); - n++; - } - } + idx = fd / NFDBITS; + bit = (fd_mask)1 << (fd % NFDBITS); + ev = fo_poll(fp, selflags(ibits, idx, bit), td->td_ucred, td); + if (ev != 0) + n += selsetbits(ibits, obits, idx, bit, ev); } FILEDESC_SUNLOCK(fdp); stp->st_flags = 0; @@ -947,38 +1005,33 @@ fd_mask **ibits, **obits; int nfd; { - int msk, i, fd; - fd_mask bits; + struct filedesc *fdp; struct file *fp; - int n = 0; - /* Note: backend also returns POLLHUP/POLLERR if appropriate. */ - static int flag[3] = { POLLRDNORM, POLLWRNORM, POLLRDBAND }; - struct filedesc *fdp = td->td_proc->p_fd; + fd_mask bit; + int ev, flags, end, fd; + int n, idx; + fdp = td->td_proc->p_fd; + n = 0; FILEDESC_SLOCK(fdp); - for (msk = 0; msk < 3; msk++) { - if (ibits[msk] == NULL) - continue; - for (i = 0; i < nfd; i += NFDBITS) { - bits = ibits[msk][i/NFDBITS]; - /* ffs(int mask) not portable, fd_mask is long */ - for (fd = i; bits && fd < nfd; fd++, bits >>= 1) { - if (!(bits & 1)) - continue; - if ((fp = fget_locked(fdp, fd)) == NULL) { - FILEDESC_SUNLOCK(fdp); - return (EBADF); - } - selfdalloc(td, (void *)(uintptr_t)fd); - if (fo_poll(fp, flag[msk], td->td_ucred, - td)) { - obits[msk][(fd)/NFDBITS] |= - ((fd_mask)1 << ((fd) % NFDBITS)); - n++; - } + for (idx = 0, fd = 0; fd < nfd; idx++) { + end = imin(fd + NFDBITS, nfd); + for (bit = 1; fd < end; bit <<= 1, fd++) { + /* Compute the list of events we're interested in. */ + flags = selflags(ibits, idx, bit); + if (flags == 0) + continue; + if ((fp = fget_locked(fdp, fd)) == NULL) { + FILEDESC_SUNLOCK(fdp); + return (EBADF); } + selfdalloc(td, (void *)(uintptr_t)fd); + ev = fo_poll(fp, flags, td->td_ucred, td); + if (ev != 0) + n += selsetbits(ibits, obits, idx, bit, ev); } } + FILEDESC_SUNLOCK(fdp); td->td_retval[0] = n; return (0); ==== //depot/projects/smpng/sys/kern/tty.c#82 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.304 2009/01/02 23:39:29 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.305 2009/01/24 18:20:15 ed Exp $"); #include "opt_compat.h" @@ -1053,7 +1053,7 @@ return (error); } -SYSCTL_PROC(_kern, OID_AUTO, ttys, CTLTYPE_OPAQUE|CTLFLAG_RD, +SYSCTL_PROC(_kern, OID_AUTO, ttys, CTLTYPE_OPAQUE|CTLFLAG_RD|CTLFLAG_NOLOCK, 0, 0, sysctl_kern_ttys, "S,xtty", "List of TTYs"); /* ==== //depot/projects/smpng/sys/kern/tty_pty.c#55 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/tty_pty.c,v 1.161 2008/08/23 16:03:00 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/tty_pty.c,v 1.162 2009/01/25 08:27:11 ed Exp $"); #include #include @@ -55,16 +55,15 @@ static int ptydev_fdopen(struct cdev *dev, int fflags, struct thread *td, struct file *fp) { - int u, error; - char name[] = "ttyXX"; + int error; + char name[6]; /* "ttyXX" */ if (!atomic_cmpset_ptr((uintptr_t *)&dev->si_drv1, 0, 1)) return (EBUSY); /* Generate device name and create PTY. */ - u = dev2unit(dev); - name[3] = u >> 8; - name[4] = u; + strcpy(name, devtoname(dev)); + name[0] = 't'; error = pts_alloc_external(fflags & (FREAD|FWRITE), td, fp, dev, name); if (error != 0) { @@ -93,7 +92,6 @@ pty_clone(void *arg, struct ucred *cr, char *name, int namelen, struct cdev **dev) { - int u; /* Cloning is already satisfied. */ if (*dev != NULL) @@ -114,8 +112,7 @@ return; /* Create the controller device node. */ - u = (unsigned int)name[3] << 8 | name[4]; - *dev = make_dev_credf(MAKEDEV_REF, &ptydev_cdevsw, u, + *dev = make_dev_credf(MAKEDEV_REF, &ptydev_cdevsw, 0, NULL, UID_ROOT, GID_WHEEL, 0666, name); } ==== //depot/projects/smpng/sys/modules/sound/driver/Makefile#12 (text+ko) ==== @@ -1,15 +1,22 @@ -# $FreeBSD: src/sys/modules/sound/driver/Makefile,v 1.26 2008/05/04 16:02:45 marius Exp $ +# $FreeBSD: src/sys/modules/sound/driver/Makefile,v 1.27 2009/01/25 18:20:15 nwhitehorn Exp $ + +SUBDIR= ad1816 als4000 atiixp cs4281 csa ds1 emu10k1 emu10kx +SUBDIR+= envy24 envy24ht es137x ess fm801 hda ich maestro maestro3 +SUBDIR+= neomagic sb16 sb8 sbc solo spicds t4dwave via8233 +SUBDIR+= via82c686 vibes driver uaudio + +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +SUBDIR+= cmi mss +.endif .if ${MACHINE_ARCH} == "sparc64" .if ${MACHINE} == "sparc64" -audiocs= audiocs +SUBDIR+= audiocs +.endif .endif -SUBDIR= ${audiocs} es137x -.else -SUBDIR= ad1816 als4000 atiixp cmi cs4281 csa ds1 emu10k1 emu10kx -SUBDIR+= envy24 envy24ht es137x ess fm801 hda ich maestro maestro3 -SUBDIR+= mss neomagic sb16 sb8 sbc solo spicds t4dwave via8233 -SUBDIR+= via82c686 vibes driver uaudio + +.if ${MACHINE_ARCH} == "powerpc" +SUBDIR+= ai2s davbus .endif .include ==== //depot/projects/smpng/sys/net/rtsock.c#68 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)rtsock.c 8.7 (Berkeley) 10/12/95 - * $FreeBSD: src/sys/net/rtsock.c,v 1.164 2009/01/16 09:01:45 qingli Exp $ + * $FreeBSD: src/sys/net/rtsock.c,v 1.165 2009/01/25 10:11:58 bz Exp $ */ #include "opt_sctp.h" #include "opt_mpath.h" @@ -376,7 +376,7 @@ * 3. As a last resort return the 'default' * jail address. */ - if (prison_getip4(cred, &ia) != 0) + if (prison_get_ip4(cred, &ia) != 0) return (ESRCH); } bzero(&saun->sin, sizeof(struct sockaddr_in)); @@ -428,7 +428,7 @@ * 3. As a last resort return the 'default' * jail address. */ - if (prison_getip6(cred, &ia6) != 0) + if (prison_get_ip6(cred, &ia6) != 0) return (ESRCH); } bzero(&saun->sin6, sizeof(struct sockaddr_in6)); ==== //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#40 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.72 2009/01/11 18:59:14 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.73 2009/01/25 07:31:51 thompsa Exp $"); /* * IEEE 802.11 ioctl support (FreeBSD-specific) @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -3233,6 +3234,8 @@ ieee80211_stop_locked(vap); } IEEE80211_UNLOCK(ic); + /* Wait for parent ioctl handler if it was queued */ + taskqueue_drain(taskqueue_thread, &ic->ic_parent_task); break; case SIOCADDMULTI: case SIOCDELMULTI: ==== //depot/projects/smpng/sys/netinet/in_pcb.c#90 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/in_pcb.c,v 1.239 2009/01/09 18:38:57 adrian Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/in_pcb.c,v 1.240 2009/01/25 10:11:58 bz Exp $"); #include "opt_ddb.h" #include "opt_inet.h" @@ -625,7 +625,7 @@ } /* 3. As a last resort return the 'default' jail address. */ - if (prison_getip4(cred, laddr) != 0) + if (prison_get_ip4(cred, laddr) != 0) error = EADDRNOTAVAIL; goto done; } @@ -678,7 +678,7 @@ } /* 3. As a last resort return the 'default' jail address. */ - if (prison_getip4(cred, laddr) != 0) + if (prison_get_ip4(cred, laddr) != 0) error = EADDRNOTAVAIL; goto done; } @@ -741,7 +741,7 @@ } /* 3. As a last resort return the 'default' jail address. */ - if (prison_getip4(cred, laddr) != 0) + if (prison_get_ip4(cred, laddr) != 0) error = EADDRNOTAVAIL; goto done; } @@ -810,7 +810,7 @@ */ if (faddr.s_addr == INADDR_ANY) { if (cred != NULL && jailed(cred)) { - if (prison_getip4(cred, &jailia) != 0) + if (prison_get_ip4(cred, &jailia) != 0) return (EADDRNOTAVAIL); faddr.s_addr = jailia.s_addr; } else { ==== //depot/projects/smpng/sys/netinet/raw_ip.c#75 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/raw_ip.c,v 1.203 2008/12/16 03:18:59 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/raw_ip.c,v 1.204 2009/01/25 10:11:58 bz Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 26 15:29:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0E9E1065672; Mon, 26 Jan 2009 15:29:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7F4F3106566B for ; Mon, 26 Jan 2009 15:29:03 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6D48C8FC0A for ; Mon, 26 Jan 2009 15:29:03 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0QFT372034390 for ; Mon, 26 Jan 2009 15:29:03 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0QFT3ca034388 for perforce@freebsd.org; Mon, 26 Jan 2009 15:29:03 GMT (envelope-from jhb@freebsd.org) Date: Mon, 26 Jan 2009 15:29:03 GMT Message-Id: <200901261529.n0QFT3ca034388@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 156687 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Jan 2009 15:29:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=156687 Change 156687 by jhb@jhb_jhbbsd on 2009/01/26 15:28:50 Drop these changes. Affected files ... .. //depot/projects/smpng/sys/vm/uma_core.c#76 edit .. //depot/projects/smpng/sys/vm/uma_int.h#33 edit Differences ... ==== //depot/projects/smpng/sys/vm/uma_core.c#76 (text+ko) ==== @@ -1308,7 +1308,10 @@ /* * Initialize keg's lock (shared among zones). */ - KEG_LOCK_INIT(keg, arg->flags & UMA_ZONE_MTXCLASS); + if (arg->flags & UMA_ZONE_MTXCLASS) + KEG_LOCK_INIT(keg, 1); + else + KEG_LOCK_INIT(keg, 0); /* * If we're putting the slab header in the actual page we need to @@ -1403,6 +1406,7 @@ KASSERT(arg->keg != NULL, ("Secondary zone on zero'd keg")); zone->uz_init = arg->uminit; zone->uz_fini = arg->fini; + zone->uz_lock = &keg->uk_lock; zone->uz_flags |= UMA_ZONE_SECONDARY; mtx_lock(&uma_mtx); ZONE_LOCK(zone); ==== //depot/projects/smpng/sys/vm/uma_int.h#33 (text+ko) ==== @@ -358,12 +358,12 @@ mtx_init(&(k)->uk_lock, (k)->uk_name, \ "UMA zone", MTX_DEF | MTX_DUPOK); \ } while (0) + #define KEG_LOCK_FINI(k) mtx_destroy(&(k)->uk_lock) #define KEG_LOCK(k) mtx_lock(&(k)->uk_lock) #define KEG_UNLOCK(k) mtx_unlock(&(k)->uk_lock) - -#define ZONE_LOCK(z) mtx_lock(&(z)->uz_keg->uk_lock) -#define ZONE_UNLOCK(z) mtx_unlock(&(z)->uz_keg->uk_lock) +#define ZONE_LOCK(z) mtx_lock((z)->uz_lock) +#define ZONE_UNLOCK(z) mtx_unlock((z)->uz_lock) /* * Find a slab within a hash table. This is used for OFFPAGE zones to lookup From owner-p4-projects@FreeBSD.ORG Mon Jan 26 15:30:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E8F2C1065676; Mon, 26 Jan 2009 15:30: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 A87FB106566C for ; Mon, 26 Jan 2009 15:30:04 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 963D98FC21 for ; Mon, 26 Jan 2009 15:30:04 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0QFU4NM034485 for ; Mon, 26 Jan 2009 15:30:04 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0QFU4nl034483 for perforce@freebsd.org; Mon, 26 Jan 2009 15:30:04 GMT (envelope-from jhb@freebsd.org) Date: Mon, 26 Jan 2009 15:30:04 GMT Message-Id: <200901261530.n0QFU4nl034483@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 156688 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Jan 2009 15:30:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=156688 Change 156688 by jhb@jhb_jhbbsd on 2009/01/26 15:29:33 Revert this from here. Affected files ... .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#41 edit Differences ... ==== //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#41 (text+ko) ==== @@ -319,9 +319,11 @@ struct g_consumer *cp; struct bufobj *bo; + DROP_GIANT(); g_topology_lock(); error = g_vfs_open(devvp, &cp, "udf", 0); g_topology_unlock(); + PICKUP_GIANT(); VOP_UNLOCK(devvp, 0); if (error) return error; @@ -361,9 +363,11 @@ if (((logical_secsize % cp->provider->sectorsize) != 0) || (logical_secsize < cp->provider->sectorsize)) { + DROP_GIANT(); g_topology_lock(); g_vfs_close(cp); g_topology_unlock(); + PICKUP_GIANT(); return (EINVAL); } @@ -487,9 +491,11 @@ free(udfmp, M_UDFMOUNT); if (bp != NULL) brelse(bp); + DROP_GIANT(); g_topology_lock(); g_vfs_close(cp); g_topology_unlock(); + PICKUP_GIANT(); return error; }; @@ -516,9 +522,11 @@ #endif } + DROP_GIANT(); g_topology_lock(); g_vfs_close(udfmp->im_cp); g_topology_unlock(); + PICKUP_GIANT(); vrele(udfmp->im_devvp); if (udfmp->s_table != NULL) From owner-p4-projects@FreeBSD.ORG Mon Jan 26 15:32:07 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CC4B1065670; Mon, 26 Jan 2009 15:32: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 26D911065679 for ; Mon, 26 Jan 2009 15:32:07 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1494B8FC27 for ; Mon, 26 Jan 2009 15:32:07 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0QFW68d034733 for ; Mon, 26 Jan 2009 15:32:06 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0QFW6Cs034731 for perforce@freebsd.org; Mon, 26 Jan 2009 15:32:06 GMT (envelope-from jhb@freebsd.org) Date: Mon, 26 Jan 2009 15:32:06 GMT Message-Id: <200901261532.n0QFW6Cs034731@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 156691 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Jan 2009 15:32:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=156691 Change 156691 by jhb@jhb_jhbbsd on 2009/01/26 15:32:04 bde@ has better fixes that Ed is looking at. Affected files ... .. //depot/projects/smpng/sys/kern/kern_sig.c#145 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_sig.c#145 (text+ko) ==== @@ -1686,10 +1686,7 @@ return (ESRCH); } AUDIT_ARG(process, p); - if (p->p_pid != 1 && p->p_flag & P_SYSTEM) - error = EPERM; - else - error = p_cansignal(td, p, uap->signum); + error = p_cansignal(td, p, uap->signum); if (error == 0 && uap->signum) psignal(p, uap->signum); PROC_UNLOCK(p); @@ -2486,7 +2483,7 @@ /* * Don't take default actions on system processes. */ - if (p->p_pid <= 1 || p->p_flag & P_SYSTEM) { + if (p->p_pid <= 1) { #ifdef DIAGNOSTIC /* * Are you sure you want to ignore SIGSEGV From owner-p4-projects@FreeBSD.ORG Mon Jan 26 15:58:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7EEBA10656D1; Mon, 26 Jan 2009 15:58: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 34EA010656CF for ; Mon, 26 Jan 2009 15:58:34 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 168728FC1A for ; Mon, 26 Jan 2009 15:58:34 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0QFwX8O036863 for ; Mon, 26 Jan 2009 15:58:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0QFwXgU036861 for perforce@freebsd.org; Mon, 26 Jan 2009 15:58:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 26 Jan 2009 15:58:33 GMT Message-Id: <200901261558.n0QFwXgU036861@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156693 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Jan 2009 15:58:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=156693 Change 156693 by rwatson@rwatson_freebsd_capabilities on 2009/01/26 15:57:58 Implement closefrom(2) based on a combination of bits from Ighighi, NetBSD, DragonflyBSD, and in consideration of the implementation on OpenSolaris. Audit behavior here needs more work: the advantage of the Solaris userspace implementation is that we get one audit event for each fd closed. While here, add missing cap_getmode symbol to the libc symbol table, add missing mlinks for cap calls. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/Makefile.inc#6 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/Symbol.map#13 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#28 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_descrip.c#17 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#28 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.master#17 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#28 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#28 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#28 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#28 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/Makefile.inc#6 (text+ko) ==== @@ -102,6 +102,8 @@ MLINKS+=access.2 eaccess.2 access.2 faccessat.2 MLINKS+=brk.2 sbrk.2 +MLINKS+=cap_enter.2 cap_getmode.2 +MLINKS+=cap_new.2 cap_getrights.2 MLINKS+=chdir.2 fchdir.2 MLINKS+=chflags.2 fchflags.2 chflags.2 lchflags.2 MLINKS+=chmod.2 fchmod.2 chmod.2 fchmodat.2 chmod.2 lchmod.2 ==== //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/Symbol.map#13 (text) ==== @@ -331,9 +331,11 @@ }; FBSD_1.1 { + cap_enter; + cap_getmode; + cap_getrights; cap_new; - cap_getrights; - cap_enter; + closefrom; cpuset; cpuset_getid; cpuset_setid; ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#28 (text+ko) ==== @@ -542,4 +542,5 @@ { AS(pdkill_args), (sy_call_t *)pdkill, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 511 = pdkill */ { AS(pdgetpid_args), (sy_call_t *)pdgetpid, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 512 = pdgetpid */ { AS(pdwait_args), (sy_call_t *)pdwait, AUE_NULL, NULL, 0, 0, 0 }, /* 513 = pdwait */ + { AS(closefrom_args), (sy_call_t *)closefrom, AUE_CLOSEFROM, NULL, 0, 0, 0 }, /* 514 = closefrom */ }; ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_descrip.c#17 (text+ko) ==== @@ -1124,6 +1124,33 @@ return (error); } +static int +kern_closefrom(struct thread *td, int lowfd) +{ + struct filedesc *fdp; + int fd; + + if (lowfd < 0) + return (EBADF); + fdp = td->td_proc->p_fd; + FILEDESC_SLOCK(fdp); + while ((fd = fdp->fd_lastfile) >= lowfd) { + FILEDESC_SUNLOCK(fdp); + if (kern_close(td, fd) == EINTR) + return (EINTR); + FILEDESC_SLOCK(fdp); + } + FILEDESC_SUNLOCK(fdp); + return (0); +} + +int +closefrom(struct thread *td, struct closefrom_args *uap) +{ + + return (kern_closefrom(td, uap->lowfd)); +} + #if defined(COMPAT_43) /* * Return status information about a file descriptor. ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#28 (text+ko) ==== @@ -521,4 +521,5 @@ "pdkill", /* 511 = pdkill */ "pdgetpid", /* 512 = pdgetpid */ "pdwait", /* 513 = pdwait */ + "closefrom", /* 514 = closefrom */ }; ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.master#17 (text+ko) ==== @@ -916,5 +916,7 @@ 513 AUE_NULL STD { int pdwait(int fd, int *status, \ int options, struct rusage *rusage); } +514 AUE_CLOSEFROM STD { int closefrom(int lowfd); } + ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#28 (text+ko) ==== @@ -3101,6 +3101,13 @@ *n_args = 4; break; } + /* closefrom */ + case 514: { + struct closefrom_args *p = params; + iarg[0] = p->lowfd; /* int */ + *n_args = 1; + break; + } default: *n_args = 0; break; @@ -8225,6 +8232,16 @@ break; }; break; + /* closefrom */ + case 514: + switch(ndx) { + case 0: + p = "int"; + break; + default: + break; + }; + break; default: break; }; ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#28 (text+ko) ==== @@ -429,4 +429,5 @@ #define SYS_pdkill 511 #define SYS_pdgetpid 512 #define SYS_pdwait 513 -#define SYS_MAXSYSCALL 514 +#define SYS_closefrom 514 +#define SYS_MAXSYSCALL 515 ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#28 (text+ko) ==== @@ -377,4 +377,5 @@ pdfork.o \ pdkill.o \ pdgetpid.o \ - pdwait.o + pdwait.o \ + closefrom.o ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#28 (text+ko) ==== @@ -1656,6 +1656,9 @@ char options_l_[PADL_(int)]; int options; char options_r_[PADR_(int)]; char rusage_l_[PADL_(struct rusage *)]; struct rusage * rusage; char rusage_r_[PADR_(struct rusage *)]; }; +struct closefrom_args { + char lowfd_l_[PADL_(int)]; int lowfd; char lowfd_r_[PADR_(int)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); int fork(struct thread *, struct fork_args *); @@ -2018,6 +2021,7 @@ int pdkill(struct thread *, struct pdkill_args *); int pdgetpid(struct thread *, struct pdgetpid_args *); int pdwait(struct thread *, struct pdwait_args *); +int closefrom(struct thread *, struct closefrom_args *); #ifdef COMPAT_43 @@ -2619,6 +2623,7 @@ #define SYS_AUE_pdkill AUE_NULL #define SYS_AUE_pdgetpid AUE_NULL #define SYS_AUE_pdwait AUE_NULL +#define SYS_AUE_closefrom AUE_CLOSEFROM #undef PAD_ #undef PADL_ From owner-p4-projects@FreeBSD.ORG Mon Jan 26 17:12:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 157F61065674; Mon, 26 Jan 2009 17:12: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 BBBFE106566C for ; Mon, 26 Jan 2009 17:12: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 A89A48FC12 for ; Mon, 26 Jan 2009 17:12:34 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0QHCYmJ054030 for ; Mon, 26 Jan 2009 17:12:34 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0QHCYYd054028 for perforce@freebsd.org; Mon, 26 Jan 2009 17:12:34 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 26 Jan 2009 17:12:34 GMT Message-Id: <200901261712.n0QHCYYd054028@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 156706 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Jan 2009 17:12:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=156706 Change 156706 by hselasky@hselasky_laptop001 on 2009/01/26 17:11:48 Adjust an UHCI portreset delay. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#25 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#25 (text+ko) ==== @@ -2431,12 +2431,16 @@ x = URWMASK(UREAD2(sc, port)); UWRITE2(sc, port, x & ~UHCI_PORTSC_PR); - if (use_polling) { - /* polling */ - DELAY(1000); - } else { - usb2_pause_mtx(&sc->sc_bus.bus_mtx, 1); - } + + mtx_unlock(&sc->sc_bus.bus_mtx); + + /* + * This delay needs to be exactly 100us, else some USB devices + * fail to attach! + */ + DELAY(100); + + mtx_lock(&sc->sc_bus.bus_mtx); DPRINTFN(4, "uhci port %d reset, status1 = 0x%04x\n", index, UREAD2(sc, port)); From owner-p4-projects@FreeBSD.ORG Mon Jan 26 17:40:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54239106568D; Mon, 26 Jan 2009 17:40:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0E1191065675 for ; Mon, 26 Jan 2009 17:40:03 +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 EE25B8FC1D for ; Mon, 26 Jan 2009 17:40:02 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0QHe2Gq056128 for ; Mon, 26 Jan 2009 17:40:02 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0QHe2u3056126 for perforce@freebsd.org; Mon, 26 Jan 2009 17:40:02 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 26 Jan 2009 17:40:02 GMT Message-Id: <200901261740.n0QHe2u3056126@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 156708 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Jan 2009 17:40:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=156708 Change 156708 by pgj@beehive on 2009/01/26 17:39:49 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#10 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml#11 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#19 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/beech.key#3 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/rafan.key#2 integrate .. //depot/projects/docproj_hu/www/en/community.xsl#6 integrate .. //depot/projects/docproj_hu/www/en/donations/wantlist.sgml#9 integrate .. //depot/projects/docproj_hu/www/en/gnome/images/Makefile#2 integrate .. //depot/projects/docproj_hu/www/en/gnome/images/ss222-1-tn.png#2 delete .. //depot/projects/docproj_hu/www/en/gnome/images/ss222-1.png#2 delete .. //depot/projects/docproj_hu/www/en/gnome/images/ss222-2-tn.png#2 delete .. //depot/projects/docproj_hu/www/en/gnome/images/ss222-2.png#2 delete .. //depot/projects/docproj_hu/www/en/gnome/images/ss222-3-tn.png#2 delete .. //depot/projects/docproj_hu/www/en/gnome/images/ss222-3.png#2 delete .. //depot/projects/docproj_hu/www/en/gnome/images/ss222-4-tn.png#2 delete .. //depot/projects/docproj_hu/www/en/gnome/images/ss222-4.png#2 delete .. //depot/projects/docproj_hu/www/en/gnome/images/ss224-1-tn.png#1 branch .. //depot/projects/docproj_hu/www/en/gnome/images/ss224-1.png#1 branch .. //depot/projects/docproj_hu/www/en/gnome/images/ss224-2-tn.png#1 branch .. //depot/projects/docproj_hu/www/en/gnome/images/ss224-2.png#1 branch .. //depot/projects/docproj_hu/www/en/gnome/screenshots.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/internal/machines.sgml#3 integrate .. //depot/projects/docproj_hu/www/en/smp/index.sgml#3 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#21 integrate .. //depot/projects/docproj_hu/www/share/sgml/events.xml#12 integrate .. //depot/projects/docproj_hu/www/share/sgml/libcommon.xsl#5 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#35 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#10 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -263,6 +263,10 @@ FreeBSD laptop computer mailing list"> freebsd-mobile"> + +Mono and C# applications on FreeBSD"> +freebsd-mono"> + FreeBSD port of the Mozilla browser mailing list"> freebsd-mozilla"> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml#11 (text+ko) ==== @@ -1,7 +1,7 @@ + -sub 1024g/5D7681A3 2007-06-08 +sub 2048g/9F3B61BF 2009-01-23 ]]> ==== //depot/projects/docproj_hu/doc/share/pgpkeys/rafan.key#2 (text+ko) ==== @@ -1,15 +1,14 @@ - + uid Rong-En Fan -uid Rong-En Fan (CSIE, NTU) uid Rong-En Fan -sub 2048g/CC9AC94F 2004-06-04 [expires: 2009-06-03] +sub 2048g/42A8637E 2009-01-25 [expires: 2012-07-08] ]]> ==== //depot/projects/docproj_hu/www/en/community.xsl#6 (text+ko) ==== @@ -6,7 +6,7 @@ ]> - + @@ -47,7 +47,9 @@

There are more than one hundred mailing - lists and several , dozens of web-based forums, and + several newsgroups available. There are over - + @@ -404,6 +404,13 @@ 802.11a (5GHz) accesspoint with WPA2 Hopefully improve WiFi in 2.4GHz-infested apartment building. + + + rui + Portugal + Intel Mac, possibly Mac Mini for a small shipment fee + EFI support under FreeBSD and other Mac development work. + &footer; ==== //depot/projects/docproj_hu/www/en/gnome/images/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/gnome/images/Makefile,v 1.53 2008/04/09 05:03:07 marcus Exp $ +# $FreeBSD: www/en/gnome/images/Makefile,v 1.54 2009/01/18 23:52:33 marcus Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -19,14 +19,10 @@ # E.g. the fourth screenshot for GNOME 2.6 is ss26-4.png, and the thumbnail # is ss26-4-tn.png -DATA= ss222-1.png -DATA+= ss222-1-tn.png -DATA+= ss222-2.png -DATA+= ss222-2-tn.png -DATA+= ss222-3.png -DATA+= ss222-3-tn.png -DATA+= ss222-4.png -DATA+= ss222-4-tn.png +DATA= ss224-1.png +DATA+= ss224-1-tn.png +DATA+= ss224-2.png +DATA+= ss224-2-tn.png DATA+= gnome.png # FreeBSD GNOME Vanity Project ==== //depot/projects/docproj_hu/www/en/gnome/screenshots.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -15,42 +15,26 @@

GNOME &gnomever; Screenshots

-

A GNOME &gnomever; Desktop showing off cheese, the Apple - Photobooth-like webcam application and the new VNC client, - vinagre.
- GNOME &gnomever; Screen + <p><b>A GNOME &gnomever; Desktop showing off the Gimp, the + System Monitor applet, and the multi-byte, fully + internationalized power of GNOME.</b><br> + <a href=GNOME &gnomever; Screen Shot 1
- Contributed by Joe Marcus Clarke <marcus |at| FreeBSD.org - >

+ Contributed by Denise H. G. <darcsis |at| + gmail.com>

-

A GNOME &gnomever; Desktop showing off both automatic - blank CD-R detection, and USB flash drive mounting; the Brasero - disc authoring application; a ConsoleKit session record; and - PolicyKit requesting the password to gain administrative - access.
- GNOME &gnomever; Screen + <p><b>GNOME &gnomever; within GNOME &gnomever;! This is a + GNOME &gnomever; Desktop running vinagre connected to another + GNOME &gnomever; Desktop running Epiphany. The main desktop + is also sporting the Anjuta IDE, the new Empathy IM client, and + showing off the SMB network browsing capability along with the + internationalized clock applet.</b><br> + <a href=GNOME &gnomever; Screen Shot 2
- Contributed by <mezz |at| FreeBSD.org - >

- -

GNOME &gnomever; running the Totem Web Browser plugin in - Firefox and visiting the Apple Trailers website.
- GNOME &gnomever; Screen - Shot 3
- Contributed by <mezz |at| FreeBSD.org - >

- -

GNOME &gnomever; showing off the new international clock - applet, Cheese, and GNOME System Monitor's new resource - graph.
- GNOME - &gnomever; Screen Shot 4
- Contributed by Lachlan Michael <lachlan |at| - lkla.org>

+ Contributed by Joe Marcus Clarke <marcus |at| + FreeBSD.org>

&footer; ==== //depot/projects/docproj_hu/www/en/internal/machines.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -47,7 +47,7 @@ ftp-master -6-STABLE +7-STABLE FTP Master (stage server). peter/kuriyama/obrien/steve ==== //depot/projects/docproj_hu/www/en/smp/index.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -201,29 +201,29 @@ primitives can be found here:


-

In addition, the old SPL man page may be of interest, as it reflects the previous SMP synchronization model.

+

In addition, the old SPL man page may be of interest, as it reflects the previous SMP synchronization model.

  • ==== //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#21 (text+ko) ==== @@ -1,5 +1,5 @@ - + +
    - (, ) + + (, ) +

    ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#35 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.219 2009/01/12 17:02:43 marcus Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.220 2009/01/17 09:06:01 murray Exp $ @@ -36,6 +36,20 @@ 1 + 17 + + + FreeBSD Kernel Internals Video Posted + +

    The first lecture from Kirk McKusick's full + length FreeBSD + Kernel Internals course has been posted to + the BSD + Conferences channel + on YouTube.

    +     +     + 9 From owner-p4-projects@FreeBSD.ORG Mon Jan 26 18:38:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5D531065670; Mon, 26 Jan 2009 18:38:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9428B106564A for ; Mon, 26 Jan 2009 18:38:02 +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 811048FC25 for ; Mon, 26 Jan 2009 18:38:02 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0QIc2Ah064026 for ; Mon, 26 Jan 2009 18:38:02 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0QIc20u064024 for perforce@freebsd.org; Mon, 26 Jan 2009 18:38:02 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 26 Jan 2009 18:38:02 GMT Message-Id: <200901261838.n0QIc20u064024@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 156714 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Jan 2009 18:38:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=156714 Change 156714 by pgj@beehive on 2009/01/26 18:37:57 MFen (doc): 1.236 -> 1.237 hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml 1.196 -> 1.197 hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml 1.287 -> 1.288 hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml 1.32 -> 1.33 hu_HU.ISO8859-2/books/fdp-primer/book.sgml 1.17 -> 1.18 hu_HU.ISO8859-2/books/fdp-primer/examples/appendix.sgml 1.10 -> 1.11 hu_HU.ISO8859-2/books/fdp-primer/psgml-mode/chapter.sgml 1.13 -> 1.15 hu_HU.ISO8859-2/books/fdp-primer/see-also/chapter.sgml 1.18 -> 1.19 hu_HU.ISO8859-2/books/fdp-primer/structure/chapter.sgml 1.26 -> 1.27 hu_HU.ISO8859-2/books/fdp-primer/the-website/chapter.sgml 1.48 -> 1.49 hu_HU.ISO8859-2/books/fdp-primer/writing-style/chapter.sgml 1.66 -> 1.67 hu_HU.ISO8859-2/share/sgml/mailing-lists.ent Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/book.sgml#11 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/examples/appendix.sgml#5 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/psgml-mode/chapter.sgml#5 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/see-also/chapter.sgml#6 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/structure/chapter.sgml#7 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/the-website/chapter.sgml#5 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/writing-style/chapter.sgml#6 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#17 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml#22 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml#18 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/mailing-lists.ent#21 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/book.sgml#11 (text+ko) ==== @@ -33,7 +33,7 @@ 2006 2007 2008 + 2009 DocEng ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/examples/appendix.sgml#5 (text+ko) ==== @@ -33,7 +33,7 @@ ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/psgml-mode/chapter.sgml#5 (text+ko) ==== @@ -33,7 +33,7 @@ @@ -45,7 +45,7 @@ XEmacs újabb változataihoz tartozik egy psgml nevû, nagyon hasznos csomag (a Portgyûjteménybõl a editors/psgml portból + role="package">editors/psgml portból telepíthetjük fel). Ez a kiegészítés vagy az .sgml állományok megnyitásakor töltõdik be ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/see-also/chapter.sgml#6 (text+ko) ==== @@ -33,7 +33,7 @@ @@ -74,7 +74,7 @@ Könnyed + url="http://www-sul.stanford.edu/tools/tutorials/html2.0/gentle.html">Könnyed bevezetés az SGML használatába (angolul) @@ -128,7 +128,7 @@ - A Linux + A Linux Dokumentációs Projekt honlapja ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/structure/chapter.sgml#7 (text+ko) ==== @@ -33,7 +33,7 @@ @@ -332,20 +332,16 @@ volt egy szinten, és az adott chapter elemek id tulajdonságának megfelelõen került - elnevezésre. A könyvtárak - létrehozásával a kézikönyv - szervezésének további - átalakításait kívántuk - elõkészíteni. Itt - különösen gondolunk arra, hogy ezzel - szeretnénk lehetõvé tenni képek - hozzáadását az egyes fejezetekhez. - Véleményünk szerint sokkal több - értelme van ugyanis a képeket a fejezetek - forrásával együtt egy külön - könyvtárban tárolni, mintsem az - összes képet és szöveget egyetlen - nagy könyvtárban összeömleszteni. A + elnevezésre. Az egyes fejezetekhez most már + külön-külön tudunk képeket + csatolni, amelyeket a fejezeteknek megfelelõ + könyvtárban kell elhelyezni a share/images/books/handbook + könyvtáron belül. Ha honosítani + akarjuk a képeket, akkor viszont ügyeljünk + arra, hogy az adott fejezet könyvtárába, + az SGML források mellé tegyük a + lefordított képeket. A névütközés egy idõ után úgyis elkerülhetetlenné válik, és sok, kevés állományt ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/the-website/chapter.sgml#5 (text+ko) ==== @@ -33,7 +33,7 @@ @@ -493,6 +493,23 @@ + WEB_LANG + + + Ha beállítottuk, akkor a www könyvtáron + belül csak a benne megadott nyelvekhez tartozó + könyvtárak fognak + elõállítódni. Az angol + kivétel tehát ilyenkor minden más nyelv + kimarad a feldolgozásból. + Például: + + &prompt.root; make WEB_LANG="el es hu nl" all install + + + + NOPORTSCVS @@ -510,8 +527,9 @@ - A WEB_ONLY, ENGLISH_ONLY - és NOPORTSCVS változók a + A WEB_ONLY, WEB_LANG, + ENGLISH_ONLY és + NOPORTSCVS változók a make programhoz tartoznak. Ezek értékét az /etc/make.conf állományban, ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/writing-style/chapter.sgml#6 (text+ko) ==== @@ -33,7 +33,7 @@ ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#17 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -1238,6 +1238,17 @@ hálózati neve. + + + DOCDIR + + + Az elkészült dokumentáció + telepítésének helye. Ez + alapértelmezés szerint a /usr/share/doc. + + A folyamathoz kapcsolódóan további ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml#22 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -473,6 +473,12 @@ + &a.mono.name; + Mono és C# alkalmazások + &os; alatt + + + &a.mozilla.name; A Mozilla átültetése &os;-re @@ -1722,6 +1728,29 @@ + &a.mono.name; + + + Mono és C# alkalmazások &os; + alatt + + Ezen a levelezési listán a Mono + fejlesztõi keretrendszer &os; alatt futó + változatával kapcsolatos + megbeszélések folynak. Ez egy szakmai + jellegû lista. Itt a Mono vagy más C# + alkalmazások &os; változatának + elkészítésén dolgozó + egyének tudnak problémákat felvetni + vagy megvitatni a különbözõ + megoldásokat. Rajtuk kívül viszont + szeretettel várunk minden + érdeklõdõt a téma + iránt. + + + + &a.openoffice.name; ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml#18 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -2104,7 +2104,7 @@ figyelembe! Kifejezetten a freebsd-ports@FreeBSD.org + role="nolink">ports@FreeBSD.org karbantartóval rendelkezõ portoknak nincs rendes gazdája. A hozzájuk kapcsolódó javítások és ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/mailing-lists.ent#21 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -269,6 +269,10 @@ FreeBSD laptop computer levelezési lista"> freebsd-mobile"> + +FreeBSD Mono és C# alkalmazások levelezési lista"> +freebsd-mono"> + FreeBSD port of the Mozilla browser levelezési lista"> freebsd-mozilla"> From owner-p4-projects@FreeBSD.ORG Mon Jan 26 19:02:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5A751065694; Mon, 26 Jan 2009 19:02: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 60E031065675 for ; Mon, 26 Jan 2009 19:02:27 +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 4F4758FC23 for ; Mon, 26 Jan 2009 19:02:27 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0QJ2RY7066044 for ; Mon, 26 Jan 2009 19:02:27 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0QJ2R1N066042 for perforce@freebsd.org; Mon, 26 Jan 2009 19:02:27 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 26 Jan 2009 19:02:27 GMT Message-Id: <200901261902.n0QJ2R1N066042@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 156715 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Jan 2009 19:02:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=156715 Change 156715 by pgj@beehive on 2009/01/26 19:01:56 MFen (www): 1.7 -> 1.9 hu/community.xsl Affected files ... .. //depot/projects/docproj_hu/www/hu/community.xsl#9 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/community.xsl#9 (text+ko) ==== @@ -11,7 +11,7 @@ Több mint száz levelezési - lista és számos , tucatnyi fórum, + és számos hírcsoport áll rendelkezésre. Ezenkívül Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54D3F1065673; Tue, 27 Jan 2009 05:13: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 03852106566B for ; Tue, 27 Jan 2009 05:13: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 E370A8FC1F for ; Tue, 27 Jan 2009 05:13:51 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0R5DpoD053798 for ; Tue, 27 Jan 2009 05:13:51 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0R5Dp6H053796 for perforce@freebsd.org; Tue, 27 Jan 2009 05:13:51 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 27 Jan 2009 05:13:51 GMT Message-Id: <200901270513.n0R5Dp6H053796@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 156734 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Jan 2009 05:13:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=156734 Change 156734 by hselasky@hselasky_laptop001 on 2009/01/27 05:13:00 IFC @ 156733 Affected files ... .. //depot/projects/usb/src/share/man/man4/usb2_bluetooth.4#2 integrate .. //depot/projects/usb/src/share/man/man4/usb2_controller.4#2 integrate .. //depot/projects/usb/src/share/man/man4/usb2_core.4#5 integrate .. //depot/projects/usb/src/share/man/man4/usb2_ethernet.4#2 integrate .. //depot/projects/usb/src/share/man/man4/usb2_image.4#2 integrate .. //depot/projects/usb/src/share/man/man4/usb2_input.4#2 integrate .. //depot/projects/usb/src/share/man/man4/usb2_misc.4#2 integrate .. //depot/projects/usb/src/share/man/man4/usb2_ndis.4#2 integrate .. //depot/projects/usb/src/share/man/man4/usb2_quirk.4#2 integrate .. //depot/projects/usb/src/share/man/man4/usb2_serial.4#2 integrate .. //depot/projects/usb/src/share/man/man4/usb2_sound.4#2 integrate .. //depot/projects/usb/src/share/man/man4/usb2_storage.4#2 integrate .. //depot/projects/usb/src/share/man/man4/usb2_template.4#2 integrate .. //depot/projects/usb/src/share/man/man4/usb2_wlan.4#2 integrate .. //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#13 integrate .. //depot/projects/usb/src/sys/arm/at91/at91.c#13 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_mci.c#10 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_twi.c#8 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_twireg.h#4 integrate .. //depot/projects/usb/src/sys/arm/at91/at91var.h#3 integrate .. //depot/projects/usb/src/sys/arm/at91/uart_bus_at91usart.c#3 integrate .. //depot/projects/usb/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#6 integrate .. //depot/projects/usb/src/sys/arm/at91/uart_dev_at91usart.c#11 integrate .. //depot/projects/usb/src/sys/boot/forth/loader.conf#14 integrate .. //depot/projects/usb/src/sys/cam/cam_periph.c#7 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt.c#13 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_low.c#5 integrate .. //depot/projects/usb/src/sys/conf/files.amd64#15 integrate .. //depot/projects/usb/src/sys/conf/files.i386#17 integrate .. //depot/projects/usb/src/sys/conf/files.pc98#14 integrate .. //depot/projects/usb/src/sys/conf/files.powerpc#16 integrate .. //depot/projects/usb/src/sys/conf/kmod.mk#11 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf_ioctl.c#12 integrate .. //depot/projects/usb/src/sys/dev/agp/agp_via.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#14 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iic.c#8 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iic.h#4 integrate .. //depot/projects/usb/src/sys/dev/ppbus/lpt.c#7 integrate .. //depot/projects/usb/src/sys/dev/ppbus/ppbconf.c#10 integrate .. //depot/projects/usb/src/sys/dev/sound/macio/aoa.c#1 branch .. //depot/projects/usb/src/sys/dev/sound/macio/aoa.h#1 branch .. //depot/projects/usb/src/sys/dev/sound/macio/davbus.c#1 branch .. //depot/projects/usb/src/sys/dev/sound/macio/davbusreg.h#1 branch .. //depot/projects/usb/src/sys/dev/sound/macio/i2s.c#1 branch .. //depot/projects/usb/src/sys/dev/sound/macio/snapper.c#1 branch .. //depot/projects/usb/src/sys/dev/sound/macio/tumbler.c#1 branch .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#21 integrate .. //depot/projects/usb/src/sys/dev/speaker/spkr.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/if_urtw.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/if_urtwreg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/if_urtwvar.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usbdevs#41 integrate .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2_var.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#26 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.h#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#35 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#27 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#27 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#28 integrate .. //depot/projects/usb/src/sys/dev/usb2/quirk/usb2_quirk.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/u3g2.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#24 integrate .. //depot/projects/usb/src/sys/fs/fifofs/fifo_vnops.c#7 integrate .. //depot/projects/usb/src/sys/geom/geom_dev.c#9 integrate .. //depot/projects/usb/src/sys/i386/cpufreq/smist.c#5 integrate .. //depot/projects/usb/src/sys/i386/i386/identcpu.c#12 integrate .. //depot/projects/usb/src/sys/kern/imgact_elf.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_jail.c#14 integrate .. //depot/projects/usb/src/sys/kern/kern_malloc.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_proc.c#16 integrate .. //depot/projects/usb/src/sys/kern/kern_sysctl.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_timeout.c#10 integrate .. //depot/projects/usb/src/sys/kern/sched_4bsd.c#11 integrate .. //depot/projects/usb/src/sys/kern/sched_ule.c#14 integrate .. //depot/projects/usb/src/sys/kern/subr_smp.c#9 integrate .. //depot/projects/usb/src/sys/kern/sys_generic.c#10 integrate .. //depot/projects/usb/src/sys/kern/tty.c#15 integrate .. //depot/projects/usb/src/sys/kern/tty_pty.c#8 integrate .. //depot/projects/usb/src/sys/kern/vfs_aio.c#10 integrate .. //depot/projects/usb/src/sys/kern/vfs_cache.c#15 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#16 integrate .. //depot/projects/usb/src/sys/kern/vfs_syscalls.c#15 integrate .. //depot/projects/usb/src/sys/modules/Makefile#26 integrate .. //depot/projects/usb/src/sys/modules/agp/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/sound/driver/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/sound/driver/ai2s/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/sound/driver/davbus/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/urtw/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb2/Makefile#9 integrate .. //depot/projects/usb/src/sys/modules/usb2/bluetooth/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/usb2/bluetooth_fw/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/bluetooth_ng/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller/Makefile#11 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_at91dci/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_atmegadci/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_ehci/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_musb/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_ohci/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_uhci/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_uss820dci/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/core/Makefile#11 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet/Makefile#9 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_aue/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_axe/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_cdce/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_cue/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_dav/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_kue/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_rue/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/image/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/usb2/input/Makefile#9 integrate .. //depot/projects/usb/src/sys/modules/usb2/input_hid/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/input_kbd/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/input_ms/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/misc/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/usb2/misc_dbp/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/misc_fm/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/ndis/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/usb2/quirk/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/usb2/scanner/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_3g/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_ark/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_bsa/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_bser/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_chcom/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_cycom/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_foma/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_ftdi/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_gensa/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_ipaq/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_lpt/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_mct/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_modem/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_moscom/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_plcom/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_visor/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_vscom/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/sound/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/usb2/storage/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/usb2/storage_ata/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/storage_fs/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/storage_mass/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/storage_rio/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/template/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/usb2/wlan/Makefile#9 integrate .. //depot/projects/usb/src/sys/modules/usb2/wlan_ral/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/wlan_rum/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/wlan_zyd/Makefile#5 integrate .. //depot/projects/usb/src/sys/net/if.c#16 integrate .. //depot/projects/usb/src/sys/net/rtsock.c#17 integrate .. //depot/projects/usb/src/sys/net80211/_ieee80211.h#9 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.c#15 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_regdomain.c#6 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.c#17 integrate .. //depot/projects/usb/src/sys/netinet/raw_ip.c#16 integrate .. //depot/projects/usb/src/sys/netinet6/raw_ip6.c#15 integrate .. //depot/projects/usb/src/sys/powerpc/conf/GENERIC#15 integrate .. //depot/projects/usb/src/sys/powerpc/conf/NOTES#11 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/intr_machdep.c#10 integrate .. //depot/projects/usb/src/sys/security/mac/mac_audit.c#4 integrate .. //depot/projects/usb/src/sys/security/mac/mac_framework.c#4 integrate .. //depot/projects/usb/src/sys/security/mac/mac_priv.c#2 integrate .. //depot/projects/usb/src/sys/sys/jail.h#8 integrate .. //depot/projects/usb/src/sys/sys/pcpu.h#9 integrate .. //depot/projects/usb/src/sys/sys/sysctl.h#13 integrate .. //depot/projects/usb/src/sys/vm/uma.h#6 integrate .. //depot/projects/usb/src/sys/vm/uma_core.c#10 integrate .. //depot/projects/usb/src/sys/vm/uma_dbg.c#2 integrate .. //depot/projects/usb/src/sys/vm/uma_int.h#3 integrate .. //depot/projects/usb/src/sys/vm/vm_meter.c#9 integrate Differences ... ==== //depot/projects/usb/src/share/man/man4/usb2_bluetooth.4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD$ +.\" $FreeBSD: src/share/man/man4/usb2_bluetooth.4,v 1.1 2008/11/04 02:31:03 alfred Exp $ .\" .\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved. .\" ==== //depot/projects/usb/src/share/man/man4/usb2_controller.4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD$ +.\" $FreeBSD: src/share/man/man4/usb2_controller.4,v 1.1 2008/11/04 02:31:03 alfred Exp $ .\" .\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved. .\" ==== //depot/projects/usb/src/share/man/man4/usb2_core.4#5 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD$ +.\" $FreeBSD: src/share/man/man4/usb2_core.4,v 1.1 2008/11/04 02:31:03 alfred Exp $ .\" .\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved. .\" ==== //depot/projects/usb/src/share/man/man4/usb2_ethernet.4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD$ +.\" $FreeBSD: src/share/man/man4/usb2_ethernet.4,v 1.1 2008/11/04 02:31:03 alfred Exp $ .\" .\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved. .\" ==== //depot/projects/usb/src/share/man/man4/usb2_image.4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD$ +.\" $FreeBSD: src/share/man/man4/usb2_image.4,v 1.1 2008/11/04 02:31:03 alfred Exp $ .\" .\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved. .\" ==== //depot/projects/usb/src/share/man/man4/usb2_input.4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD$ +.\" $FreeBSD: src/share/man/man4/usb2_input.4,v 1.1 2008/11/04 02:31:03 alfred Exp $ .\" .\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved. .\" ==== //depot/projects/usb/src/share/man/man4/usb2_misc.4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD$ +.\" $FreeBSD: src/share/man/man4/usb2_misc.4,v 1.1 2008/11/04 02:31:03 alfred Exp $ .\" .\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved. .\" ==== //depot/projects/usb/src/share/man/man4/usb2_ndis.4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD$ +.\" $FreeBSD: src/share/man/man4/usb2_ndis.4,v 1.1 2008/11/04 02:31:03 alfred Exp $ .\" .\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved. .\" ==== //depot/projects/usb/src/share/man/man4/usb2_quirk.4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD$ +.\" $FreeBSD: src/share/man/man4/usb2_quirk.4,v 1.1 2008/11/04 02:31:03 alfred Exp $ .\" .\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved. .\" ==== //depot/projects/usb/src/share/man/man4/usb2_serial.4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD$ +.\" $FreeBSD: src/share/man/man4/usb2_serial.4,v 1.1 2008/11/04 02:31:03 alfred Exp $ .\" .\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved. .\" ==== //depot/projects/usb/src/share/man/man4/usb2_sound.4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD$ +.\" $FreeBSD: src/share/man/man4/usb2_sound.4,v 1.1 2008/11/04 02:31:03 alfred Exp $ .\" .\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved. .\" ==== //depot/projects/usb/src/share/man/man4/usb2_storage.4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD$ +.\" $FreeBSD: src/share/man/man4/usb2_storage.4,v 1.1 2008/11/04 02:31:03 alfred Exp $ .\" .\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved. .\" ==== //depot/projects/usb/src/share/man/man4/usb2_template.4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD$ +.\" $FreeBSD: src/share/man/man4/usb2_template.4,v 1.1 2008/11/04 02:31:03 alfred Exp $ .\" .\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved. .\" ==== //depot/projects/usb/src/share/man/man4/usb2_wlan.4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD$ +.\" $FreeBSD: src/share/man/man4/usb2_wlan.4,v 1.1 2008/11/04 02:31:03 alfred Exp $ .\" .\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved. .\" ==== //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#13 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.170 2009/01/12 19:17:35 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.171 2009/01/22 21:04:46 jkim Exp $"); #include "opt_cpu.h" @@ -392,7 +392,8 @@ break; case CPU_VENDOR_CENTAUR: if (AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xf) + AMD64_CPU_MODEL(cpu_id) >= 0xf && + (rdmsr(0x1203) & 0x100000000ULL) == 0) tsc_is_invariant = 1; break; } ==== //depot/projects/usb/src/sys/arm/at91/at91.c#13 (text) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.21 2008/11/25 00:13:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.22 2009/01/22 21:54:26 imp Exp $"); #include #include @@ -50,6 +50,8 @@ static void at91_eoi(void *); +uint32_t at91_master_clock = AT91C_MASTER_CLOCK; + static int at91_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags, bus_space_handle_t *bshp) ==== //depot/projects/usb/src/sys/arm/at91/at91_mci.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.13 2009/01/21 17:39:11 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.16 2009/01/23 00:51:25 imp Exp $"); #include #include @@ -67,6 +67,9 @@ struct at91_mci_softc { void *intrhand; /* Interrupt handle */ device_t dev; + int sc_cap; +#define CAP_HAS_4WIRE 1 /* Has 4 wire bus */ +#define CAP_NEEDS_BOUNCE 2 /* broken hardware needing bounce */ int flags; #define CMD_STARTED 1 #define STOP_STARTED 2 @@ -77,11 +80,10 @@ bus_dmamap_t map; int mapped; struct mmc_host host; - int wire4; int bus_busy; struct mmc_request *req; struct mmc_command *curcmd; - uint32_t bounce_buffer[BBSZ/4]; + char bounce_buffer[BBSZ]; }; static inline uint32_t @@ -167,6 +169,7 @@ device_t child; sc->dev = dev; + sc->sc_cap = CAP_NEEDS_BOUNCE; err = at91_mci_activate(dev); if (err) goto out; @@ -201,7 +204,7 @@ sc->host.f_min = 375000; sc->host.f_max = at91_master_clock / 2; /* Typically 30MHz */ sc->host.host_ocr = MMC_OCR_320_330 | MMC_OCR_330_340; - if (sc->wire4) + if (sc->sc_cap & CAP_HAS_4WIRE) sc->host.caps = MMC_CAP_4_BIT_DATA; else sc->host.caps = 0; @@ -277,7 +280,6 @@ static int at91_mci_update_ios(device_t brdev, device_t reqdev) { - uint32_t at91_master_clock = AT91C_MASTER_CLOCK; struct at91_mci_softc *sc; struct mmc_host *host; struct mmc_ios *ios; @@ -302,6 +304,7 @@ else WR4(sc, MCI_SDCR, RD4(sc, MCI_SDCR) & ~MCI_SDCR_SDCBUS); WR4(sc, MCI_MR, (RD4(sc, MCI_MR) & ~MCI_MR_CLKDIV) | clkdiv); + /* Do we need a settle time here? */ /* XXX We need to turn the device on/off here with a GPIO pin */ return (0); } @@ -314,7 +317,6 @@ int i; struct mmc_data *data; struct mmc_request *req; - size_t block_size = 1 << 9; // Fixed, per mmc/sd spec for 2GB cards void *vaddr; bus_addr_t paddr; @@ -356,19 +358,21 @@ // Set block size and turn on PDC mode for dma xfer and disable // PDC until we're ready. mr = RD4(sc, MCI_MR) & ~MCI_MR_BLKLEN; - WR4(sc, MCI_MR, mr | (block_size << 16) | MCI_MR_PDCMODE); + WR4(sc, MCI_MR, mr | (data->len << 16) | MCI_MR_PDCMODE); WR4(sc, PDC_PTCR, PDC_PTCR_RXTDIS | PDC_PTCR_TXTDIS); if (cmdr & MCI_CMDR_TRCMD_START) { if (cmdr & MCI_CMDR_TRDIR) vaddr = cmd->data->data; else { - if (data->len != BBSZ) - panic("Write multiblock write support"); - vaddr = sc->bounce_buffer; - src = (uint32_t *)cmd->data->data; - dst = (uint32_t *)vaddr; - for (i = 0; i < data->len / 4; i++) - dst[i] = bswap32(src[i]); + if (sc->sc_cap & CAP_NEEDS_BOUNCE) { + vaddr = sc->bounce_buffer; + src = (uint32_t *)cmd->data->data; + dst = (uint32_t *)vaddr; + for (i = 0; i < data->len / 4; i++) + dst[i] = bswap32(src[i]); + } + else + vaddr = cmd->data->data; } data->xfer_len = 0; if (bus_dmamap_load(sc->dmatag, sc->map, vaddr, data->len, @@ -499,10 +503,12 @@ bus_dmamap_sync(sc->dmatag, sc->map, BUS_DMASYNC_POSTREAD); bus_dmamap_unload(sc->dmatag, sc->map); sc->mapped--; - walker = (uint32_t *)cmd->data->data; - len = cmd->data->len / 4; - for (i = 0; i < len; i++) - walker[i] = bswap32(walker[i]); + if (sc->sc_cap & CAP_NEEDS_BOUNCE) { + walker = (uint32_t *)cmd->data->data; + len = cmd->data->len / 4; + for (i = 0; i < len; i++) + walker[i] = bswap32(walker[i]); + } // Finish up the sequence... WR4(sc, MCI_IDR, MCI_SR_ENDRX); WR4(sc, MCI_IER, MCI_SR_RXBUFF); ==== //depot/projects/usb/src/sys/arm/at91/at91_twi.c#8 (text) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.13 2008/11/25 00:13:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.14 2009/01/22 21:55:37 imp Exp $"); #include #include @@ -41,6 +41,7 @@ #include #include +#include #include #include @@ -128,7 +129,7 @@ AT91_TWI_LOCK_DESTROY(sc); goto out; } - sc->cwgr = TWI_CWGR_CKDIV(8 * AT91C_MASTER_CLOCK / TWI_FASTEST_CLOCK) | + sc->cwgr = TWI_CWGR_CKDIV(8 * at91_master_clock / TWI_FASTEST_CLOCK) | TWI_CWGR_CHDIV(TWI_CWGR_DIV(TWI_DEF_CLK)) | TWI_CWGR_CLDIV(TWI_CWGR_DIV(TWI_DEF_CLK)); WR4(sc, TWI_CR, TWI_CR_SWRST); ==== //depot/projects/usb/src/sys/arm/at91/at91_twireg.h#4 (text) ==== @@ -23,7 +23,7 @@ * SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91_twireg.h,v 1.3 2008/11/25 00:13:26 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_twireg.h,v 1.4 2009/01/22 21:55:37 imp Exp $ */ #ifndef ARM_AT91_AT91_TWIREG_H #define ARM_AT91_AT91_TWIREG_H @@ -63,7 +63,7 @@ #define TWI_CWGR_CKDIV(x) ((x) << 16) /* Clock Divider */ #define TWI_CWGR_CHDIV(x) ((x) << 8) /* Clock High Divider */ #define TWI_CWGR_CLDIV(x) ((x) << 0) /* Clock Low Divider */ -#define TWI_CWGR_DIV(rate) ((AT91C_MASTER_CLOCK /(4*(rate))) - 2) +#define TWI_CWGR_DIV(rate) ((at91_master_clock /(4*(rate))) - 2) /* TWI_SR */ /* TWI_IER */ ==== //depot/projects/usb/src/sys/arm/at91/at91var.h#3 (text) ==== @@ -23,7 +23,7 @@ * SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91var.h,v 1.3 2008/11/25 18:40:40 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91var.h,v 1.4 2009/01/22 21:54:26 imp Exp $ */ #ifndef _AT91VAR_H_ #define _AT91VAR_H_ @@ -43,4 +43,6 @@ struct resource_list resources; }; +extern uint32_t at91_master_clock; + #endif /* _AT91VAR_H_ */ ==== //depot/projects/usb/src/sys/arm/at91/uart_bus_at91usart.c#3 (text) ==== @@ -26,7 +26,7 @@ #include "opt_uart.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_bus_at91usart.c,v 1.4 2008/11/25 00:13:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_bus_at91usart.c,v 1.5 2009/01/22 21:56:41 imp Exp $"); #include #include @@ -38,13 +38,12 @@ #include #include -#include - #include #include #include #include +#include #include "uart_if.h" @@ -103,6 +102,8 @@ break; } sc->sc_class = &at91_usart_class; + if (sc->sc_class->uc_rclk == 0) + sc->sc_class->uc_rclk = at91_master_clock; return (uart_bus_probe(dev, 0, 0, 0, device_get_unit(dev))); } ==== //depot/projects/usb/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#6 (text) ==== @@ -29,18 +29,22 @@ #include "opt_uart.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_cpu_at91rm9200usart.c,v 1.6 2008/11/25 00:13:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_cpu_at91rm9200usart.c,v 1.7 2009/01/22 21:56:41 imp Exp $"); #include #include #include #include +#include +#include #include #include +#include #include #include +#include bus_space_tag_t uart_bus_space_io; bus_space_tag_t uart_bus_space_mem; @@ -60,6 +64,8 @@ struct uart_class *class; class = &at91_usart_class; + if (class->uc_rclk == 0) + class->uc_rclk = at91_master_clock; di->ops = uart_getops(class); di->bas.chan = 0; di->bas.bst = &at91_bs_tag; ==== //depot/projects/usb/src/sys/arm/at91/uart_dev_at91usart.c#11 (text) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.18 2008/11/25 00:13:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.19 2009/01/22 21:56:41 imp Exp $"); #include "opt_comconsole.h" @@ -45,10 +45,11 @@ #include #include #include +#include #include "uart_if.h" -#define DEFAULT_RCLK AT91C_MASTER_CLOCK +#define DEFAULT_RCLK at91_master_clock #define USART_BUFFER_SIZE 128 /* @@ -684,6 +685,5 @@ at91_usart_methods, sizeof(struct at91_usart_softc), .uc_ops = &at91_usart_ops, - .uc_range = 8, - .uc_rclk = DEFAULT_RCLK + .uc_range = 8 }; ==== //depot/projects/usb/src/sys/boot/forth/loader.conf#14 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.135 2008/11/12 09:52:06 yongari Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.136 2009/01/23 05:56:09 weongyo Exp $ ############################################################## ### Basic configuration options ############################ @@ -278,6 +278,7 @@ if_udav_load="NO" # Davicom DM9601 USB Ethernet if_upgt_load="NO" # Conexant/Intersil PrismGT USB wireless if_ural_load="NO" # Ralink Technology USB wireless +if_urtw_load="NO" # Realtek 8187L USB wireless if_vr_load="NO" # VIA Rhine I and Rhine II if_vx_load="NO" # 3Com 3C590 family if_wb_load="NO" # Winbond W89C840F ==== //depot/projects/usb/src/sys/cam/cam_periph.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.74 2008/12/19 14:31:40 trasz Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.76 2009/01/26 15:01:47 jhb Exp $"); #include #include @@ -171,6 +171,10 @@ break; } xpt_unlock_buses(); + if (p_drv == NULL) { + printf("cam_periph_alloc: invalid periph name '%s'\n", name); + return (CAM_REQ_INVALID); + } sim = xpt_path_sim(path); path_id = xpt_path_path_id(path); @@ -322,7 +326,6 @@ int cam_periph_hold(struct cam_periph *periph, int priority) { - struct mtx *mtx; int error; /* @@ -335,14 +338,11 @@ if (cam_periph_acquire(periph) != CAM_REQ_CMP) return (ENXIO); - mtx = periph->sim->mtx; - mtx_assert(mtx, MA_OWNED); - if (mtx == &Giant) - mtx = NULL; - + mtx_assert(periph->sim->mtx, MA_OWNED); while ((periph->flags & CAM_PERIPH_LOCKED) != 0) { periph->flags |= CAM_PERIPH_LOCK_WANTED; - if ((error = msleep(periph, mtx, priority, "caplck", 0)) != 0) { + if ((error = mtx_sleep(periph, periph->sim->mtx, priority, + "caplck", 0)) != 0) { cam_periph_release_locked(periph); return (error); } @@ -763,7 +763,6 @@ cam_periph_getccb(struct cam_periph *periph, u_int32_t priority) { struct ccb_hdr *ccb_h; - struct mtx *mtx; mtx_assert(periph->sim->mtx, MA_OWNED); CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("entering cdgetccb\n")); @@ -776,11 +775,8 @@ && (SLIST_FIRST(&periph->ccb_list)->pinfo.priority == priority)) break; mtx_assert(periph->sim->mtx, MA_OWNED); - if (periph->sim->mtx == &Giant) - mtx = NULL; - else - mtx = periph->sim->mtx; - msleep(&periph->ccb_list, mtx, PRIBIO, "cgticb", 0); + mtx_sleep(&periph->ccb_list, periph->sim->mtx, PRIBIO, "cgticb", + 0); } ccb_h = SLIST_FIRST(&periph->ccb_list); @@ -791,17 +787,12 @@ void cam_periph_ccbwait(union ccb *ccb) { - struct mtx *mtx; struct cam_sim *sim; sim = xpt_path_sim(ccb->ccb_h.path); - if (sim->mtx == &Giant) - mtx = NULL; - else - mtx = sim->mtx; if ((ccb->ccb_h.pinfo.index != CAM_UNQUEUED_INDEX) || ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_INPROG)) - msleep(&ccb->ccb_h.cbfcnp, mtx, PRIBIO, "cbwait", 0); + mtx_sleep(&ccb->ccb_h.cbfcnp, sim->mtx, PRIBIO, "cbwait", 0); } int ==== //depot/projects/usb/src/sys/cam/cam_xpt.c#13 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.206 2009/01/14 21:29:20 trasz Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.208 2009/01/23 21:08:00 trasz Exp $"); #include #include @@ -4177,7 +4177,10 @@ { struct sbuf sb; - mtx_assert(path->bus->sim->mtx, MA_OWNED); +#ifdef INVARIANTS + if (path != NULL && path->bus != NULL && path->bus->sim != NULL) + mtx_assert(path->bus->sim->mtx, MA_OWNED); +#endif sbuf_new(&sb, str, str_len, 0); @@ -5191,6 +5194,11 @@ /* Save some state for use while we probe for devices */ scan_info = (xpt_scan_bus_info *) malloc(sizeof(xpt_scan_bus_info), M_CAMXPT, M_NOWAIT); + if (scan_info == NULL) { + request_ccb->ccb_h.status = CAM_RESRC_UNAVAIL; + xpt_done(request_ccb); + return; + } scan_info->request_ccb = request_ccb; scan_info->cpi = &work_ccb->cpi; ==== //depot/projects/usb/src/sys/cam/scsi/scsi_low.c#5 (text+ko) ==== @@ -2,7 +2,7 @@ /* $NetBSD$ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low.c,v 1.29 2007/06/17 05:55:54 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low.c,v 1.30 2009/01/23 21:06:16 trasz Exp $"); #define SCSI_LOW_STATICS #define SCSI_LOW_DEBUG @@ -966,16 +966,16 @@ struct scsi_low_softc *slp; { struct cam_path *path; - union ccb *ccb = xpt_alloc_ccb(); + union ccb *ccb; cam_status status; - bzero(ccb, sizeof(union ccb)); - status = xpt_create_path(&path, xpt_periph, cam_sim_path(slp->sl_si.sim), -1, 0); if (status != CAM_REQ_CMP) return; + ccb = xpt_alloc_ccb(); + bzero(ccb, sizeof(union ccb)); xpt_setup_ccb(&ccb->ccb_h, path, 5); ccb->ccb_h.func_code = XPT_SCAN_BUS; ccb->ccb_h.cbfcnp = scsi_low_cam_rescan_callback; ==== //depot/projects/usb/src/sys/conf/files.amd64#15 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.128 2009/01/12 19:23:46 jkim Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.129 2009/01/23 17:48:18 jkim Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -132,9 +132,10 @@ crypto/via/padlock_cipher.c optional padlock crypto/via/padlock_hash.c optional padlock dev/acpica/acpi_if.m standard -dev/agp/agp_amd64.c optional agp -dev/agp/agp_i810.c optional agp -dev/agp/agp_intel.c optional agp +dev/agp/agp_amd64.c optional agp +dev/agp/agp_i810.c optional agp +dev/agp/agp_intel.c optional agp +dev/agp/agp_via.c optional agp dev/arcmsr/arcmsr.c optional arcmsr pci dev/asmc/asmc.c optional asmc isa dev/atkbdc/atkbd.c optional atkbd atkbdc ==== //depot/projects/usb/src/sys/conf/files.i386#17 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.612 2009/01/01 13:26:53 ed Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.613 2009/01/23 17:48:18 jkim Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -118,15 +118,15 @@ crypto/via/padlock_cipher.c optional padlock crypto/via/padlock_hash.c optional padlock dev/advansys/adv_isa.c optional adv isa -dev/agp/agp_ali.c optional agp -dev/agp/agp_amd.c optional agp -dev/agp/agp_amd64.c optional agp -dev/agp/agp_ati.c optional agp -dev/agp/agp_i810.c optional agp -dev/agp/agp_intel.c optional agp +dev/agp/agp_ali.c optional agp +dev/agp/agp_amd.c optional agp +dev/agp/agp_amd64.c optional agp +dev/agp/agp_ati.c optional agp +dev/agp/agp_i810.c optional agp +dev/agp/agp_intel.c optional agp dev/agp/agp_nvidia.c optional agp -dev/agp/agp_sis.c optional agp -dev/agp/agp_via.c optional agp +dev/agp/agp_sis.c optional agp +dev/agp/agp_via.c optional agp dev/aic/aic_isa.c optional aic isa dev/arcmsr/arcmsr.c optional arcmsr pci dev/ar/if_ar.c optional ar ==== //depot/projects/usb/src/sys/conf/files.pc98#14 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.370 2008/12/01 16:53:01 sam Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.371 2009/01/23 17:48:18 jkim Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -77,13 +77,13 @@ compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \ no-implicit-rule crypto/des/arch/i386/des_enc.S optional crypto | ipsec | netsmb -dev/agp/agp_ali.c optional agp -dev/agp/agp_amd.c optional agp -dev/agp/agp_i810.c optional agp -dev/agp/agp_intel.c optional agp +dev/agp/agp_ali.c optional agp +dev/agp/agp_amd.c optional agp +dev/agp/agp_i810.c optional agp +dev/agp/agp_intel.c optional agp dev/agp/agp_nvidia.c optional agp -dev/agp/agp_sis.c optional agp -dev/agp/agp_via.c optional agp +dev/agp/agp_sis.c optional agp +dev/agp/agp_via.c optional agp dev/aic/aic_cbus.c optional aic isa dev/ar/if_ar.c optional ar dev/ar/if_ar_pci.c optional ar pci ==== //depot/projects/usb/src/sys/conf/files.powerpc#16 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.91 2009/01/15 02:52:31 nwhitehorn Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.92 2009/01/25 18:20:15 nwhitehorn Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -39,6 +39,11 @@ dev/powermac_nvram/powermac_nvram.c optional powermac_nvram powermac dev/quicc/quicc_bfe_ocp.c optional quicc mpc85xx dev/scc/scc_bfe_macio.c optional scc powermac +dev/sound/macio/aoa.c optional snd_davbus | snd_ai2s powermac +dev/sound/macio/davbus.c optional snd_davbus powermac +dev/sound/macio/i2s.c optional snd_ai2s powermac +dev/sound/macio/snapper.c optional snd_ai2s iicbus powermac +dev/sound/macio/tumbler.c optional snd_ai2s iicbus powermac dev/syscons/scgfbrndr.c optional sc dev/syscons/scterm-teken.c optional sc dev/syscons/scvtb.c optional sc ==== //depot/projects/usb/src/sys/conf/kmod.mk#11 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.224 2008/11/04 03:42:01 alfred Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.225 2009/01/26 17:00:58 rdivacky Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -89,10 +89,9 @@ .if ${CC} == "icc" NOSTDINC= -X .else -C_DIALECT= -std=c99 +CSTD= c99 NOSTDINC= -nostdinc .endif -CFLAGS+= ${C_DIALECT} CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} ${INCLMAGIC} ${CFLAGS:M-I*} .if defined(KERNBUILDDIR) CFLAGS+= -DHAVE_KERNEL_OPTION_HEADERS -include ${KERNBUILDDIR}/opt_global.h ==== //depot/projects/usb/src/sys/contrib/pf/net/pf_ioctl.c#12 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.38 2008/12/02 21:37:28 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.41 2009/01/25 16:52:41 ed Exp $"); #endif #ifdef __FreeBSD__ ==== //depot/projects/usb/src/sys/dev/agp/agp_via.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/agp/agp_via.c,v 1.26 2007/11/12 21:51:37 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp_via.c,v 1.27 2009/01/23 17:48:18 jkim Exp $"); #include "opt_bus.h" @@ -85,8 +85,14 @@ return ("VIA 3296 (P4M800) host to PCI bridge"); case 0x03051106: return ("VIA 82C8363 (Apollo KT133x/KM133) host to PCI bridge"); + case 0x03141106: + return ("VIA 3314 (P4M800CE) host to PCI bridge"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 27 05:17:57 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAF86106567A; Tue, 27 Jan 2009 05:17: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 751A4106564A for ; Tue, 27 Jan 2009 05:17:56 +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 62B618FC12 for ; Tue, 27 Jan 2009 05:17:56 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0R5HuhE054093 for ; Tue, 27 Jan 2009 05:17:56 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0R5HuWL054091 for perforce@freebsd.org; Tue, 27 Jan 2009 05:17:56 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 27 Jan 2009 05:17:56 GMT Message-Id: <200901270517.n0R5HuWL054091@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 156735 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Jan 2009 05:17:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=156735 Change 156735 by hselasky@hselasky_laptop001 on 2009/01/27 05:17:14 Make USB match the output produced by other processes in top(1). Reported by: Andre Guibert de Bruet Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.c#14 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.c#14 (text+ko) ==== @@ -184,11 +184,11 @@ TAILQ_INIT(&up->up_qhead); - usb2_cv_init(&up->up_cv, "WMSG"); - usb2_cv_init(&up->up_drain, "DMSG"); + usb2_cv_init(&up->up_cv, "wmsg"); + usb2_cv_init(&up->up_drain, "dmsg"); if (USB_THREAD_CREATE(&usb2_process, up, - &up->up_ptr, "USBPROC")) { + &up->up_ptr, "usbproc")) { DPRINTFN(0, "Unable to create USB process."); up->up_ptr = NULL; goto error; From owner-p4-projects@FreeBSD.ORG Tue Jan 27 15:07:56 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AF7E1065679; Tue, 27 Jan 2009 15:07: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 184321065670 for ; Tue, 27 Jan 2009 15:07:56 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 049198FC13 for ; Tue, 27 Jan 2009 15:07:56 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0RF7tWr037063 for ; Tue, 27 Jan 2009 15:07:55 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0RF7trK037061 for perforce@freebsd.org; Tue, 27 Jan 2009 15:07:55 GMT (envelope-from nwhitehorn@freebsd.org) Date: Tue, 27 Jan 2009 15:07:55 GMT Message-Id: <200901271507.n0RF7trK037061@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 156745 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Jan 2009 15:07:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=156745 Change 156745 by nwhitehorn@nwhitehorn_trantor on 2009/01/27 15:07:20 IFC to unbreak the build. Affected files ... .. //depot/projects/ppc-g5/bin/chmod/chmod.1#3 integrate .. //depot/projects/ppc-g5/etc/defaults/rc.conf#6 integrate .. //depot/projects/ppc-g5/etc/devd.conf#4 integrate .. //depot/projects/ppc-g5/etc/rc.d/jail#3 integrate .. //depot/projects/ppc-g5/include/paths.h#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_disk.c#8 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/Makefile#7 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test_write_disk_sparse.c#1 branch .. //depot/projects/ppc-g5/lib/libc/string/strlen.c#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/libpmc.c#5 integrate .. //depot/projects/ppc-g5/sbin/fsck_ffs/fsutil.c#3 integrate .. //depot/projects/ppc-g5/sbin/ipfw/Makefile#2 integrate .. //depot/projects/ppc-g5/sbin/ipfw/dummynet.c#1 branch .. //depot/projects/ppc-g5/sbin/ipfw/ipfw2.c#7 integrate .. //depot/projects/ppc-g5/sbin/ipfw/ipfw2.h#1 branch .. //depot/projects/ppc-g5/sbin/ipfw/ipv6.c#1 branch .. //depot/projects/ppc-g5/sbin/ipfw/main.c#1 branch .. //depot/projects/ppc-g5/sbin/ipfw/nat.c#1 branch .. //depot/projects/ppc-g5/share/man/man4/iic.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/man4.powerpc/Makefile#4 integrate .. //depot/projects/ppc-g5/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/ppc-g5/share/man/man7/tuning.7#3 integrate .. //depot/projects/ppc-g5/share/man/man9/kthread.9#2 integrate .. //depot/projects/ppc-g5/sys/cam/cam_periph.c#4 integrate .. //depot/projects/ppc-g5/sys/conf/kmod.mk#4 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_core.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_intel.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/pmc_events.h#5 integrate .. //depot/projects/ppc-g5/sys/dev/iicbus/iic.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/iicbus/iic.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/lpt.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/ppbconf.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/puc/pucdata.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/sound/macio/aoa.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/sound/macio/aoa.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/sound/macio/davbus.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/sound/macio/i2s.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/sound/pci/hda/hdac.c#11 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usbdevs#11 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/bluetooth/ng_ubt2.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/bluetooth/ng_ubt2_var.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/uhci2.c#7 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/usb2_controller.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_hub.c#7 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/usb2_devid.h#6 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/usb2_devtable.h#6 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/usb2_ioctl.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/quirk/usb2_quirk.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/u3g2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/storage/umass2.c#6 integrate .. //depot/projects/ppc-g5/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/subr_smp.c#4 integrate .. //depot/projects/ppc-g5/sys/kern/tty.c#10 integrate .. //depot/projects/ppc-g5/sys/sys/pmc.h#7 integrate .. //depot/projects/ppc-g5/usr.sbin/Makefile#8 integrate .. //depot/projects/ppc-g5/usr.sbin/config/config.8#2 integrate .. //depot/projects/ppc-g5/usr.sbin/i2c/Makefile#1 branch .. //depot/projects/ppc-g5/usr.sbin/i2c/i2c.8#1 branch .. //depot/projects/ppc-g5/usr.sbin/i2c/i2c.c#1 branch Differences ... ==== //depot/projects/ppc-g5/bin/chmod/chmod.1#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)chmod.1 8.4 (Berkeley) 3/31/94 -.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.41 2009/01/23 11:39:00 trhodes Exp $ +.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.42 2009/01/26 18:14:21 trhodes Exp $ .\" -.Dd January 23, 2009 +.Dd January 26, 2009 .Dt CHMOD 1 .Os .Sh NAME @@ -347,5 +347,4 @@ .Sh BUGS There is no .Ar perm -option for the naughty bits which are ``S'' and -``T'' respectively. +option for the naughty bits of a horse. ==== //depot/projects/ppc-g5/etc/defaults/rc.conf#6 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.348 2009/01/08 23:27:59 keramida Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.349 2009/01/26 12:59:11 bz Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -617,14 +617,16 @@ # each jail, specified in jail_list, with the following variables. # NOTES: # - replace 'example' with the jail's name. -# - except rootdir, hostname and ip, all of the following variables may be made -# global jail variables if you don't specify a jail name (ie. jail_interface). +# - except rootdir, hostname, ip and the _multi addresses, +# all of the following variables may be made global jail variables +# if you don't specify a jail name (ie. jail_interface, jail_devfs_ruleset). # #jail_example_rootdir="/usr/jail/default" # Jail's root directory #jail_example_hostname="default.domain.com" # Jail's hostname -#jail_example_ip="192.0.2.10" # Jail's IP number -#jail_example_interface="" # Interface to create the IP alias on -#jail_example_fib="0" # routing table for setfib(1) +#jail_example_interface="" # Jail's interface variable to create IP aliases on +#jail_example_fib="0" # Routing table for setfib(1) +#jail_example_ip="192.0.2.10,2001:db8::17" # Jail's primary IPv4 and IPv6 address +#jail_example_ip_multi0="2001:db8::10" # and another IPv6 address #jail_example_exec_start="/bin/sh /etc/rc" # command to execute in jail for starting #jail_example_exec_afterstart0="/bin/sh command" # command to execute after the one for # starting the jail. More than one can be ==== //depot/projects/ppc-g5/etc/devd.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.47 2008/12/23 15:47:31 thompsa Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.48 2009/01/26 23:05:50 sam Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -31,18 +31,17 @@ # Configure the interface on attach. Due to a historical accident, this # script is called pccard_ether. # +# NB: DETACH events are ignored; the kernel should handle all cleanup +# (routes, arp cache) if you need to do something beware of races +# against immediate create of a device w/ the same name; e.g. +# ifconfig bridge0 destroy; ifconfig bridge0 create +# notify 0 { match "system" "IFNET"; match "type" "ATTACH"; action "/etc/pccard_ether $subsystem start"; }; -notify 0 { - match "system" "IFNET"; - match "type" "DETACH"; - action "/etc/pccard_ether $subsystem stop"; -}; - # # Try to start dhclient on Ethernet like interfaces when the link comes # up. Only devices that are configured to support DHCP will actually ==== //depot/projects/ppc-g5/etc/rc.d/jail#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.40 2008/09/24 15:18:27 ru Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.41 2009/01/26 12:59:11 bz Exp $ # # PROVIDE: jail @@ -39,7 +39,6 @@ _procdir="${_rootdir}/proc" eval _hostname=\"\$jail_${_j}_hostname\" eval _ip=\"\$jail_${_j}_ip\" - eval _netmask=\"\${jail_${_j}_netmask:-255.255.255.255}\" eval _interface=\"\${jail_${_j}_interface:-${jail_interface}}\" eval _exec=\"\$jail_${_j}_exec\" eval _exec_start=\"\${jail_${_j}_exec_start:-${jail_exec_start}}\" @@ -94,7 +93,7 @@ debug "$_j mount enable: $_mount" debug "$_j hostname: $_hostname" debug "$_j ip: $_ip" - debug "$_j netmask: $_netmask" + jail_show_addresses ${_j} debug "$_j interface: $_interface" debug "$_j fib: $_fib" debug "$_j root: $_rootdir" @@ -128,10 +127,6 @@ if [ -z "${_rootdir}" ]; then err 3 "$name: No root directory has been defined for ${_j}" fi - if [ -z "${_ip}" ]; then - err 3 "$name: No IP address has been defined for ${_j}" - fi - } # set_sysctl rc_knob mib msg @@ -277,6 +272,208 @@ mount -a -F "${_fstab}" } +# jail_show_addresses jail +# Debug print the input for the given _multi aliases +# for a jail for init_variables(). +# +jail_show_addresses() +{ + local _j _type alias + _j="$1" + alias=0 + + if [ -z "${_j}" ]; then + warn "jail_show_addresses: you must specify a jail" + return + fi + + while : ; do + eval _addr=\"\$jail_${_j}_ip_multi${alias}\" + if [ -n "${_addr}" ]; then + debug "${_j} ip_multi${alias}: $_addr" + alias=$((${alias} + 1)) + else + break + fi + done +} + +# jail_extract_address argument +# The second argument is the string from one of the _ip +# or the _multi variables. In case of a comma separated list +# only one argument must be passed in at a time. +# The function alters the _type, _iface, _addr and _mask variables. +# +jail_extract_address() +{ + local _i + _i=$1 + + if [ -z "${_i}" ]; then + warn "jail_extract_address: called without input" + return + fi + + # Check if we have an interface prefix given and split into + # iFace and rest. + case "${_i}" in + *\|*) # ifN|.. prefix there + _iface=${_i%%|*} + _r=${_i##*|} + ;; + *) _iface="" + _r=${_i} + ;; + esac + + # In case the IP has no interface given, check if we have a global one. + _iface=${_iface:-${_interface}} + + # Set address, cut off any prefix/netmask/prefixlen. + _addr=${_r} + _addr=${_addr%%[/ ]*} + + # Theoretically we can return here if interface is not set, + # as we only care about the _mask if we call ifconfig. + # This is not done because we may want to santize IP addresses + # based on _type later, and optionally change the type as well. + + # Extract the prefix/netmask/prefixlen part by cutting off the address. + _mask=${_r} + _mask=`expr "${_mask}" : "${_addr}\(.*\)"` + + # Identify type {inet,inet6}. + case "${_addr}" in + *\.*\.*\.*) _type="inet" ;; + *:*) _type="inet6" ;; + *) warn "jail_extract_address: type not identified" + ;; + esac + + # Handle the special /netmask instead of /prefix or + # "netmask xxx" case for legacy IP. + # We do NOT support shortend class-full netmasks. + if [ "${_type}" = "inet" ]; then + case "${_mask}" in + /*\.*\.*\.*) _mask=" netmask ${_mask#/}" ;; + *) ;; + esac + + # In case _mask is still not set use /32. + _mask=${_mask:-/32} + + elif [ "${_type}" = "inet6" ]; then + # In case _maske is not set for IPv6, use /128. + _mask=${_mask:-/128} + fi +} + +# jail_handle_ips_option {add,del} input +# Handle a single argument imput which can be a comma separated +# list of addresses (theoretically with an option interface and +# prefix/netmask/prefixlen). +# +jail_handle_ips_option() +{ + local _x _action _type _i + _action=$1 + _x=$2 + + if [ -z "${_x}" ]; then + # No IP given. This can happen for the primary address + # of each address family. + return + fi + + # Loop, in case we find a comma separated list, we need to handle + # each argument on its own. + while [ ${#_x} -gt 0 ]; do + case "${_x}" in + *,*) # Extract the first argument and strip it off the list. + _i=`expr "${_x}" : '^\([^,]*\)'` + _x=`expr "${_x}" : "^[^,]*,\(.*\)"` + ;; + *) _i=${_x} + _x="" + ;; + esac + + _type="" + _iface="" + _addr="" + _mask="" + jail_extract_address "${_i}" + + # make sure we got an address. + case "${_addr}" in + "") continue ;; + *) ;; + esac + + # Append address to list of addresses for the jail command. + case "${_addrl}" in + "") _addrl="${_addr}" ;; + *) _addrl="${_addrl},${_addr}" ;; + esac + + # Configure interface alias if requested by a given interface + # and if we could correctly parse everything. + case "${_iface}" in + "") continue ;; + esac + case "${_type}" in + inet) ;; + inet6) ;; + *) warn "Could not determine address family. Not going" \ + "to ${_action} address '${_addr}' for ${_jail}." + continue + ;; + esac + case "${_action}" in + add) ifconfig ${_iface} ${_type} ${_addr}${_mask} alias + ;; + del) # When removing the IP, ignore the _mask. + ifconfig ${_iface} ${_type} ${_addr} -alias + ;; + esac + done +} + +# jail_ips {add,del} +# Extract the comma separated list of addresses and return them +# for the jail command. +# Handle more than one address via the _multi option as well. +# If an interface is given also add/remove an alias for the +# address with an optional netmask. +# +jail_ips() +{ + local _action + _action=$1 + + case "${_action}" in + add) ;; + del) ;; + *) warn "jail_ips: invalid action '${_action}'" + return + ;; + esac + + # Handle addresses. + jail_handle_ips_option ${_action} "${_ip}" + # Handle jail_xxx_ip_multi + alias=0 + while : ; do + eval _x=\"\$jail_${_jail}_ip_multi${alias}\" + case "${_x}" in + "") break ;; + *) jail_handle_ips_option ${_action} "${_x}" + alias=$((${alias} + 1)) + ;; + esac + done +} + jail_start() { echo -n 'Configuring jails:' @@ -298,9 +495,8 @@ echo -n " [${_hostname} already running (/var/run/jail_${_jail}.id exists)]" continue; fi - if [ -n "${_interface}" ]; then - ifconfig ${_interface} alias ${_ip} netmask ${_netmask} - fi + _addrl="" + jail_ips "add" if [ -n "${_fib}" ]; then _setfib="setfib -F '${_fib}'" else @@ -360,7 +556,7 @@ fi _tmp_jail=${_tmp_dir}/jail.$$ eval ${_setfib} jail ${_flags} -i ${_rootdir} ${_hostname} \ - ${_ip} ${_exec_start} > ${_tmp_jail} 2>&1 + \"${_addrl}\" ${_exec_start} > ${_tmp_jail} 2>&1 if [ "$?" -eq 0 ] ; then _jail_id=$(head -1 ${_tmp_jail}) @@ -381,9 +577,7 @@ echo ${_jail_id} > /var/run/jail_${_jail}.id else jail_umount_fs - if [ -n "${_interface}" ]; then - ifconfig ${_interface} -alias ${_ip} - fi + jail_ips "del" echo " cannot start jail \"${_jail}\": " tail +2 ${_tmp_jail} fi @@ -412,9 +606,7 @@ jail_umount_fs echo -n " $_hostname" fi - if [ -n "${_interface}" ]; then - ifconfig ${_interface} -alias ${_ip} - fi + jail_ips "del" rm /var/run/jail_${_jail}.id else echo " cannot stop jail ${_jail}. No jail id in /var/run" ==== //depot/projects/ppc-g5/include/paths.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)paths.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/paths.h,v 1.26 2007/06/11 02:21:18 simokawa Exp $ + * $FreeBSD: src/include/paths.h,v 1.27 2009/01/26 17:09:26 obrien Exp $ */ #ifndef _PATHS_H_ @@ -45,8 +45,7 @@ #define _PATH_STDPATH \ "/usr/bin:/bin:/usr/sbin:/sbin:" /* Locate system binaries */ -#define _PATH_SYSPATH \ - "/sbin:/usr/sbin" +#define _PATH_SYSPATH "/sbin:/usr/sbin" #define _PATH_AUTHCONF "/etc/auth.conf" #define _PATH_BSHELL "/bin/sh" ==== //depot/projects/ppc-g5/lib/libarchive/archive_write_disk.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.43 2009/01/21 06:55:27 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.44 2009/01/26 05:44:40 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -178,6 +178,8 @@ int fd; /* Current offset for writing data to the file. */ off_t offset; + /* Last offset actually written to disk. */ + off_t fd_offset; /* Maximum size of file, -1 if unknown. */ off_t filesize; /* Dir we were in before this restore; only for deep paths. */ @@ -187,8 +189,6 @@ /* UID/GID to use in restoring this entry. */ uid_t uid; gid_t gid; - /* Last offset written to disk. */ - off_t last_offset; }; /* @@ -235,7 +235,7 @@ static gid_t trivial_lookup_gid(void *, const char *, gid_t); static uid_t trivial_lookup_uid(void *, const char *, uid_t); static ssize_t write_data_block(struct archive_write_disk *, - const char *, size_t, off_t); + const char *, size_t); static struct archive_vtable *archive_write_disk_vtable(void); @@ -337,7 +337,7 @@ } a->entry = archive_entry_clone(entry); a->fd = -1; - a->last_offset = 0; + a->fd_offset = 0; a->offset = 0; a->uid = a->user_uid; a->mode = archive_entry_mode(a->entry); @@ -513,9 +513,9 @@ } static ssize_t -write_data_block(struct archive_write_disk *a, - const char *buff, size_t size, off_t offset) +write_data_block(struct archive_write_disk *a, const char *buff, size_t size) { + uint64_t start_size = size; ssize_t bytes_written = 0; ssize_t block_size = 0, bytes_to_write; @@ -538,8 +538,9 @@ #endif } - if (a->filesize >= 0 && (off_t)(offset + size) > a->filesize) - size = (size_t)(a->filesize - offset); + /* If this write would run beyond the file size, truncate it. */ + if (a->filesize >= 0 && (off_t)(a->offset + size) > a->filesize) + start_size = size = (size_t)(a->filesize - a->offset); /* Write the data. */ while (size > 0) { @@ -555,7 +556,7 @@ if (*p != '\0') break; } - offset += p - buff; + a->offset += p - buff; size -= p - buff; buff = p; if (size == 0) @@ -563,22 +564,25 @@ /* Calculate next block boundary after offset. */ block_end - = (offset / block_size) * block_size + block_size; + = (a->offset / block_size + 1) * block_size; /* If the adjusted write would cross block boundary, * truncate it to the block boundary. */ bytes_to_write = size; - if (offset + bytes_to_write > block_end) - bytes_to_write = block_end - offset; + if (a->offset + bytes_to_write > block_end) + bytes_to_write = block_end - a->offset; } /* Seek if necessary to the specified offset. */ - if (offset != a->last_offset) { - if (lseek(a->fd, offset, SEEK_SET) < 0) { + if (a->offset != a->fd_offset) { + if (lseek(a->fd, a->offset, SEEK_SET) < 0) { archive_set_error(&a->archive, errno, "Seek failed"); return (ARCHIVE_FATAL); } + a->fd_offset = a->offset; + a->archive.file_position = a->offset; + a->archive.raw_position = a->offset; } bytes_written = write(a->fd, buff, bytes_to_write); if (bytes_written < 0) { @@ -587,12 +591,12 @@ } buff += bytes_written; size -= bytes_written; - offset += bytes_written; + a->offset += bytes_written; a->archive.file_position += bytes_written; a->archive.raw_position += bytes_written; - a->last_offset = a->offset = offset; + a->fd_offset = a->offset; } - return (bytes_written); + return (start_size - size); } static ssize_t @@ -605,9 +609,9 @@ __archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC, ARCHIVE_STATE_DATA, "archive_write_disk_block"); - r = write_data_block(a, buff, size, offset); - - if (r < 0) + a->offset = offset; + r = write_data_block(a, buff, size); + if (r < ARCHIVE_OK) return (r); if ((size_t)r < size) { archive_set_error(&a->archive, 0, @@ -625,7 +629,7 @@ __archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC, ARCHIVE_STATE_DATA, "archive_write_data"); - return (write_data_block(a, buff, size, a->offset)); + return (write_data_block(a, buff, size)); } static int @@ -646,7 +650,7 @@ /* There's no file. */ } else if (a->filesize < 0) { /* File size is unknown, so we can't set the size. */ - } else if (a->last_offset == a->filesize) { + } else if (a->fd_offset == a->filesize) { /* Last write ended at exactly the filesize; we're done. */ /* Hopefully, this is the common case. */ } else { ==== //depot/projects/ppc-g5/lib/libarchive/test/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.30 2009/01/21 06:55:27 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.31 2009/01/26 05:44:40 kientzle Exp $ # Where to find the libarchive sources LA_SRCDIR=${.CURDIR}/.. @@ -62,6 +62,7 @@ test_write_disk_hardlink.c \ test_write_disk_perms.c \ test_write_disk_secure.c \ + test_write_disk_sparse.c \ test_write_disk_times.c \ test_write_format_ar.c \ test_write_format_cpio.c \ ==== //depot/projects/ppc-g5/lib/libc/string/strlen.c#2 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. + * Copyright (c) 2009 Xin LI + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,11 @@ * 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. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * 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 REGENTS OR CONTRIBUTORS BE LIABLE + * 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) @@ -27,21 +24,87 @@ * SUCH DAMAGE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)strlen.c 8.1 (Berkeley) 6/4/93"; -#endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/string/strlen.c,v 1.5 2007/01/09 00:28:12 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/strlen.c,v 1.7 2009/01/26 07:31:28 delphij Exp $"); +#include +#include #include +/* + * Portable strlen() for 32-bit and 64-bit systems. + * + * Rationale: it is generally much more efficient to do word length + * operations and avoid branches on modern computer systems, as + * compared to byte-length operations with a lot of branches. + * + * The expression: + * + * ((x - 0x01....01) & ~x & 0x80....80) + * + * would evaluate to a non-zero value iff any of the bytes in the + * original word is zero. However, we can further reduce ~1/3 of + * time if we consider that strlen() usually operate on 7-bit ASCII + * by employing the following expression, which allows false positive + * when high bit of 1 and use the tail case to catch these case: + * + * ((x - 0x01....01) & 0x80....80) + * + * This is more than 5.2 times as fast as the raw implementation on + * Intel T7300 under long mode for strings longer than word length. + */ + +/* Magic numbers for the algorithm */ +#if LONG_BIT == 32 +static const unsigned long mask01 = 0x01010101; +static const unsigned long mask80 = 0x80808080; +#elif LONG_BIT == 64 +static const unsigned long mask01 = 0x0101010101010101; +static const unsigned long mask80 = 0x8080808080808080; +#else +#error Unsupported word size +#endif + +#define LONGPTR_MASK (sizeof(long) - 1) + +/* + * Helper macro to return string length if we caught the zero + * byte. + */ +#define testbyte(x) \ + do { \ + if (p[x] == '\0') \ + return (p - str + x); \ + } while (0) + size_t -strlen(str) - const char *str; +strlen(const char *str) { - const char *s; + const char *p; + const unsigned long *lp; + + /* Skip the first few bytes until we have an aligned p */ + for (p = str; (uintptr_t)p & LONGPTR_MASK; p++) + if (*p == '\0') + return (p - str); + + /* Scan the rest of the string using word sized operation */ + for (lp = (const unsigned long *)p; ; lp++) + if ((*lp - mask01) & mask80) { + p = (const char *)(lp); + testbyte(0); + testbyte(1); + testbyte(2); + testbyte(3); +#if (LONG_BIT >= 64) + testbyte(4); + testbyte(5); + testbyte(6); + testbyte(7); +#endif + } - for (s = str; *s; ++s); - return(s - str); + /* NOTREACHED */ + return (0); } ==== //depot/projects/ppc-g5/lib/libpmc/libpmc.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.19 2008/12/03 17:30:36 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.20 2009/01/27 07:29:37 jeff Exp $"); #include #include @@ -152,6 +152,11 @@ __PMC_EV_ALIAS_CORE2() }; +static const struct pmc_event_descr corei7_event_table[] = +{ + __PMC_EV_ALIAS_COREI7() +}; + /* * PMC_MDEP_TABLE(NAME, PRIMARYCLASS, ADDITIONAL_CLASSES...) * @@ -165,6 +170,7 @@ PMC_MDEP_TABLE(atom, IAP, PMC_CLASS_IAF, PMC_CLASS_TSC); PMC_MDEP_TABLE(core, IAP, PMC_CLASS_TSC); PMC_MDEP_TABLE(core2, IAP, PMC_CLASS_IAF, PMC_CLASS_TSC); +PMC_MDEP_TABLE(corei7, IAP, PMC_CLASS_IAF, PMC_CLASS_TSC); PMC_MDEP_TABLE(k7, K7, PMC_CLASS_TSC); PMC_MDEP_TABLE(k8, K8, PMC_CLASS_TSC); PMC_MDEP_TABLE(p4, P4, PMC_CLASS_TSC); @@ -194,6 +200,7 @@ PMC_CLASS_TABLE_DESC(atom, IAP, atom, iap); PMC_CLASS_TABLE_DESC(core, IAP, core, iap); PMC_CLASS_TABLE_DESC(core2, IAP, core2, iap); +PMC_CLASS_TABLE_DESC(corei7, IAP, corei7, iap); #endif #if defined(__i386__) PMC_CLASS_TABLE_DESC(k7, K7, k7, k7); @@ -448,6 +455,7 @@ EV_ALIAS(NULL, NULL) }; #define atom_aliases core2_aliases +#define corei7_aliases core2_aliases #define IAF_KW_OS "os" #define IAF_KW_USR "usr" @@ -604,7 +612,8 @@ return (-1); } else if (cpu_info.pm_cputype == PMC_CPU_INTEL_ATOM || cpu_info.pm_cputype == PMC_CPU_INTEL_CORE2 || - cpu_info.pm_cputype == PMC_CPU_INTEL_CORE2EXTREME) { + cpu_info.pm_cputype == PMC_CPU_INTEL_CORE2EXTREME || + cpu_info.pm_cputype == PMC_CPU_INTEL_COREI7) { if (KWMATCH(p, IAP_KW_SNOOPRESPONSE)) { n = pmc_parse_mask(iap_snoopresponse_mask, p, &evmask); @@ -2278,6 +2287,10 @@ ev = core2_event_table; count = PMC_EVENT_TABLE_SIZE(core2); break; + case PMC_CPU_INTEL_COREI7: + ev = corei7_event_table; + count = PMC_EVENT_TABLE_SIZE(corei7); + break; } break; case PMC_CLASS_TSC: @@ -2462,6 +2475,11 @@ pmc_class_table[n++] = &iaf_class_table_descr; pmc_class_table[n] = &core2_class_table_descr; break; + case PMC_CPU_INTEL_COREI7: + PMC_MDEP_INIT(corei7); + pmc_class_table[n++] = &iaf_class_table_descr; + pmc_class_table[n] = &corei7_class_table_descr; + break; case PMC_CPU_INTEL_PIV: PMC_MDEP_INIT(p4); pmc_class_table[n] = &p4_class_table_descr; @@ -2560,6 +2578,10 @@ ev = core2_event_table; evfence = core2_event_table + PMC_EVENT_TABLE_SIZE(core2); break; + case PMC_CPU_INTEL_COREI7: + ev = corei7_event_table; + evfence = corei7_event_table + PMC_EVENT_TABLE_SIZE(corei7); + break; default: /* Unknown CPU type. */ break; } ==== //depot/projects/ppc-g5/sbin/fsck_ffs/fsutil.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/fsutil.c,v 1.28 2009/01/20 22:49:49 delphij Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/fsutil.c,v 1.29 2009/01/27 00:29:19 delphij Exp $"); #include #include @@ -442,7 +442,7 @@ rerun = 1; } } else - printf("YOU MAY NEED TO RERUN FSCK WITH -C IF IT CRASHED.\n"); + printf("YOU MAY NEED TO RERUN FSCK WITH -D IF IT CRASHED.\n"); } } ==== //depot/projects/ppc-g5/sbin/ipfw/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/sbin/ipfw/Makefile,v 1.14 2004/10/03 06:32:37 green Exp $ +# $FreeBSD: src/sbin/ipfw/Makefile,v 1.18 2009/01/27 12:01:30 luigi Exp $ PROG= ipfw -SRCS= ipfw2.c +SRCS= ipfw2.c dummynet.c ipv6.c main.c nat.c WARNS?= 0 MAN= ipfw.8 ==== //depot/projects/ppc-g5/sbin/ipfw/ipfw2.c#7 (text+ko) ==== @@ -17,14 +17,15 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.135 2009/01/22 23:25:28 luigi Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.143 2009/01/27 12:01:30 luigi Exp $ */ #include #include #include #include -#include + +#include "ipfw2.h" #include #include @@ -32,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -52,37 +52,13 @@ #include #include #include -#include #include -#include #include #include -#include -int - do_value_as_ip, /* show table value as IP */ - do_resolv, /* Would try to resolve all */ - do_time, /* Show time stamps */ - do_quiet, /* Be quiet in add and flush */ - do_pipe, /* this cmd refers to a pipe */ - do_nat, /* Nat configuration. */ - do_sort, /* field to sort results (0 = no) */ - do_dynamic, /* display dynamic rules */ - do_expired, /* display expired dynamic rules */ - do_compact, /* show rules in compact mode */ - do_force, /* do not ask for confirmation */ - use_set, /* work with specified set number */ - show_sets, /* display rule sets */ - test_only, /* only check syntax */ - comment_only, /* only print action and comment */ - verbose; +struct cmdline_opts co; /* global options */ -#define IP_MASK_ALL 0xffffffff -/* - * the following macro returns an error message if we run out of - * arguments. - */ -#define NEED1(msg) {if (!ac) errx(EX_USAGE, msg);} +int resvd_set_number = RESVD_SET; #define GET_UINT_ARG(arg, min, max, tok, s_x) do { \ if (!ac) \ @@ -113,28 +89,17 @@ } \ } while (0) -#define PRINT_UINT_ARG(str, arg) do { \ - if (str != NULL) \ - printf("%s",str); \ - if (arg == IP_FW_TABLEARG) \ - printf("tablearg"); \ - else \ - printf("%u", (uint32_t)arg); \ -} while (0) +static void +PRINT_UINT_ARG(const char *str, uint32_t arg) +{ + if (str != NULL) + printf("%s",str); + if (arg == IP_FW_TABLEARG) + printf("tablearg"); + else + printf("%u", arg); +} -/* - * _s_x is a structure that stores a string <-> token pairs, used in - * various places in the parser. Entries are stored in arrays, - * with an entry with s=NULL as terminator. - * The search routines are match_token() and match_value(). - * Often, an element with x=0 contains an error string. - * - */ -struct _s_x { - char const *s; - int x; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 27 16:19:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E5E11065670; Tue, 27 Jan 2009 16:19: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 DEEF0106566C for ; Tue, 27 Jan 2009 16:19:07 +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 CCBCB8FC12 for ; Tue, 27 Jan 2009 16:19:07 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0RGJ7bh044925 for ; Tue, 27 Jan 2009 16:19:07 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0RGJ7Zu044923 for perforce@freebsd.org; Tue, 27 Jan 2009 16:19:07 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 27 Jan 2009 16:19:07 GMT Message-Id: <200901271619.n0RGJ7Zu044923@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 156746 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Jan 2009 16:19:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=156746 Change 156746 by hselasky@hselasky_laptop001 on 2009/01/27 16:18:15 Add old-USB HID ioctls to libusbhid. Improve UHID driver. Reported by: Daichi GOTO and Masanori OZAWA. Affected files ... .. //depot/projects/usb/src/lib/libusbhid/Makefile#2 edit .. //depot/projects/usb/src/lib/libusbhid/descr.c#5 edit .. //depot/projects/usb/src/lib/libusbhid/descr_compat.c#1 add .. //depot/projects/usb/src/lib/libusbhid/usbhid.3#4 edit .. //depot/projects/usb/src/lib/libusbhid/usbvar.h#2 edit .. //depot/projects/usb/src/sys/dev/usb2/input/uhid2.c#14 edit Differences ... ==== //depot/projects/usb/src/lib/libusbhid/Makefile#2 (text+ko) ==== @@ -15,7 +15,7 @@ usbhid.3 hid_init.3 \ usbhid.3 hid_get_data.3 usbhid.3 hid_set_data.3 -SRCS= descr.c parse.c usage.c data.c +SRCS= descr.c descr_compat.c parse.c usage.c data.c INCS= usbhid.h ==== //depot/projects/usb/src/lib/libusbhid/descr.c#5 (text+ko) ==== @@ -47,18 +47,26 @@ int hid_set_immed(int fd, int enable) { - return (ioctl(fd, USB_SET_IMMED, &enable)); + int ret; + ret = ioctl(fd, USB_SET_IMMED, &enable); + if (ret < 0) + ret = hid_set_immed_compat7(fd, enable); + return (ret); } int hid_get_report_id(int fd) { int temp = -1; + int ret; - if (ioctl(fd, USB_GET_REPORT_ID, &temp) < 0) - return (-1); + ret = ioctl(fd, USB_GET_REPORT_ID, &temp); + if (ret < 0) + ret = hid_get_report_id_compat7(fd); + else + ret = temp; - return (temp); + return (ret); } report_desc_t @@ -67,39 +75,39 @@ struct usb2_gen_descriptor ugd; report_desc_t rep; void *data; - int size; - size = 256; /* be conservative */ + memset(&ugd, 0, sizeof(ugd)); -retry: + /* get actual length first */ + ugd.ugd_data = NULL; + ugd.ugd_maxlen = 65535; + if (ioctl(fd, USB_GET_REPORT_DESC, &ugd) < 0) { + /* could not read descriptor */ + /* try FreeBSD 7 compat code */ + return (hid_get_report_desc_compat7(fd)); + } - memset(&ugd, 0, sizeof(ugd)); - - data = malloc(size); + /* + * NOTE: The kernel will return a failure if + * "ugd_actlen" is zero. + */ + data = malloc(ugd.ugd_actlen); if (data == NULL) return (NULL); - /* - * We subtract one from size so that the maximum descriptor - * size is 65535 bytes, because "ugd_maxlen" is a 16-bit - * variable! - */ + /* fetch actual descriptor */ ugd.ugd_data = data; - ugd.ugd_maxlen = size-1; + ugd.ugd_maxlen = ugd.ugd_actlen; if (ioctl(fd, USB_GET_REPORT_DESC, &ugd) < 0) { /* could not read descriptor */ free(data); return (NULL); } - if ((ugd.ugd_maxlen != 65535) && - (ugd.ugd_maxlen == ugd.ugd_actlen)) { - /* buffer is too small */ - free (data); - size *= 4; - if (size <= 65536) - goto retry; - /* maximum reached - should not happen */ + /* check END_COLLECTION */ + if (((unsigned char *)ugd.ugd_data)[ugd.ugd_actlen -1] != 0xC0) { + /* invalid end byte */ + free(data); return (NULL); } ==== //depot/projects/usb/src/lib/libusbhid/usbhid.3#4 (text+ko) ==== @@ -26,7 +26,7 @@ .\" .\" $FreeBSD: src/lib/libusbhid/usbhid.3,v 1.18 2005/11/24 11:26:36 ru Exp $ .\" -.Dd December 29, 2001 +.Dd January 27, 2009 .Dt USBHID 3 .Os .Sh NAME @@ -102,6 +102,8 @@ .Ss Synchronous HID operation Synchronous HID operation can be enabled or disabled by a call to .Fn hid_set_immed . +If the second argument is zero synchronous HID operation is disabled. +Else synchronous HID operation is enabled. The function returns a negative value on failure. .Ss Descriptor Functions The report descriptor ID can be obtained by calling ==== //depot/projects/usb/src/lib/libusbhid/usbvar.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libusbhid/usbvar.h,v 1.2 2002/03/27 16:07:18 joe Exp $ + * $FreeBSD: $ * */ @@ -34,3 +34,8 @@ unsigned char data[1]; }; +/* internal backwards compatibility functions */ + +int hid_set_immed_compat7(int fd, int enable); +int hid_get_report_id_compat7(int fd); +report_desc_t hid_get_report_desc_compat7(int fd); ==== //depot/projects/usb/src/sys/dev/usb2/input/uhid2.c#14 (text+ko) ==== @@ -87,10 +87,9 @@ enum { UHID_INTR_DT_RD, - UHID_INTR_CS_RD, UHID_CTRL_DT_WR, UHID_CTRL_DT_RD, - UHID_N_TRANSFER = 4, + UHID_N_TRANSFER, }; struct uhid_softc { @@ -114,7 +113,6 @@ uint8_t sc_fid; uint8_t sc_flags; #define UHID_FLAG_IMMED 0x01 /* set if read should be immediate */ -#define UHID_FLAG_INTR_STALL 0x02 /* set if interrupt transfer stalled */ #define UHID_FLAG_STATIC_DESC 0x04 /* set if report descriptors are * static */ }; @@ -130,7 +128,6 @@ static device_detach_t uhid_detach; static usb2_callback_t uhid_intr_callback; -static usb2_callback_t uhid_intr_clear_stall_callback; static usb2_callback_t uhid_write_callback; static usb2_callback_t uhid_read_callback; @@ -174,41 +171,25 @@ } case USB_ST_SETUP: - if (sc->sc_flags & UHID_FLAG_INTR_STALL) { - usb2_transfer_start(sc->sc_xfer[UHID_INTR_CS_RD]); - } else { - if (usb2_fifo_put_bytes_max( - sc->sc_fifo.fp[USB_FIFO_RX]) != 0) { - xfer->frlengths[0] = xfer->max_data_length; - usb2_start_hardware(xfer); - } +re_submit: + if (usb2_fifo_put_bytes_max( + sc->sc_fifo.fp[USB_FIFO_RX]) != 0) { + xfer->frlengths[0] = sc->sc_isize; + usb2_start_hardware(xfer); } return; default: /* Error */ if (xfer->error != USB_ERR_CANCELLED) { /* try to clear stall first */ - sc->sc_flags |= UHID_FLAG_INTR_STALL; - usb2_transfer_start(sc->sc_xfer[UHID_INTR_CS_RD]); + xfer->flags.stall_pipe = 1; + goto re_submit; } return; } } static void -uhid_intr_clear_stall_callback(struct usb2_xfer *xfer) -{ - struct uhid_softc *sc = xfer->priv_sc; - struct usb2_xfer *xfer_other = sc->sc_xfer[UHID_INTR_DT_RD]; - - if (usb2_clear_stall_callback(xfer, xfer_other)) { - DPRINTF("stall cleared\n"); - sc->sc_flags &= ~UHID_FLAG_INTR_STALL; - usb2_transfer_start(xfer_other); - } -} - -static void uhid_fill_set_report(struct usb2_device_request *req, uint8_t iface_no, uint8_t type, uint8_t id, uint16_t size) { @@ -337,20 +318,10 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, - .mh.bufsize = 0, /* use wMaxPacketSize */ + .mh.bufsize = UHID_BSIZE, .mh.callback = &uhid_intr_callback, }, - [UHID_INTR_CS_RD] = { - .type = UE_CONTROL, - .endpoint = 0x00, /* Control pipe */ - .direction = UE_DIR_ANY, - .mh.bufsize = sizeof(struct usb2_device_request), - .mh.callback = &uhid_intr_clear_stall_callback, - .mh.timeout = 1000, /* 1 second */ - .mh.interval = 50, /* 50ms */ - }, - [UHID_CTRL_DT_WR] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ @@ -530,6 +501,8 @@ size = sc->sc_repdesc_size; } ugd->ugd_actlen = size; + if (ugd->ugd_data == NULL) + break; /* descriptor length only */ error = copyout(sc->sc_repdesc_ptr, ugd->ugd_data, size); break; From owner-p4-projects@FreeBSD.ORG Tue Jan 27 18:46:38 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 837541065672; Tue, 27 Jan 2009 18:46: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 4138D106566B for ; Tue, 27 Jan 2009 18:46:38 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2E24F8FC13 for ; Tue, 27 Jan 2009 18:46:38 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0RIkc5Z068619 for ; Tue, 27 Jan 2009 18:46:38 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0RIkcXQ068617 for perforce@freebsd.org; Tue, 27 Jan 2009 18:46:38 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 27 Jan 2009 18:46:38 GMT Message-Id: <200901271846.n0RIkcXQ068617@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 156752 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Jan 2009 18:46:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=156752 Change 156752 by rene@rene_self on 2009/01/27 18:46:16 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/security/chapter.sgml#10 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/pmake/basics/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#19 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#17 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#17 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#13 integrate .. //depot/projects/docproj_nl/share/pgpkeys/rafan.key#2 integrate .. //depot/projects/docproj_nl/www/en/community.xsl#4 integrate .. //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#9 integrate .. //depot/projects/docproj_nl/www/en/smp/index.sgml#3 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#13 integrate .. //depot/projects/docproj_nl/www/share/sgml/libcommon.xsl#4 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/security/chapter.sgml#10 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -594,25 +594,65 @@ use a KLD module to install his own bpf device, or other sniffing device, on a running kernel. To avoid these problems you have to - run the kernel at a higher secure level, at least securelevel 1. - The securelevel can be set with a sysctl on - the kern.securelevel variable. Once you have - set the securelevel to 1, write access to raw devices will be - denied and special chflags flags, - such as schg, - will be enforced. You must also ensure that the - schg flag is set on critical startup binaries, - directories, and script files — everything that gets run up - to the point where the securelevel is set. This might be overdoing - it, and upgrading the system is much more difficult when you - operate at a higher secure level. You may compromise and run the - system at a higher secure level but not set the - schg flag for every system file and directory - under the sun. Another possibility is to simply mount - / and /usr read-only. - It should be noted that being too draconian in what you attempt to - protect may prevent the all-important detection of an - intrusion. + run the kernel at a higher secure level, at least securelevel 1. + + The secure level of the kernel can be set in a variety of ways. + The simplest way of raising the secure level of a running kernel is + through a sysctl on + the kern.securelevel kernel variable: + + &prompt.root; sysctl kern.securelevel=1 + + By default, the &os; kernel boots with a secure level of -1. The + secure level will remain at -1 unless it is altered, either by the + administrator or by &man.init.8; because of a setting in the start up + scripts. The secure level may be raised during system startup by + setting the kern_securelevel_enable variable to + YES in the /etc/rc.conf file, + and the value of the kern_securelevel variable to + the desired secure level. + + The default secure level of an &os; system right after the startup + scripts are done is -1. This is called insecure mode + because immutable file flags may be turned off, all devices may be + read from or written to, and so on. + + Once the secure level is set to 1 or a higher value, the + append-only and immutable files are honored, they cannot be turned + off, and access to raw devices will be denied. Higher levels restrict + even more operations. For a full description of the effect of various + secure levels, please read the &man.security.7; manual page (or the + manual page of &man.init.8; in releases older than &os; 7.0). + + + Bumping the secure level to 1 or higher may cause a few problems + to X11 (access to /dev/io will be blocked), or + to the installation of &os; build from source + (the installworld part of the process needs + to temporarily reset the append-only and immutable flags of some + files), and in a few other cases. Sometimes, as in the case of X11, + it may be possible to work around this by starting &man.xdm.1; + pretty early in the boot process, when the securelevel is still low + enough. Workarounds like this may not be possible for all secure + levels or for all the potential restrictions they enforce. A bit of + forward planning is a good idea. Understanding the restrictions + imposed by each secure level is important as they severly diminish + the ease of system use. It will also make choosing a default + setting much simpler and prevent any surprises. + + + If the kernel's secure level is raised to 1 or a higher value, it + may be useful to set the schg flag on critical + startup binaries, directories, and script files (i.e. everything that + gets run up to the point where the securelevel is set). This might be + overdoing it, and upgrading the system is much more difficult when it + operates at a high secure level. A less strict compromise is to run + the system at a higher secure level but skip setting set + the schg flag for every system file and directory + under the sun. Another possibility is to simply + mount / and /usr read-only. + It should be noted that being too draconian about what is permitted + may prevent the all-important detection of an intrusion. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/pmake/basics/chapter.sgml#2 (text+ko) ==== @@ -1,5 +1,5 @@ @@ -83,9 +83,6 @@ - - - : @@ -178,9 +175,6 @@ - - - {} @@ -1019,9 +1013,6 @@ - - - a ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#19 (text+ko) ==== @@ -1,7 +1,7 @@ A little background first. OpenBSD has a neat feature - inside both DISTFILES and - PATCHFILES variables, both files and - patches can be postfixed with :n - identifiers where n both can be + inside the DISTFILES and + PATCHFILES variables which allows files and + patches to be postfixed with :n + identifiers. Here, n can be both [0-9] and denote a group designation. For example: @@ -2436,7 +2436,7 @@ as hell where beta is carried by all sites in MASTER_SITES, and alpha can only be found in the 20th - site. It would be such a waste to check all of them if + site. It would be such a waste to check all of them if the maintainer knew this beforehand, would it not? Not a good start for that lovely weekend! @@ -3121,7 +3121,7 @@ challenge for port maintainers section. Changes to the port will be sent to the maintainer of - a port for a review and an approval before being committed. + a port for review and approval before being committed. If the maintainer does not respond to an update request after two weeks (excluding major public holidays), then that is considered a maintainer timeout, and the @@ -3137,8 +3137,8 @@ to better match existing policies and style of the Ports Collection without explicit blessing from the submitter. Also, large infrastructural changes can result in - a port being modified without maintainer's consent. - This kind of changes will never affect the port's + a port being modified without the maintainer's consent. + These kinds of changes will never affect the port's functionality. The &a.portmgr; reserves the right to revoke or override @@ -4090,7 +4090,7 @@ Two macros exists for this situation. The advantage of using these macros instead of cp is that they guarantee - proper file ownership and permissions on target files. First macro, + proper file ownership and permissions on target files. The first macro, COPYTREE_BIN, will set all the installed files to be executable, thus being suitable for installing into PREFIX/bin. The second @@ -8645,6 +8645,11 @@ The packing list still has to be tidied up by hand as stated above. + Another tool that might be used to create an initial + pkg-plist is ports-mgmt/genplist. As with any + automated tool, the resulting pkg-plist + should be checked and manually edited as needed. @@ -11882,7 +11887,7 @@ 7.0-CURRENT after RFC 3678 API support added to the IPv4 stack. - Legacy RFC 1724 behaviour of the IP_MULTICAST_IF + Legacy RFC 1724 behavior of the IP_MULTICAST_IF ioctl has now been removed; 0.0.0.0/8 may no longer be used to specify an interface index. struct ipmreqn should be used instead. ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#17 (text+ko) ==== @@ -1,7 +1,7 @@ + uid Rong-En Fan -uid Rong-En Fan (CSIE, NTU) uid Rong-En Fan -sub 2048g/CC9AC94F 2004-06-04 [expires: 2009-06-03] +sub 2048g/42A8637E 2009-01-25 [expires: 2012-07-08] ]]> ==== //depot/projects/docproj_nl/www/en/community.xsl#4 (text+ko) ==== @@ -6,7 +6,7 @@ ]> - + @@ -47,7 +47,9 @@

    There are more than one hundred mailing - lists and several , dozens of web-based forums, and + several newsgroups available. There are over - + @@ -404,6 +404,13 @@ 802.11a (5GHz) accesspoint with WPA2 Hopefully improve WiFi in 2.4GHz-infested apartment building. + + + rui + Portugal + Intel Mac, possibly Mac Mini for a small shipment fee + EFI support under FreeBSD and other Mac development work. + &footer; ==== //depot/projects/docproj_nl/www/en/smp/index.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -201,29 +201,29 @@ primitives can be found here:


    -

    In addition, the old SPL man page may be of interest, as it reflects the previous SMP synchronization model.

    +

    In addition, the old SPL man page may be of interest, as it reflects the previous SMP synchronization model.

  • ==== //depot/projects/docproj_nl/www/share/sgml/events.xml#13 (text+ko) ==== @@ -10,10 +10,34 @@ - $FreeBSD: www/share/sgml/events.xml,v 1.66 2009/01/06 13:45:10 danger Exp $ + $FreeBSD: www/share/sgml/events.xml,v 1.67 2009/01/24 19:07:08 danger Exp $ + + Network-related Bugathon #6 + http://wiki.freebsd.org/Bugathons/January2009 + + 2009 + 1 + 30 + + + 2009 + 2 + 1 + + + A bugathon is an event coordinated by the &os; + bugbusting team. Bugathons are held on IRC (in the + #freebsd-bugbusters channel of EFnet), and are attended by any + interested &os; developers and contributors during a week-end. + They focus on closing as many problem reports and fixing as many + bugs as possible. The plan for the sixth bugathon is to work + through the all network-related problem reports in &os;'s GNATS + database. + + FOSDEM '09 http://fosdem.org/2009/ ==== //depot/projects/docproj_nl/www/share/sgml/libcommon.xsl#4 (text+ko) ==== @@ -1,7 +1,7 @@ - +
    - (, ) + + (, ) +

    From owner-p4-projects@FreeBSD.ORG Tue Jan 27 22:18:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 583A610656CE; Tue, 27 Jan 2009 22:18: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 0B1D010656C8 for ; Tue, 27 Jan 2009 22:18:36 +0000 (UTC) (envelope-from marius@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EA1A48FC34 for ; Tue, 27 Jan 2009 22:18:35 +0000 (UTC) (envelope-from marius@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0RMIZKt001487 for ; Tue, 27 Jan 2009 22:18:35 GMT (envelope-from marius@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0RMIE4W001467 for perforce@freebsd.org; Tue, 27 Jan 2009 22:18:14 GMT (envelope-from marius@freebsd.org) Date: Tue, 27 Jan 2009 22:18:14 GMT Message-Id: <200901272218.n0RMIE4W001467@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marius@freebsd.org using -f From: Marius Strobl To: Perforce Change Reviews Cc: Subject: PERFORCE change 156764 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Jan 2009 22:18:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=156764 Change 156764 by marius@flak on 2009/01/27 22:18:14 IFC @156742 Affected files ... .. //depot/projects/usiii/amd64/Makefile#2 integrate .. //depot/projects/usiii/amd64/amd64/amd64_mem.c#3 integrate .. //depot/projects/usiii/amd64/amd64/cpu_switch.S#5 integrate .. //depot/projects/usiii/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/usiii/amd64/amd64/dump_machdep.c#5 integrate .. //depot/projects/usiii/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/usiii/amd64/amd64/exception.S#5 integrate .. //depot/projects/usiii/amd64/amd64/genassym.c#8 integrate .. //depot/projects/usiii/amd64/amd64/identcpu.c#7 integrate .. //depot/projects/usiii/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/usiii/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/usiii/amd64/amd64/local_apic.c#7 integrate .. //depot/projects/usiii/amd64/amd64/mem.c#4 integrate .. //depot/projects/usiii/amd64/amd64/minidump_machdep.c#6 integrate .. //depot/projects/usiii/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/usiii/amd64/amd64/msi.c#3 integrate .. //depot/projects/usiii/amd64/amd64/pmap.c#9 integrate .. //depot/projects/usiii/amd64/amd64/prof_machdep.c#4 integrate .. //depot/projects/usiii/amd64/amd64/tsc.c#2 integrate .. //depot/projects/usiii/amd64/amd64/vm_machdep.c#5 integrate .. //depot/projects/usiii/amd64/conf/DEFAULTS#4 integrate .. //depot/projects/usiii/amd64/conf/GENERIC#13 integrate .. //depot/projects/usiii/amd64/conf/NOTES#8 integrate .. //depot/projects/usiii/amd64/conf/USB2#1 branch .. //depot/projects/usiii/amd64/include/apicreg.h#2 integrate .. //depot/projects/usiii/amd64/include/apicvar.h#2 integrate .. //depot/projects/usiii/amd64/include/atomic.h#3 integrate .. //depot/projects/usiii/amd64/include/clock.h#5 integrate .. //depot/projects/usiii/amd64/include/cputypes.h#2 integrate .. //depot/projects/usiii/amd64/include/elf.h#2 integrate .. //depot/projects/usiii/amd64/include/md_var.h#2 integrate .. //depot/projects/usiii/amd64/include/param.h#4 integrate .. //depot/projects/usiii/amd64/include/pmc_mdep.h#5 integrate .. //depot/projects/usiii/amd64/include/smp.h#4 integrate .. //depot/projects/usiii/amd64/include/specialreg.h#6 integrate .. //depot/projects/usiii/amd64/linux32/linux.h#4 integrate .. //depot/projects/usiii/amd64/linux32/linux32_machdep.c#5 integrate .. //depot/projects/usiii/amd64/linux32/linux32_proto.h#5 integrate .. //depot/projects/usiii/amd64/linux32/linux32_syscall.h#5 integrate .. //depot/projects/usiii/amd64/linux32/linux32_sysent.c#5 integrate .. //depot/projects/usiii/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/usiii/amd64/linux32/syscalls.master#5 integrate .. //depot/projects/usiii/arm/arm/busdma_machdep.c#4 integrate .. //depot/projects/usiii/arm/arm/cpufunc.c#3 integrate .. //depot/projects/usiii/arm/arm/cpufunc_asm_sheeva.S#1 branch .. //depot/projects/usiii/arm/arm/dump_machdep.c#4 integrate .. //depot/projects/usiii/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/usiii/arm/arm/elf_trampoline.c#4 integrate .. //depot/projects/usiii/arm/arm/genassym.c#3 integrate .. //depot/projects/usiii/arm/arm/identcpu.c#4 integrate .. //depot/projects/usiii/arm/arm/locore.S#5 integrate .. //depot/projects/usiii/arm/arm/mem.c#2 integrate .. //depot/projects/usiii/arm/arm/minidump_machdep.c#1 branch .. //depot/projects/usiii/arm/arm/pmap.c#7 integrate .. //depot/projects/usiii/arm/arm/swtch.S#5 integrate .. //depot/projects/usiii/arm/arm/undefined.c#2 integrate .. //depot/projects/usiii/arm/at91/at91.c#6 integrate .. //depot/projects/usiii/arm/at91/at91_machdep.c#1 branch .. //depot/projects/usiii/arm/at91/at91_mci.c#4 integrate .. //depot/projects/usiii/arm/at91/at91_mcireg.h#3 integrate .. //depot/projects/usiii/arm/at91/at91_pdcreg.h#2 integrate .. //depot/projects/usiii/arm/at91/at91_pio.c#3 integrate .. //depot/projects/usiii/arm/at91/at91_pioreg.h#2 integrate .. //depot/projects/usiii/arm/at91/at91_piovar.h#3 integrate .. //depot/projects/usiii/arm/at91/at91_pmc.c#5 integrate .. //depot/projects/usiii/arm/at91/at91_pmcreg.h#2 integrate .. //depot/projects/usiii/arm/at91/at91_pmcvar.h#2 integrate .. //depot/projects/usiii/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/usiii/arm/at91/at91_rtcreg.h#2 integrate .. //depot/projects/usiii/arm/at91/at91_spi.c#2 integrate .. //depot/projects/usiii/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/usiii/arm/at91/at91_ssc.c#3 integrate .. //depot/projects/usiii/arm/at91/at91_sscreg.h#2 integrate .. //depot/projects/usiii/arm/at91/at91_st.c#2 integrate .. //depot/projects/usiii/arm/at91/at91_streg.h#2 integrate .. //depot/projects/usiii/arm/at91/at91_twi.c#3 integrate .. //depot/projects/usiii/arm/at91/at91_twiio.h#2 integrate .. //depot/projects/usiii/arm/at91/at91_twireg.h#2 integrate .. //depot/projects/usiii/arm/at91/at91_usartreg.h#2 integrate .. //depot/projects/usiii/arm/at91/at91board.h#1 branch .. //depot/projects/usiii/arm/at91/at91rm92reg.h#3 integrate .. //depot/projects/usiii/arm/at91/at91var.h#2 integrate .. //depot/projects/usiii/arm/at91/board_bwct.c#1 branch .. //depot/projects/usiii/arm/at91/board_hl200.c#1 branch .. //depot/projects/usiii/arm/at91/board_kb920x.c#1 branch .. //depot/projects/usiii/arm/at91/board_tsc4370.c#1 branch .. //depot/projects/usiii/arm/at91/files.at91#2 integrate .. //depot/projects/usiii/arm/at91/files.kb920x#2 delete .. //depot/projects/usiii/arm/at91/if_ate.c#6 integrate .. //depot/projects/usiii/arm/at91/if_atereg.h#3 integrate .. //depot/projects/usiii/arm/at91/kb920x_machdep.c#6 delete .. //depot/projects/usiii/arm/at91/ohci_atmelarm.c#3 integrate .. //depot/projects/usiii/arm/at91/std.at91#3 integrate .. //depot/projects/usiii/arm/at91/std.bwct#1 branch .. //depot/projects/usiii/arm/at91/std.hl200#1 branch .. //depot/projects/usiii/arm/at91/std.kb920x#3 integrate .. //depot/projects/usiii/arm/at91/std.tsc4370#1 branch .. //depot/projects/usiii/arm/at91/uart_bus_at91usart.c#2 integrate .. //depot/projects/usiii/arm/at91/uart_cpu_at91rm9200usart.c#3 integrate .. //depot/projects/usiii/arm/at91/uart_dev_at91usart.c#5 integrate .. //depot/projects/usiii/arm/conf/AVILA#9 integrate .. //depot/projects/usiii/arm/conf/AVILA.hints#3 integrate .. //depot/projects/usiii/arm/conf/BWCT#5 integrate .. //depot/projects/usiii/arm/conf/CAMBRIA#1 branch .. //depot/projects/usiii/arm/conf/CAMBRIA.hints#1 branch .. //depot/projects/usiii/arm/conf/CRB#6 integrate .. //depot/projects/usiii/arm/conf/DB-78XXX#1 branch .. //depot/projects/usiii/arm/conf/DB-88F5XXX#1 branch .. //depot/projects/usiii/arm/conf/DB-88F6XXX#1 branch .. //depot/projects/usiii/arm/conf/DEFAULTS#1 branch .. //depot/projects/usiii/arm/conf/EP80219#5 integrate .. //depot/projects/usiii/arm/conf/GUMSTIX#2 integrate .. //depot/projects/usiii/arm/conf/HL200#4 integrate .. //depot/projects/usiii/arm/conf/IQ31244#5 integrate .. //depot/projects/usiii/arm/conf/KB920X#7 integrate .. //depot/projects/usiii/arm/conf/NSLU#3 integrate .. //depot/projects/usiii/arm/conf/SIMICS#5 integrate .. //depot/projects/usiii/arm/conf/SKYEYE#5 integrate .. //depot/projects/usiii/arm/include/armreg.h#3 integrate .. //depot/projects/usiii/arm/include/atomic.h#4 integrate .. //depot/projects/usiii/arm/include/bootinfo.h#1 branch .. //depot/projects/usiii/arm/include/cpufunc.h#3 integrate .. //depot/projects/usiii/arm/include/elf.h#2 integrate .. //depot/projects/usiii/arm/include/ieee.h#2 integrate .. //depot/projects/usiii/arm/include/intr.h#5 integrate .. //depot/projects/usiii/arm/include/md_var.h#2 integrate .. //depot/projects/usiii/arm/include/metadata.h#2 integrate .. //depot/projects/usiii/arm/include/minidump.h#1 branch .. //depot/projects/usiii/arm/include/pmap.h#4 integrate .. //depot/projects/usiii/arm/include/resource.h#2 integrate .. //depot/projects/usiii/arm/include/vmparam.h#4 integrate .. //depot/projects/usiii/arm/mv/bus_space.c#1 branch .. //depot/projects/usiii/arm/mv/common.c#1 branch .. //depot/projects/usiii/arm/mv/discovery/db78xxx.c#1 branch .. //depot/projects/usiii/arm/mv/discovery/discovery.c#1 branch .. //depot/projects/usiii/arm/mv/discovery/files.db78xxx#1 branch .. //depot/projects/usiii/arm/mv/discovery/std.db78xxx#1 branch .. //depot/projects/usiii/arm/mv/files.mv#1 branch .. //depot/projects/usiii/arm/mv/gpio.c#1 branch .. //depot/projects/usiii/arm/mv/ic.c#1 branch .. //depot/projects/usiii/arm/mv/kirkwood/db88f6xxx.c#1 branch .. //depot/projects/usiii/arm/mv/kirkwood/files.db88f6xxx#1 branch .. //depot/projects/usiii/arm/mv/kirkwood/kirkwood.c#1 branch .. //depot/projects/usiii/arm/mv/kirkwood/std.db88f6xxx#1 branch .. //depot/projects/usiii/arm/mv/mv_machdep.c#1 branch .. //depot/projects/usiii/arm/mv/mv_pci.c#1 branch .. //depot/projects/usiii/arm/mv/mvreg.h#1 branch .. //depot/projects/usiii/arm/mv/mvvar.h#1 branch .. //depot/projects/usiii/arm/mv/obio.c#1 branch .. //depot/projects/usiii/arm/mv/orion/db88f5xxx.c#1 branch .. //depot/projects/usiii/arm/mv/orion/files.db88f5xxx#1 branch .. //depot/projects/usiii/arm/mv/orion/orion.c#1 branch .. //depot/projects/usiii/arm/mv/orion/std.db88f5xxx#1 branch .. //depot/projects/usiii/arm/mv/rtc.c#1 branch .. //depot/projects/usiii/arm/mv/std.mv#1 branch .. //depot/projects/usiii/arm/mv/timer.c#1 branch .. //depot/projects/usiii/arm/mv/twsi.c#1 branch .. //depot/projects/usiii/arm/sa11x0/assabet_machdep.c#4 integrate .. //depot/projects/usiii/arm/xscale/i80321/ep80219_machdep.c#5 integrate .. //depot/projects/usiii/arm/xscale/i80321/iq31244_machdep.c#5 integrate .. //depot/projects/usiii/arm/xscale/i8134x/crb_machdep.c#7 integrate .. //depot/projects/usiii/arm/xscale/i8134x/i81342_mcu.c#2 integrate .. //depot/projects/usiii/arm/xscale/ixp425/avila_ata.c#2 integrate .. //depot/projects/usiii/arm/xscale/ixp425/avila_led.c#2 integrate .. //depot/projects/usiii/arm/xscale/ixp425/avila_machdep.c#5 integrate .. //depot/projects/usiii/arm/xscale/ixp425/cambria_fled.c#1 branch .. //depot/projects/usiii/arm/xscale/ixp425/cambria_led.c#1 branch .. //depot/projects/usiii/arm/xscale/ixp425/files.avila#3 integrate .. //depot/projects/usiii/arm/xscale/ixp425/files.ixp425#4 integrate .. //depot/projects/usiii/arm/xscale/ixp425/if_npe.c#5 integrate .. //depot/projects/usiii/arm/xscale/ixp425/if_npereg.h#2 integrate .. //depot/projects/usiii/arm/xscale/ixp425/ixp425.c#4 integrate .. //depot/projects/usiii/arm/xscale/ixp425/ixp425_iic.c#4 integrate .. //depot/projects/usiii/arm/xscale/ixp425/ixp425_intr.h#2 integrate .. //depot/projects/usiii/arm/xscale/ixp425/ixp425_mem.c#2 integrate .. //depot/projects/usiii/arm/xscale/ixp425/ixp425_npe.c#3 integrate .. //depot/projects/usiii/arm/xscale/ixp425/ixp425_npevar.h#3 integrate .. //depot/projects/usiii/arm/xscale/ixp425/ixp425_pci.c#3 integrate .. //depot/projects/usiii/arm/xscale/ixp425/ixp425_qmgr.c#4 integrate .. //depot/projects/usiii/arm/xscale/ixp425/ixp425_timer.c#2 integrate .. //depot/projects/usiii/arm/xscale/ixp425/ixp425_wdog.c#2 integrate .. //depot/projects/usiii/arm/xscale/ixp425/ixp425reg.h#2 integrate .. //depot/projects/usiii/arm/xscale/ixp425/ixp425var.h#2 integrate .. //depot/projects/usiii/arm/xscale/ixp425/std.avila#2 integrate .. //depot/projects/usiii/arm/xscale/ixp425/std.ixp435#1 branch .. //depot/projects/usiii/arm/xscale/pxa/pxa_machdep.c#2 integrate .. //depot/projects/usiii/boot/Makefile#5 integrate .. //depot/projects/usiii/boot/arm/Makefile#2 integrate .. //depot/projects/usiii/boot/arm/at91/boot2/boot2.c#3 integrate .. //depot/projects/usiii/boot/arm/at91/boot2/centipad_board.c#2 integrate .. //depot/projects/usiii/boot/arm/at91/boot2/kb920x_board.c#2 integrate .. //depot/projects/usiii/boot/arm/ixp425/Makefile.inc#1 branch .. //depot/projects/usiii/boot/arm/ixp425/boot2/Makefile#1 branch .. //depot/projects/usiii/boot/arm/ixp425/boot2/arm_init.S#1 branch .. //depot/projects/usiii/boot/arm/ixp425/boot2/boot2.c#1 branch .. //depot/projects/usiii/boot/arm/ixp425/boot2/cf_ata.h#1 branch .. //depot/projects/usiii/boot/arm/ixp425/boot2/ixp425_board.c#1 branch .. //depot/projects/usiii/boot/arm/ixp425/boot2/lib.h#1 branch .. //depot/projects/usiii/boot/arm/uboot/Makefile#1 branch .. //depot/projects/usiii/boot/arm/uboot/conf.c#1 branch .. //depot/projects/usiii/boot/arm/uboot/help.uboot#1 branch .. //depot/projects/usiii/boot/arm/uboot/ldscript.arm#1 branch .. //depot/projects/usiii/boot/arm/uboot/start.S#1 branch .. //depot/projects/usiii/boot/arm/uboot/version#1 branch .. //depot/projects/usiii/boot/common/Makefile.inc#2 integrate .. //depot/projects/usiii/boot/common/bootstrap.h#3 integrate .. //depot/projects/usiii/boot/common/interp.c#2 integrate .. //depot/projects/usiii/boot/common/load.c#2 delete .. //depot/projects/usiii/boot/common/load_elf.c#3 integrate .. //depot/projects/usiii/boot/common/loader.8#3 integrate .. //depot/projects/usiii/boot/ficl/Makefile#3 integrate .. //depot/projects/usiii/boot/forth/loader.4th#2 integrate .. //depot/projects/usiii/boot/forth/loader.conf#7 integrate .. //depot/projects/usiii/boot/forth/pnp.4th#2 integrate .. //depot/projects/usiii/boot/forth/support.4th#3 integrate .. //depot/projects/usiii/boot/i386/Makefile#3 integrate .. //depot/projects/usiii/boot/i386/boot0/Makefile#2 integrate .. //depot/projects/usiii/boot/i386/boot0/boot0.S#2 integrate .. //depot/projects/usiii/boot/i386/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/usiii/boot/i386/gptzfsboot/Makefile#1 branch .. //depot/projects/usiii/boot/i386/libi386/biosdisk.c#4 integrate .. //depot/projects/usiii/boot/i386/libi386/bootinfo32.c#2 integrate .. //depot/projects/usiii/boot/i386/libi386/bootinfo64.c#2 integrate .. //depot/projects/usiii/boot/i386/libi386/devicename.c#4 integrate .. //depot/projects/usiii/boot/i386/loader/Makefile#3 integrate .. //depot/projects/usiii/boot/i386/loader/conf.c#2 integrate .. //depot/projects/usiii/boot/i386/loader/main.c#4 integrate .. //depot/projects/usiii/boot/i386/zfsboot/Makefile#1 branch .. //depot/projects/usiii/boot/i386/zfsboot/zfsboot.c#1 branch .. //depot/projects/usiii/boot/i386/zfsboot/zfsldr.S#1 branch .. //depot/projects/usiii/boot/ofw/libofw/ofw_disk.c#2 integrate .. //depot/projects/usiii/boot/powerpc/Makefile#4 integrate .. //depot/projects/usiii/boot/powerpc/boot1.chrp/Makefile#1 branch .. //depot/projects/usiii/boot/powerpc/boot1.chrp/Makefile.hfs#1 branch .. //depot/projects/usiii/boot/powerpc/boot1.chrp/boot1.c#1 branch .. //depot/projects/usiii/boot/powerpc/boot1.chrp/bootinfo.txt#1 branch .. //depot/projects/usiii/boot/powerpc/boot1.chrp/generate-hfs.sh#1 branch .. //depot/projects/usiii/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu#1 branch .. //depot/projects/usiii/boot/powerpc/uboot/conf.c#2 integrate .. //depot/projects/usiii/boot/sparc64/loader/main.c#6 integrate .. //depot/projects/usiii/boot/uboot/common/main.c#4 integrate .. //depot/projects/usiii/boot/uboot/lib/api_public.h#3 integrate .. //depot/projects/usiii/boot/uboot/lib/devicename.c#3 integrate .. //depot/projects/usiii/boot/uboot/lib/disk.c#3 integrate .. //depot/projects/usiii/boot/uboot/lib/glue.c#5 integrate .. //depot/projects/usiii/boot/uboot/lib/glue.h#4 integrate .. //depot/projects/usiii/boot/uboot/lib/libuboot.h#4 integrate .. //depot/projects/usiii/boot/uboot/lib/net.c#5 integrate .. //depot/projects/usiii/boot/zfs/Makefile#1 branch .. //depot/projects/usiii/boot/zfs/zfs.c#1 branch .. //depot/projects/usiii/boot/zfs/zfsimpl.c#1 branch .. //depot/projects/usiii/bsm/audit.h#4 integrate .. //depot/projects/usiii/bsm/audit_domain.h#1 branch .. //depot/projects/usiii/bsm/audit_errno.h#1 branch .. //depot/projects/usiii/bsm/audit_internal.h#3 integrate .. //depot/projects/usiii/bsm/audit_kevents.h#5 integrate .. //depot/projects/usiii/bsm/audit_record.h#3 integrate .. //depot/projects/usiii/bsm/audit_socket_type.h#1 branch .. //depot/projects/usiii/cam/cam_periph.c#3 integrate .. //depot/projects/usiii/cam/cam_periph.h#2 integrate .. //depot/projects/usiii/cam/cam_sim.c#2 integrate .. //depot/projects/usiii/cam/cam_sim.h#2 integrate .. //depot/projects/usiii/cam/cam_xpt.c#6 integrate .. //depot/projects/usiii/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/usiii/cam/scsi/scsi_all.c#4 integrate .. //depot/projects/usiii/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/usiii/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/usiii/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/usiii/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/usiii/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/usiii/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/usiii/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/usiii/cam/scsi/scsi_ses.c#4 integrate .. //depot/projects/usiii/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/usiii/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/usiii/cddl/boot/zfs/README#1 branch .. //depot/projects/usiii/cddl/boot/zfs/fletcher.c#1 branch .. //depot/projects/usiii/cddl/boot/zfs/lzjb.c#1 branch .. //depot/projects/usiii/cddl/boot/zfs/sha256.c#1 branch .. //depot/projects/usiii/cddl/boot/zfs/zfsimpl.h#1 branch .. //depot/projects/usiii/cddl/boot/zfs/zfssubr.c#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_atomic.c#3 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_kmem.c#3 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_lookup.c#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_zone.c#2 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/sys/acl.h#3 delete .. //depot/projects/usiii/cddl/compat/opensolaris/sys/atomic.h#4 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/sys/callb.h#3 delete .. //depot/projects/usiii/cddl/compat/opensolaris/sys/cred.h#2 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/sys/dnlc.h#2 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/sys/file.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/kidmap.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/kmem.h#3 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/sys/misc.h#2 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/sys/mntent.h#3 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/sys/param.h#2 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/sys/pathname.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/policy.h#2 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/sys/proc.h#2 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/sys/refstr.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/sid.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/sig.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/sunddi.h#2 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/sys/sysmacros.h#3 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/sys/time.h#2 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/sys/types.h#2 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/sys/uio.h#2 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/sys/vfs.h#2 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/sys/zone.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/common/acl/acl_common.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/common/acl/acl_common.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/common/avl/avl.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/common/unicode/u8_textprep.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/common/zfs/zpool_prop.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/common/zfs/zprop_common.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/Makefile.files#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#4 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/vnode.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#3 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#3 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#3 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#3 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#3 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/os/callb.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/os/list.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/os/taskq.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/acl.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/avl.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/callb.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/cred.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/dkio.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/extdirent.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/gfs.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/idmap.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#4 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/list.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/processor.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/synch.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/u8_textprep.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/u8_textprep_data.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/vnode.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#2 integrate .. //depot/projects/usiii/cddl/dev/cyclic/cyclic.c#2 integrate .. //depot/projects/usiii/cddl/dev/dtrace/dtrace_clone.c#2 integrate .. //depot/projects/usiii/cddl/dev/dtrace/dtrace_ioctl.c#2 integrate .. //depot/projects/usiii/cddl/dev/dtrace/dtrace_load.c#2 integrate .. //depot/projects/usiii/cddl/dev/dtrace/dtrace_unload.c#2 integrate .. //depot/projects/usiii/cddl/dev/dtrace/i386/dtrace_subr.c#2 integrate .. //depot/projects/usiii/cddl/dev/systrace/systrace.c#2 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32.h#3 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_ioctl.c#1 branch .. //depot/projects/usiii/compat/freebsd32/freebsd32_ioctl.h#1 branch .. //depot/projects/usiii/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_proto.h#11 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_signal.h#2 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_syscall.h#11 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_syscalls.c#11 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_sysent.c#11 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_util.h#2 integrate .. //depot/projects/usiii/compat/freebsd32/syscalls.master#11 integrate .. //depot/projects/usiii/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/usiii/compat/linprocfs/linprocfs.c#7 integrate .. //depot/projects/usiii/compat/linux/linux_emul.c#3 integrate .. //depot/projects/usiii/compat/linux/linux_futex.c#5 integrate .. //depot/projects/usiii/compat/linux/linux_futex.h#4 integrate .. //depot/projects/usiii/compat/linux/linux_getcwd.c#5 integrate .. //depot/projects/usiii/compat/linux/linux_ioctl.c#6 integrate .. //depot/projects/usiii/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/usiii/compat/linux/linux_misc.c#11 integrate .. //depot/projects/usiii/compat/linux/linux_signal.c#2 integrate .. //depot/projects/usiii/compat/linux/linux_signal.h#2 integrate .. //depot/projects/usiii/compat/linux/linux_socket.c#4 integrate .. //depot/projects/usiii/compat/linux/linux_socket.h#2 integrate .. //depot/projects/usiii/compat/linux/linux_util.c#4 integrate .. //depot/projects/usiii/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/usiii/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/usiii/compat/ndis/ndis_var.h#3 integrate .. //depot/projects/usiii/compat/ndis/ntoskrnl_var.h#4 integrate .. //depot/projects/usiii/compat/ndis/subr_ndis.c#7 integrate .. //depot/projects/usiii/compat/ndis/subr_ntoskrnl.c#5 integrate .. //depot/projects/usiii/compat/ndis/subr_usbd.c#2 integrate .. //depot/projects/usiii/compat/ndis/usbd_var.h#2 integrate .. //depot/projects/usiii/compat/svr4/svr4_sockio.c#4 integrate .. //depot/projects/usiii/compat/svr4/svr4_sysvec.c#5 integrate .. //depot/projects/usiii/conf/Makefile.arm#5 integrate .. //depot/projects/usiii/conf/NOTES#16 integrate .. //depot/projects/usiii/conf/files#16 integrate .. //depot/projects/usiii/conf/files.amd64#8 integrate .. //depot/projects/usiii/conf/files.arm#3 integrate .. //depot/projects/usiii/conf/files.i386#11 integrate .. //depot/projects/usiii/conf/files.ia64#3 integrate .. //depot/projects/usiii/conf/files.mips#4 integrate .. //depot/projects/usiii/conf/files.pc98#7 integrate .. //depot/projects/usiii/conf/files.powerpc#9 integrate .. //depot/projects/usiii/conf/files.sparc64#11 integrate .. //depot/projects/usiii/conf/files.sun4v#6 integrate .. //depot/projects/usiii/conf/kern.post.mk#5 integrate .. //depot/projects/usiii/conf/kern.pre.mk#5 integrate .. //depot/projects/usiii/conf/kmod.mk#4 integrate .. //depot/projects/usiii/conf/ldscript.mips.cfe#3 integrate .. //depot/projects/usiii/conf/newvers.sh#4 integrate .. //depot/projects/usiii/conf/options#16 integrate .. //depot/projects/usiii/conf/options.arm#4 integrate .. //depot/projects/usiii/conf/options.sparc64#6 integrate .. //depot/projects/usiii/contrib/altq/altq/altq_cbq.c#2 integrate .. //depot/projects/usiii/contrib/altq/altq/altq_cdnr.c#2 integrate .. //depot/projects/usiii/contrib/altq/altq/altq_hfsc.c#2 integrate .. //depot/projects/usiii/contrib/altq/altq/altq_priq.c#2 integrate .. //depot/projects/usiii/contrib/altq/altq/altq_red.c#2 integrate .. //depot/projects/usiii/contrib/altq/altq/altq_rio.c#2 integrate .. //depot/projects/usiii/contrib/altq/altq/altq_rmclass.c#2 integrate .. //depot/projects/usiii/contrib/altq/altq/altq_subr.c#4 integrate .. //depot/projects/usiii/contrib/dev/ath/COPYRIGHT#3 delete .. //depot/projects/usiii/contrib/dev/ath/README#3 delete .. //depot/projects/usiii/contrib/dev/ath/ah.h#3 delete .. //depot/projects/usiii/contrib/dev/ath/ah_desc.h#3 delete .. //depot/projects/usiii/contrib/dev/ath/ah_devid.h#3 delete .. //depot/projects/usiii/contrib/dev/ath/ah_soc.h#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/alpha-elf.hal.o.uu#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/alpha-elf.inc#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/alpha-elf.opt_ah.h#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/ap30.hal.o.uu#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/ap30.inc#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/ap30.opt_ah.h#2 delete .. //depot/projects/usiii/contrib/dev/ath/public/ap43.hal.o.uu#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/ap43.inc#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/ap43.opt_ah.h#2 delete .. //depot/projects/usiii/contrib/dev/ath/public/ap51.hal.o.uu#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/ap51.inc#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/ap51.opt_ah.h#2 delete .. //depot/projects/usiii/contrib/dev/ath/public/ap61.hal.o.uu#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/ap61.inc#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/ap61.opt_ah.h#2 delete .. //depot/projects/usiii/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/arm9-le-thumb-elf.inc#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/armv4-be-elf.inc#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/armv4-le-elf.inc#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/i386-elf.hal.o.uu#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/i386-elf.inc#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/i386-elf.opt_ah.h#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/mips-be-elf.hal.o.uu#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/mips-be-elf.inc#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/mips-be-elf.opt_ah.h#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/mips-le-elf.hal.o.uu#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/mips-le-elf.inc#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/mips-le-elf.opt_ah.h#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/mips1-be-elf.inc#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/mips1-le-elf.inc#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/mipsisa32-be-elf.inc#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/mipsisa32-le-elf.inc#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/powerpc-be-eabi.inc#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/powerpc-be-elf.inc#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/powerpc-le-eabi.inc#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/sh4-le-elf.inc#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/sparc-be-elf.inc#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/sparc64-be-elf.inc#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/wackelf.c#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/wisoc.hal.o.uu#2 delete .. //depot/projects/usiii/contrib/dev/ath/public/wisoc.inc#2 delete .. //depot/projects/usiii/contrib/dev/ath/public/wisoc.opt_ah.h#2 delete .. //depot/projects/usiii/contrib/dev/ath/public/x86_64-elf.hal.o.uu#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/x86_64-elf.inc#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/x86_64-elf.opt_ah.h#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/xscale-be-elf.inc#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/xscale-le-elf.inc#3 delete .. //depot/projects/usiii/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#3 delete .. //depot/projects/usiii/contrib/dev/ath/version.h#3 delete .. //depot/projects/usiii/contrib/dev/npe/IxNpeMicrocode.dat.uu#2 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/ip_auth.c#3 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/ip_compat.h#4 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/ip_fil_freebsd.c#5 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/mlfk_ipl.c#3 integrate .. //depot/projects/usiii/contrib/pf/net/pf.c#7 integrate .. //depot/projects/usiii/contrib/pf/net/pf_if.c#5 integrate .. //depot/projects/usiii/contrib/pf/net/pf_ioctl.c#7 integrate .. //depot/projects/usiii/contrib/pf/net/pf_subr.c#3 integrate .. //depot/projects/usiii/contrib/pf/net/pf_table.c#3 integrate .. //depot/projects/usiii/contrib/pf/net/pfvar.h#3 integrate .. //depot/projects/usiii/contrib/rdma/rdma_addr.c#2 integrate .. //depot/projects/usiii/contrib/rdma/rdma_cma.c#3 integrate .. //depot/projects/usiii/crypto/rc4/rc4.c#2 integrate .. //depot/projects/usiii/crypto/via/padlock.c#3 integrate .. //depot/projects/usiii/crypto/via/padlock_hash.c#2 integrate .. //depot/projects/usiii/ddb/db_command.c#6 integrate .. //depot/projects/usiii/ddb/db_command.h#3 integrate .. //depot/projects/usiii/ddb/db_main.c#3 integrate .. //depot/projects/usiii/ddb/db_textdump.c#3 integrate .. //depot/projects/usiii/dev/aac/aac_pci.c#6 integrate .. //depot/projects/usiii/dev/acpi_support/acpi_asus.c#5 integrate .. //depot/projects/usiii/dev/acpica/Osd/OsdSchedule.c#3 integrate .. //depot/projects/usiii/dev/acpica/acpi.c#10 integrate .. //depot/projects/usiii/dev/acpica/acpi_battery.c#3 integrate .. //depot/projects/usiii/dev/acpica/acpi_hpet.c#4 integrate .. //depot/projects/usiii/dev/acpica/acpi_pcib.c#2 integrate .. //depot/projects/usiii/dev/acpica/acpi_smbat.c#2 integrate .. //depot/projects/usiii/dev/adb/adb.h#1 branch .. //depot/projects/usiii/dev/adb/adb_bus.c#1 branch .. //depot/projects/usiii/dev/adb/adb_hb_if.m#1 branch .. //depot/projects/usiii/dev/adb/adb_if.m#1 branch .. //depot/projects/usiii/dev/adb/adb_kbd.c#1 branch .. //depot/projects/usiii/dev/adb/adb_mouse.c#1 branch .. //depot/projects/usiii/dev/adb/adbvar.h#1 branch .. //depot/projects/usiii/dev/ae/if_ae.c#1 branch .. //depot/projects/usiii/dev/ae/if_aereg.h#1 branch .. //depot/projects/usiii/dev/ae/if_aevar.h#1 branch .. //depot/projects/usiii/dev/age/if_age.c#4 integrate .. //depot/projects/usiii/dev/age/if_agevar.h#2 integrate .. //depot/projects/usiii/dev/agp/agp.c#3 integrate .. //depot/projects/usiii/dev/agp/agp_amd64.c#2 integrate .. //depot/projects/usiii/dev/agp/agp_i810.c#4 integrate .. //depot/projects/usiii/dev/agp/agp_via.c#2 integrate .. //depot/projects/usiii/dev/agp/agppriv.h#2 integrate .. //depot/projects/usiii/dev/agp/agpreg.h#2 integrate .. //depot/projects/usiii/dev/aha/aha_isa.c#2 integrate .. //depot/projects/usiii/dev/aha/aha_mca.c#2 integrate .. //depot/projects/usiii/dev/ale/if_ale.c#1 branch .. //depot/projects/usiii/dev/ale/if_alereg.h#1 branch .. //depot/projects/usiii/dev/ale/if_alevar.h#1 branch .. //depot/projects/usiii/dev/amr/amr.c#5 integrate .. //depot/projects/usiii/dev/amr/amr_cam.c#4 integrate .. //depot/projects/usiii/dev/amr/amrvar.h#3 integrate .. //depot/projects/usiii/dev/an/if_an.c#5 integrate .. //depot/projects/usiii/dev/ar/if_ar.c#2 integrate .. //depot/projects/usiii/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/usiii/dev/asmc/asmc.c#4 integrate .. //depot/projects/usiii/dev/asr/asr.c#2 integrate .. //depot/projects/usiii/dev/ata/ata-all.c#7 integrate .. //depot/projects/usiii/dev/ata/ata-all.h#6 integrate .. //depot/projects/usiii/dev/ata/ata-chipset.c#12 delete .. //depot/projects/usiii/dev/ata/ata-dma.c#6 integrate .. //depot/projects/usiii/dev/ata/ata-pci.c#7 integrate .. //depot/projects/usiii/dev/ata/ata-pci.h#10 integrate .. //depot/projects/usiii/dev/ata/ata-queue.c#4 integrate .. //depot/projects/usiii/dev/ata/ata-sata.c#1 branch .. //depot/projects/usiii/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/usiii/dev/ata/atapi-tape.c#5 integrate .. //depot/projects/usiii/dev/ata/chipsets/ata-acard.c#1 branch .. //depot/projects/usiii/dev/ata/chipsets/ata-acerlabs.c#1 branch .. //depot/projects/usiii/dev/ata/chipsets/ata-adaptec.c#1 branch .. //depot/projects/usiii/dev/ata/chipsets/ata-ahci.c#1 branch .. //depot/projects/usiii/dev/ata/chipsets/ata-amd.c#1 branch .. //depot/projects/usiii/dev/ata/chipsets/ata-ati.c#1 branch .. //depot/projects/usiii/dev/ata/chipsets/ata-cenatek.c#1 branch .. //depot/projects/usiii/dev/ata/chipsets/ata-cypress.c#1 branch .. //depot/projects/usiii/dev/ata/chipsets/ata-cyrix.c#1 branch .. //depot/projects/usiii/dev/ata/chipsets/ata-highpoint.c#1 branch .. //depot/projects/usiii/dev/ata/chipsets/ata-intel.c#1 branch .. //depot/projects/usiii/dev/ata/chipsets/ata-ite.c#1 branch .. //depot/projects/usiii/dev/ata/chipsets/ata-jmicron.c#1 branch .. //depot/projects/usiii/dev/ata/chipsets/ata-marvell.c#1 branch .. //depot/projects/usiii/dev/ata/chipsets/ata-micron.c#1 branch .. //depot/projects/usiii/dev/ata/chipsets/ata-national.c#1 branch .. //depot/projects/usiii/dev/ata/chipsets/ata-netcell.c#1 branch .. //depot/projects/usiii/dev/ata/chipsets/ata-nvidia.c#1 branch .. //depot/projects/usiii/dev/ata/chipsets/ata-promise.c#1 branch .. //depot/projects/usiii/dev/ata/chipsets/ata-serverworks.c#1 branch .. //depot/projects/usiii/dev/ata/chipsets/ata-siliconimage.c#1 branch .. //depot/projects/usiii/dev/ata/chipsets/ata-sis.c#1 branch .. //depot/projects/usiii/dev/ata/chipsets/ata-via.c#1 branch .. //depot/projects/usiii/dev/ath/ah_osdep.c#3 integrate .. //depot/projects/usiii/dev/ath/ah_osdep.h#4 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ah.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ah.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ah_debug.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ah_decode.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ah_desc.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ah_devid.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ah_eeprom.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ah_eeprom_v1.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ah_eeprom_v1.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ah_eeprom_v14.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ah_eeprom_v14.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ah_eeprom_v3.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ah_eeprom_v3.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ah_internal.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ah_regdomain.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ah_soc.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5210/ar5210.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5210/ar5210_attach.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5210/ar5210_beacon.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5210/ar5210_interrupts.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5210/ar5210_keycache.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5210/ar5210_misc.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5210/ar5210_phy.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5210/ar5210_power.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5210/ar5210_recv.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5210/ar5210_reset.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5210/ar5210_xmit.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5210/ar5210desc.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5210/ar5210phy.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5210/ar5210reg.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5210/ar5k_0007.ini#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5211/ar5211.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5211/ar5211_attach.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5211/ar5211_beacon.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5211/ar5211_keycache.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5211/ar5211_misc.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5211/ar5211_phy.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5211/ar5211_power.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5211/ar5211_recv.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5211/ar5211_reset.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5211/ar5211_xmit.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5211/ar5211desc.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5211/ar5211phy.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5211/ar5211reg.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5211/boss.ini#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar2316.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar2317.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar2413.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar2425.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5111.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5112.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5212.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5212.ini#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5212_ani.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5212_attach.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5212_beacon.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5212_eeprom.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5212_gpio.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5212_keycache.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5212_misc.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5212_phy.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5212_power.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5212_recv.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5212_reset.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5212_rfgain.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5212_xmit.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5212desc.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5212phy.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5212reg.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5311reg.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5413.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5312/ar5312.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5312/ar5312_attach.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5312/ar5312_eeprom.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5312/ar5312_gpio.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5312/ar5312_interrupts.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5312/ar5312_misc.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5312/ar5312_power.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5312/ar5312_reset.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5312/ar5312phy.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5312/ar5312reg.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5312/ar5315_gpio.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar2133.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416.ini#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416_ani.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416_attach.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416_beacon.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416_cal.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416_cal.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416_eeprom.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416_gpio.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416_keycache.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416_misc.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416_phy.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416_power.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416_recv.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416_reset.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416_xmit.c#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416desc.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416phy.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416reg.h#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar9160.ini#1 branch .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar9160_attach.c#1 branch .. //depot/projects/usiii/dev/ath/ath_rate/amrr/amrr.c#3 integrate .. //depot/projects/usiii/dev/ath/ath_rate/onoe/onoe.c#3 integrate .. //depot/projects/usiii/dev/ath/ath_rate/sample/sample.c#5 integrate .. //depot/projects/usiii/dev/ath/ath_rate/sample/sample.h#3 integrate .. //depot/projects/usiii/dev/ath/if_ath.c#11 integrate .. //depot/projects/usiii/dev/ath/if_ath_pci.c#4 integrate .. //depot/projects/usiii/dev/ath/if_athioctl.h#3 integrate .. //depot/projects/usiii/dev/ath/if_athrate.h#3 integrate .. //depot/projects/usiii/dev/ath/if_athvar.h#7 integrate .. //depot/projects/usiii/dev/atkbdc/psm.c#5 integrate .. //depot/projects/usiii/dev/bce/if_bce.c#8 integrate .. //depot/projects/usiii/dev/bce/if_bcereg.h#6 integrate .. //depot/projects/usiii/dev/bge/if_bge.c#13 integrate .. //depot/projects/usiii/dev/bge/if_bgereg.h#6 integrate .. //depot/projects/usiii/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/usiii/dev/bm/if_bm.c#3 integrate .. //depot/projects/usiii/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/usiii/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/usiii/dev/cardbus/cardbus_device.c#2 integrate .. //depot/projects/usiii/dev/cardbus/cardbusreg.h#2 integrate .. //depot/projects/usiii/dev/cardbus/cardbusvar.h#2 integrate .. //depot/projects/usiii/dev/ce/if_ce.c#3 integrate .. //depot/projects/usiii/dev/cfe/cfe_api.c#1 branch .. //depot/projects/usiii/dev/cfe/cfe_api.h#1 branch .. //depot/projects/usiii/dev/cfe/cfe_api_int.h#1 branch .. //depot/projects/usiii/dev/cfe/cfe_console.c#1 branch .. //depot/projects/usiii/dev/cfe/cfe_error.h#1 branch .. //depot/projects/usiii/dev/cfe/cfe_ioctl.h#1 branch .. //depot/projects/usiii/dev/cfe/cfe_resource.c#1 branch .. //depot/projects/usiii/dev/cfi/cfi_bus_lbc.c#1 branch .. //depot/projects/usiii/dev/cfi/cfi_core.c#1 branch .. //depot/projects/usiii/dev/cfi/cfi_dev.c#1 branch .. //depot/projects/usiii/dev/cfi/cfi_reg.h#1 branch .. //depot/projects/usiii/dev/cfi/cfi_var.h#1 branch .. //depot/projects/usiii/dev/coretemp/coretemp.c#6 integrate .. //depot/projects/usiii/dev/cp/if_cp.c#3 integrate .. //depot/projects/usiii/dev/cpuctl/cpuctl.c#3 integrate .. //depot/projects/usiii/dev/ctau/if_ct.c#4 integrate .. //depot/projects/usiii/dev/cxgb/common/cxgb_ael1002.c#5 integrate .. //depot/projects/usiii/dev/cxgb/common/cxgb_common.h#6 integrate .. //depot/projects/usiii/dev/cxgb/common/cxgb_ctl_defs.h#4 integrate .. //depot/projects/usiii/dev/cxgb/common/cxgb_mc5.c#4 integrate .. //depot/projects/usiii/dev/cxgb/common/cxgb_mv88e1xxx.c#4 integrate .. //depot/projects/usiii/dev/cxgb/common/cxgb_t3_hw.c#6 integrate .. //depot/projects/usiii/dev/cxgb/common/cxgb_tn1010.c#2 integrate .. //depot/projects/usiii/dev/cxgb/common/cxgb_vsc7323.c#3 integrate .. //depot/projects/usiii/dev/cxgb/common/cxgb_vsc8211.c#4 integrate .. //depot/projects/usiii/dev/cxgb/common/cxgb_xgmac.c#5 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_adapter.h#9 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_config.h#5 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_include.h#5 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_main.c#11 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_multiq.c#3 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_offload.c#6 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_offload.h#7 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_osdep.h#8 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_sge.c#9 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_t3fw.c#2 integrate .. //depot/projects/usiii/dev/cxgb/sys/cxgb_support.c#5 integrate .. //depot/projects/usiii/dev/cxgb/sys/mvec.h#4 integrate .. //depot/projects/usiii/dev/cxgb/sys/uipc_mvec.c#4 integrate .. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 integrate .. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate .. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#2 integrate .. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#2 integrate .. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#2 integrate .. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#2 integrate .. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#2 integrate .. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#2 integrate .. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#2 integrate .. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#2 integrate .. //depot/projects/usiii/dev/cxgb/ulp/toecore/toedev.c#3 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_cpl_io.c#9 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#8 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_ddp.c#7 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_l2t.c#3 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_l2t.h#2 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_listen.c#5 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#4 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#3 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_toepcb.h#4 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_tom.c#6 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_tom.h#3 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#5 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_vm.h#2 integrate .. //depot/projects/usiii/dev/dc/dcphy.c#3 integrate .. //depot/projects/usiii/dev/dc/if_dc.c#7 integrate .. //depot/projects/usiii/dev/dc/if_dcreg.h#4 integrate .. //depot/projects/usiii/dev/dc/pnphy.c#2 integrate .. //depot/projects/usiii/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/usiii/dev/dcons/dcons_os.c#5 integrate .. //depot/projects/usiii/dev/digi/con.CX-IBM.h#2 delete .. //depot/projects/usiii/dev/digi/con.CX.h#2 delete .. //depot/projects/usiii/dev/digi/con.EPCX.h#2 delete .. //depot/projects/usiii/dev/digi/con.MBank.h#2 delete .. //depot/projects/usiii/dev/drm/ati_pcigart.c#4 integrate .. //depot/projects/usiii/dev/drm/drm.h#3 integrate .. //depot/projects/usiii/dev/drm/drmP.h#4 integrate .. //depot/projects/usiii/dev/drm/drm_agpsupport.c#4 integrate .. //depot/projects/usiii/dev/drm/drm_atomic.h#2 integrate .. //depot/projects/usiii/dev/drm/drm_auth.c#3 integrate .. //depot/projects/usiii/dev/drm/drm_bufs.c#4 integrate .. //depot/projects/usiii/dev/drm/drm_context.c#3 integrate .. //depot/projects/usiii/dev/drm/drm_dma.c#3 integrate .. //depot/projects/usiii/dev/drm/drm_drawable.c#3 integrate .. //depot/projects/usiii/dev/drm/drm_drv.c#5 integrate .. //depot/projects/usiii/dev/drm/drm_fops.c#3 integrate .. //depot/projects/usiii/dev/drm/drm_ioctl.c#3 integrate .. //depot/projects/usiii/dev/drm/drm_irq.c#3 integrate .. //depot/projects/usiii/dev/drm/drm_linux_list.h#2 integrate .. //depot/projects/usiii/dev/drm/drm_lock.c#4 integrate .. //depot/projects/usiii/dev/drm/drm_memory.c#3 integrate .. //depot/projects/usiii/dev/drm/drm_pci.c#4 integrate .. //depot/projects/usiii/dev/drm/drm_pciids.h#5 integrate .. //depot/projects/usiii/dev/drm/drm_scatter.c#3 integrate .. //depot/projects/usiii/dev/drm/drm_sysctl.c#3 integrate .. //depot/projects/usiii/dev/drm/drm_vm.c#3 integrate .. //depot/projects/usiii/dev/drm/i915_dma.c#5 integrate .. //depot/projects/usiii/dev/drm/i915_drm.h#3 integrate .. //depot/projects/usiii/dev/drm/i915_drv.c#3 integrate .. //depot/projects/usiii/dev/drm/i915_drv.h#3 integrate .. //depot/projects/usiii/dev/drm/i915_irq.c#3 integrate .. //depot/projects/usiii/dev/drm/i915_suspend.c#2 integrate .. //depot/projects/usiii/dev/drm/mach64_drv.c#3 integrate .. //depot/projects/usiii/dev/drm/mga_drv.c#3 integrate .. //depot/projects/usiii/dev/drm/r128_drv.c#3 integrate .. //depot/projects/usiii/dev/drm/radeon_cp.c#3 integrate .. //depot/projects/usiii/dev/drm/radeon_drv.c#3 integrate .. //depot/projects/usiii/dev/drm/radeon_drv.h#3 integrate .. //depot/projects/usiii/dev/drm/radeon_irq.c#3 integrate .. //depot/projects/usiii/dev/drm/savage_drv.c#3 integrate .. //depot/projects/usiii/dev/drm/sis_drv.c#3 integrate .. //depot/projects/usiii/dev/drm/tdfx_drv.c#3 integrate .. //depot/projects/usiii/dev/e1000/e1000_80003es2lan.c#2 integrate .. //depot/projects/usiii/dev/e1000/e1000_82540.c#2 integrate .. //depot/projects/usiii/dev/e1000/e1000_82541.c#2 integrate .. //depot/projects/usiii/dev/e1000/e1000_82542.c#2 integrate .. //depot/projects/usiii/dev/e1000/e1000_82543.c#2 integrate .. //depot/projects/usiii/dev/e1000/e1000_82571.c#2 integrate .. //depot/projects/usiii/dev/e1000/e1000_82575.c#2 integrate .. //depot/projects/usiii/dev/e1000/e1000_82575.h#2 integrate .. //depot/projects/usiii/dev/e1000/e1000_api.c#2 integrate .. //depot/projects/usiii/dev/e1000/e1000_api.h#2 integrate .. //depot/projects/usiii/dev/e1000/e1000_defines.h#2 integrate .. //depot/projects/usiii/dev/e1000/e1000_hw.h#2 integrate .. //depot/projects/usiii/dev/e1000/e1000_ich8lan.c#2 integrate .. //depot/projects/usiii/dev/e1000/e1000_ich8lan.h#2 integrate .. //depot/projects/usiii/dev/e1000/e1000_mac.c#2 integrate .. //depot/projects/usiii/dev/e1000/e1000_mac.h#2 integrate .. //depot/projects/usiii/dev/e1000/e1000_manage.c#2 integrate .. //depot/projects/usiii/dev/e1000/e1000_nvm.c#2 integrate .. //depot/projects/usiii/dev/e1000/e1000_osdep.c#2 integrate .. //depot/projects/usiii/dev/e1000/e1000_osdep.h#2 integrate .. //depot/projects/usiii/dev/e1000/e1000_phy.c#2 integrate .. //depot/projects/usiii/dev/e1000/e1000_phy.h#2 integrate .. //depot/projects/usiii/dev/e1000/e1000_regs.h#2 integrate .. //depot/projects/usiii/dev/e1000/if_em.c#2 integrate .. //depot/projects/usiii/dev/e1000/if_em.h#2 integrate .. //depot/projects/usiii/dev/e1000/if_igb.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 28 16:12:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E6CC1065733; Wed, 28 Jan 2009 16:12: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 10D211065731 for ; Wed, 28 Jan 2009 16:12:08 +0000 (UTC) (envelope-from flz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E59918FC12 for ; Wed, 28 Jan 2009 16:12:07 +0000 (UTC) (envelope-from flz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0SGC7TC061455 for ; Wed, 28 Jan 2009 16:12:07 GMT (envelope-from flz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0SGC7BY061453 for perforce@freebsd.org; Wed, 28 Jan 2009 16:12:07 GMT (envelope-from flz@freebsd.org) Date: Wed, 28 Jan 2009 16:12:07 GMT Message-Id: <200901281612.n0SGC7BY061453@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to flz@freebsd.org using -f From: Florent Thoumie To: Perforce Change Reviews Cc: Subject: PERFORCE change 156800 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 Jan 2009 16:12:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=156800 Change 156800 by flz@flz_mayday on 2009/01/28 16:11:07 IFC. Affected files ... .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/main.c#7 integrate .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/pkg_add.1#3 integrate .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/lib.h#19 integrate .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/plist.c#13 integrate Differences ... ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/main.c#7 (text+ko) ==== @@ -19,7 +19,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/add/main.c,v 1.79 2008/10/17 15:10:45 brooks Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/add/main.c,v 1.80 2008/12/25 15:44:10 flz Exp $"); #include #include @@ -79,6 +79,7 @@ { 602000, 602099, "/packages-6.2-release" }, { 603000, 603099, "/packages-6.3-release" }, { 700000, 700099, "/packages-7.0-release" }, + { 701000, 701099, "/packages-7.1-release" }, { 300000, 399000, "/packages-3-stable" }, { 400000, 499000, "/packages-4-stable" }, { 502100, 502128, "/packages-5-current" }, ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/pkg_add.1#3 (text+ko) ==== @@ -13,9 +13,9 @@ .\" .\" Jordan K. Hubbard .\" -.\" $FreeBSD: src/usr.sbin/pkg_install/add/pkg_add.1,v 1.77 2008/05/30 14:26:07 flz Exp $ +.\" $FreeBSD: src/usr.sbin/pkg_install/add/pkg_add.1,v 1.79 2009/01/11 13:56:55 chinsan Exp $ .\" -.Dd May 30, 2008 +.Dd January 4, 2009 .Dt PKG_ADD 1 .Os .Sh NAME @@ -90,7 +90,7 @@ .It Fl i , -no-deps Install the package without fetching and installing dependencies. -.It Fl I , -no-scripts +.It Fl I , -no-script If any installation scripts (pre-install or post-install) exist for a given package, do not execute them. .It Fl n , -dry-run ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/lib.h#19 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/usr.sbin/pkg_install/lib/lib.h,v 1.69 2008/07/08 03:21:05 keramida Exp $ */ +/* $FreeBSD: src/usr.sbin/pkg_install/lib/lib.h,v 1.72 2009/01/06 19:00:12 flz Exp $ */ /* * FreeBSD install - a package for the installation and maintainance @@ -113,7 +113,7 @@ * Version of the package tools - increase only when some * functionality used by bsd.port.mk is changed, added or removed */ -#define PKG_INSTALL_VERSION 20080708 +#define PKG_INSTALL_VERSION 20090106 #define PKG_WRAPCONF_FNAME "/var/db/pkg_install.conf" // #define main(argc, argv) real_main(argc, argv) ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/plist.c#13 (text+ko) ==== @@ -19,7 +19,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/plist.c,v 1.52 2007/03/28 05:33:52 njl Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/plist.c,v 1.55 2009/01/06 19:00:12 flz Exp $"); #include "lib.h" #include From owner-p4-projects@FreeBSD.ORG Wed Jan 28 16:30:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17A9A106571D; Wed, 28 Jan 2009 16:30: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 820BD1065717 for ; Wed, 28 Jan 2009 16:30:26 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 692F88FC0C for ; Wed, 28 Jan 2009 16:30:26 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0SGUQTd065720 for ; Wed, 28 Jan 2009 16:30:26 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0SGUQ6k065718 for perforce@freebsd.org; Wed, 28 Jan 2009 16:30:26 GMT (envelope-from nwhitehorn@freebsd.org) Date: Wed, 28 Jan 2009 16:30:26 GMT Message-Id: <200901281630.n0SGUQ6k065718@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 156801 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 Jan 2009 16:30:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=156801 Change 156801 by nwhitehorn@nwhitehorn_trantor on 2009/01/28 16:30:19 Remove pointless debug code and fix a style issue. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea64.c#12 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea64.c#12 (text+ko) ==== @@ -792,10 +792,12 @@ CTR2(KTR_PMAP, "moea64_bootstrap: %d PTEGs, %d bytes", moea64_pteg_count, size); - /* We now need to allocate memory. This memory, to be allocated, - has to reside in a page table. The page table we are about to - allocate. We don't have BAT. So drop to data real mode for a minute - as a measure of last resort. We do this a couple times. */ + /* + * We now need to allocate memory. This memory, to be allocated, + * has to reside in a page table. The page table we are about to + * allocate. We don't have BAT. So drop to data real mode for a minute + * as a measure of last resort. We do this a couple times. + */ moea64_pteg_table = (struct lpteg *)moea64_bootstrap_alloc(size, size); DISABLE_TRANS(msr); @@ -2388,7 +2390,6 @@ boolean_t moea64_dev_direct_mapped(mmu_t mmu, vm_offset_t pa, vm_size_t size) { -printf("%s\n",__func__); return (EFAULT); } From owner-p4-projects@FreeBSD.ORG Wed Jan 28 17:10:07 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B7411065674; Wed, 28 Jan 2009 17:10: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 136BD1065672 for ; Wed, 28 Jan 2009 17:10:07 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F3F4C8FC21 for ; Wed, 28 Jan 2009 17:10:06 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0SHA6RJ080792 for ; Wed, 28 Jan 2009 17:10:06 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0SHA6Mk080790 for perforce@freebsd.org; Wed, 28 Jan 2009 17:10:06 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 28 Jan 2009 17:10:06 GMT Message-Id: <200901281710.n0SHA6Mk080790@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 156804 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 Jan 2009 17:10:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=156804 Change 156804 by rene@rene_self on 2009/01/28 17:09:21 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/new-users/article.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#15 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#11 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#9 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#7 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/security/chapter.sgml#11 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#20 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/new-users/article.sgml#4 (text+ko) ==== @@ -1,4 +1,4 @@ - + a, su to root, and type - &prompt.root; /sbin/mount -t msdos /dev/fd0 /mnt + &prompt.root; /sbin/mount -t msdosfs /dev/fd0 /mnt to mount the floppy drive on ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#15 (text+ko) ==== @@ -12,7 +12,7 @@ The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1107 2009/01/07 09:49:12 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1108 2009/01/28 08:48:21 keramida Exp $ 1995 @@ -5393,7 +5393,7 @@ a device file for slice 5 in /dev, so simply mount it: - &prompt.root; mount -t msdos /dev/da1s5 /dos/e + &prompt.root; mount -t msdosfs /dev/da1s5 /dos/e @@ -5596,11 +5596,11 @@ If it is a ZIP drive or a floppy, you have already got a DOS file system on it, you can use a command like this: - &prompt.root; mount -t msdos /dev/fd0c /floppy + &prompt.root; mount -t msdosfs /dev/fd0c /floppy if it is a floppy, or this: - &prompt.root; mount -t msdos /dev/da2s4 /zip + &prompt.root; mount -t msdosfs /dev/da2s4 /zip for a ZIP disk with the factory configuration. @@ -5834,7 +5834,7 @@ own: &prompt.user; mkdir ~/my-mount-point -&prompt.user; mount -t msdos /dev/fd0 ~/my-mount-point +&prompt.user; mount -t msdosfs /dev/fd0 ~/my-mount-point Users in group operator can now mount the CD-ROM /dev/acd0c onto a ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#11 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -3092,22 +3092,6 @@ - Germany - - - rsync://grappa.unix-ag.uni-kl.de/ - - Available collections: - - freebsd-cvs: The full FreeBSD CVS - repository. - - This machine also mirrors the CVS repositories of the - NetBSD and the OpenBSD projects, among others. - - - - Netherlands ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -374,10 +374,10 @@ FreeBSD: - sysinstall can be invoked on a + The sysinstall utility can be invoked on a running system to install, delete, and list available and installed packages. For more information, see , Post-Installation. + linkend="packages">. The package management command line tools, which are the subject of the rest of this section. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#7 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -257,9 +257,9 @@ Both ppp and pppd (the kernel level implementation of PPP) use the configuration - files located in the /etc/ppp directory. + files located in the /etc/ppp directory. Examples for user ppp can be found in - /usr/share/examples/ppp/. + /usr/share/examples/ppp/. Configuring ppp requires that you edit a number of files, depending on your requirements. What you put @@ -348,10 +348,10 @@ Identifies the device to which the modem is connected. COM1 is - /dev/cuad0 + /dev/cuad0 and COM2 is - /dev/cuad1. + /dev/cuad1. @@ -554,7 +554,7 @@ example. Example configuration files can be found in the - /usr/share/examples/ppp/ directory. + /usr/share/examples/ppp/ directory. @@ -768,7 +768,7 @@ pchilds:*:1011:300:Peter Childs PPP:/home/ppp:/etc/ppp/ppp-dialup - Create a /home/ppp directory that + Create a /home/ppp directory that is world readable containing the following 0 byte files: @@ -1230,8 +1230,8 @@ Ensure that the - tunN device - file is available in the /dev + tunN device + file is available in the /dev directory. @@ -1268,8 +1268,8 @@ Ensure that the - tunN device - file is available in the /dev + tunN device + file is available in the /dev directory. @@ -1332,8 +1332,8 @@ Before you start setting up PPP on your machine, make sure that pppd is located in - /usr/sbin and the directory - /etc/ppp exists. + /usr/sbin and the directory + /etc/ppp exists. pppd can work in two modes: @@ -1841,7 +1841,7 @@ so, you are not required to rebuild the kernel. When matching up sio modem is on sio1 or COM2 if you are in DOS, then your - modem device would be /dev/cuad1. + modem device would be /dev/cuad1. @@ -1862,7 +1862,7 @@ We have now started ppp. - ppp ON example> set device /dev/cuad1 + ppp ON example> set device /dev/cuad1 We set our modem device, in this case it is cuad1. @@ -1884,7 +1884,7 @@ Switch to terminal mode so that we can manually control the modem. - deflink: Entering terminal mode on /dev/cuad1 + deflink: Entering terminal mode on /dev/cuad1 type '~h' for help at @@ -2301,13 +2301,13 @@ configure mpd to suit your requirements and provider settings. The port places a set of sample configuration files which are well documented in - PREFIX/etc/mpd/. + PREFIX/etc/mpd/. Note here that PREFIX means the directory into which your ports are installed, this defaults to - /usr/local/. A complete guide to + /usr/local/. A complete guide to configure mpd is available in HTML format once the port has been installed. It is placed in - PREFIX/share/doc/mpd/. + PREFIX/share/doc/mpd/. Here is a sample configuration for connecting to an ADSL service with mpd. The configuration is spread over two files, first the @@ -2515,18 +2515,18 @@ First, determine which serial port your modem is connected to. Many people set up a symbolic link, such as - /dev/modem, to point to the real device name, - /dev/cuadN. + /dev/modem, to point to the real device name, + /dev/cuadN. This allows you to abstract the actual device name should you ever need to move the modem to a different port. It can become quite cumbersome when you need to fix a bunch of files in - /etc and .kermrc files all + /etc and .kermrc files all over the system! - /dev/cuad0 + /dev/cuad0 is - COM1, cuad1 + COM1, /dev/cuad1 is COM2, etc. @@ -2916,7 +2916,7 @@ Sliplogin Configuration As mentioned earlier, there are three files in the - /etc/sliphome directory that are part of + /etc/sliphome directory that are part of the configuration for /usr/sbin/sliplogin (see &man.sliplogin.8; for the actual manual page for sliplogin): slip.hosts, ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/security/chapter.sgml#11 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -647,7 +647,7 @@ gets run up to the point where the securelevel is set). This might be overdoing it, and upgrading the system is much more difficult when it operates at a high secure level. A less strict compromise is to run - the system at a higher secure level but skip setting set + the system at a higher secure level but skip setting the schg flag for every system file and directory under the sun. Another possibility is to simply mount / and /usr read-only. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#20 (text+ko) ==== @@ -1,7 +1,7 @@ Alternatively, use the plist script in /usr/ports/Tools/scripts/ to build the - package list automatically. The first step is the same as + package list automatically. The plist + script is a Ruby script that + automates most of the manual steps outlined in the previous + paragraphs. + + The first step is the same as above: take the first three lines, that is, mkdir, mtree and make depends. Then build and install the From owner-p4-projects@FreeBSD.ORG Wed Jan 28 17:13:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 283181065673; Wed, 28 Jan 2009 17:13: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 D2328106566C for ; Wed, 28 Jan 2009 17:13:10 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BF7B88FC0C for ; Wed, 28 Jan 2009 17:13:10 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0SHDAQX081050 for ; Wed, 28 Jan 2009 17:13:10 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0SHDALW081048 for perforce@freebsd.org; Wed, 28 Jan 2009 17:13:10 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 28 Jan 2009 17:13:10 GMT Message-Id: <200901281713.n0SHDALW081048@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 156806 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 Jan 2009 17:13:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=156806 Change 156806 by rene@rene_self on 2009/01/28 17:12:55 MFen handbook/mirrors 1.457 -> 1.458 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#16 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#16 (text+ko) ==== @@ -6,7 +6,7 @@ Vertaald door: Siebrand Mazeland %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml - %SRCID% 1.457 + %SRCID% 1.458 --> @@ -3231,22 +3231,6 @@ - Duitsland - - - rsync://grappa.unix-ag.uni-kl.de/ - - Beschikbare collecties: - - freebsd-cvs: het volledige &os; CVS - depot. - - Deze machine mirrort onder andere ook de CVS depots - voor de NetBSD en OpenBSD projecten. - - - - Nederland From owner-p4-projects@FreeBSD.ORG Wed Jan 28 17:18:16 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 870C4106568A; Wed, 28 Jan 2009 17:18: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 439EF1065688 for ; Wed, 28 Jan 2009 17:18:16 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3161C8FC20 for ; Wed, 28 Jan 2009 17:18:16 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0SHIG5p081419 for ; Wed, 28 Jan 2009 17:18:16 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0SHIGt6081417 for perforce@freebsd.org; Wed, 28 Jan 2009 17:18:16 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 28 Jan 2009 17:18:16 GMT Message-Id: <200901281718.n0SHIGt6081417@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 156808 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 Jan 2009 17:18:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=156808 Change 156808 by rene@rene_self on 2009/01/28 17:17:32 MFen handbook/ports 1.288 -> 1.289 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#16 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#16 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.29 2006/08/12 22:53:16 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/ports/chapter.sgml - %SRCID% 1.288 + %SRCID% 1.289 --> @@ -410,11 +410,11 @@ - sysinstall kan op een draaiend systeem - worden gebruikt om beschikbare en geïnstalleerde - pakketten te installeren, te verwijderen, en weer te geven. - Zie voor meer informatie Instellingen na de installatie. + Het gereedschap sysinstall kan op een + draaiend systeem worden gebruikt om beschikbare en + geïnstalleerde pakketten te installeren, te verwijderen, + en weer te geven. Zie voor meer informatie . From owner-p4-projects@FreeBSD.ORG Wed Jan 28 19:09:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F387D1065673; Wed, 28 Jan 2009 19:09: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 ABE9E106564A for ; Wed, 28 Jan 2009 19:09:11 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9A02C8FC14 for ; Wed, 28 Jan 2009 19:09:11 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0SJ9BwC093682 for ; Wed, 28 Jan 2009 19:09:11 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0SJ9BBY093680 for perforce@freebsd.org; Wed, 28 Jan 2009 19:09:11 GMT (envelope-from gabor@freebsd.org) Date: Wed, 28 Jan 2009 19:09:11 GMT Message-Id: <200901281909.n0SJ9BBY093680@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 156819 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 Jan 2009 19:09:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=156819 Change 156819 by gabor@gabor_server on 2009/01/28 19:08:38 - Add a BSDL-compatible dc(1) Affected files ... .. //depot/projects/soc2008/gabor_textproc/dc/Makefile#1 add .. //depot/projects/soc2008/gabor_textproc/dc/USD.doc/Makefile#1 add .. //depot/projects/soc2008/gabor_textproc/dc/USD.doc/dc#1 add .. //depot/projects/soc2008/gabor_textproc/dc/bcode.c#1 add .. //depot/projects/soc2008/gabor_textproc/dc/bcode.h#1 add .. //depot/projects/soc2008/gabor_textproc/dc/dc.1#1 add .. //depot/projects/soc2008/gabor_textproc/dc/dc.c#1 add .. //depot/projects/soc2008/gabor_textproc/dc/extern.h#1 add .. //depot/projects/soc2008/gabor_textproc/dc/inout.c#1 add .. //depot/projects/soc2008/gabor_textproc/dc/mem.c#1 add .. //depot/projects/soc2008/gabor_textproc/dc/stack.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jan 28 19:48:57 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91BA210656E2; Wed, 28 Jan 2009 19:48:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 260641065688 for ; Wed, 28 Jan 2009 19:48:57 +0000 (UTC) (envelope-from marius@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0A7888FC1B for ; Wed, 28 Jan 2009 19:48:57 +0000 (UTC) (envelope-from marius@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0SJmuh4096984 for ; Wed, 28 Jan 2009 19:48:56 GMT (envelope-from marius@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0SJmudD096982 for perforce@freebsd.org; Wed, 28 Jan 2009 19:48:56 GMT (envelope-from marius@freebsd.org) Date: Wed, 28 Jan 2009 19:48:56 GMT Message-Id: <200901281948.n0SJmudD096982@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marius@freebsd.org using -f From: Marius Strobl To: Perforce Change Reviews Cc: Subject: PERFORCE change 156822 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 Jan 2009 19:48:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=156822 Change 156822 by marius@flak on 2009/01/28 19:48:33 Fix vendor merge botches. Affected files ... .. //depot/projects/usiii/dev/sbni/if_sbni.c#3 add .. //depot/projects/usiii/dev/sbni/if_sbni_isa.c#3 add .. //depot/projects/usiii/dev/sbni/if_sbni_pci.c#3 add .. //depot/projects/usiii/dev/sbni/if_sbnireg.h#3 add .. //depot/projects/usiii/dev/sbni/if_sbnivar.h#3 add .. //depot/projects/usiii/dev/usb/u3g.c#2 edit .. //depot/projects/usiii/modules/sbni/Makefile#3 add .. //depot/projects/usiii/sparc64/include/dcr.h#2 edit .. //depot/projects/usiii/sparc64/pci/schizo.c#13 edit .. //depot/projects/usiii/sparc64/pci/schizoreg.h#6 edit .. //depot/projects/usiii/sparc64/pci/schizovar.h#5 edit .. //depot/projects/usiii/sparc64/sparc64/jbusppm.c#2 edit .. //depot/projects/usiii/sparc64/sparc64/schppm.c#2 edit .. //depot/projects/usiii/ufs/ffs/ffs_alloc.c#5 edit .. //depot/projects/usiii/ufs/ffs/ffs_balloc.c#5 edit .. //depot/projects/usiii/ufs/ffs/ffs_extern.h#4 edit .. //depot/projects/usiii/ufs/ffs/ffs_inode.c#6 edit .. //depot/projects/usiii/ufs/ffs/ffs_vnops.c#8 edit Differences ... ==== //depot/projects/usiii/dev/usb/u3g.c#2 (text+ko) ==== @@ -16,7 +16,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/usb/u3g.c,v 1.21 2008/11/26 17:16:54 n_hibma Exp $ + * $FreeBSD: src/sys/dev/usb/u3g.c,v 1.22 2009/01/27 19:37:30 n_hibma Exp $ */ /* @@ -108,6 +108,9 @@ {7200000, 384000}, }; +#define U3GIBUFSIZE 1024 +#define U3GOBUFSIZE 1024 + /* * Various supported device vendors/products. */ @@ -296,10 +299,9 @@ ucom->sc_iface = uaa->ifaces[i]; ucom->sc_bulkin_no = bulkin_no; ucom->sc_bulkout_no = bulkout_no; - // Allocate a buffer enough for 10ms worth of data - ucom->sc_ibufsize = u3g_speeds[sc->sc_speed].ispeed/10/USB_FRAMES_PER_SECOND*10; - ucom->sc_ibufsizepad = ucom->sc_ibufsize; - ucom->sc_obufsize = u3g_speeds[sc->sc_speed].ospeed/10/USB_FRAMES_PER_SECOND*10; + ucom->sc_ibufsize = U3GIBUFSIZE; + ucom->sc_ibufsizepad = U3GIBUFSIZE; + ucom->sc_obufsize = U3GOBUFSIZE; ucom->sc_opkthdrlen = 0; ucom->sc_callback = &u3g_callback; @@ -362,7 +364,6 @@ * anyway. * Note: We abuse the fact that ucom sets the speed through * ispeed/ospeed, not through ispeedwat/ospeedwat. - * XXX Are the speeds correct? */ if (portno == 0) { struct u3g_softc *sc = addr; ==== //depot/projects/usiii/sparc64/include/dcr.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$ + * $FreeBSD: src/sys/sparc64/include/dcr.h,v 1.1 2008/09/04 19:58:52 marius Exp $ */ #ifndef _MACHINE_DCR_H_ ==== //depot/projects/usiii/sparc64/pci/schizo.c#13 (text+ko) ==== @@ -1,7 +1,7 @@ /*- * Copyright (c) 1999, 2000 Matthew R. Green * Copyright (c) 2001 - 2003 by Thomas Moestl - * Copyright (c) 2005, 2008 by Marius Strobl + * Copyright (c) 2005, 2007, 2008 by Marius Strobl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/sparc64/pci/schizo.c,v 1.5 2008/12/18 18:29:15 marius Exp $"); /* * Driver for `Schizo' Fireplane/Safari to PCI 2.1 and `Tomatillo' JBus to @@ -52,6 +52,7 @@ #include #include #include +#include #include #include @@ -64,7 +65,6 @@ #include #include #include -#include #include #include @@ -79,11 +79,13 @@ static const struct schizo_desc *schizo_get_desc(device_t); static void schizo_set_intr(struct schizo_softc *, u_int, u_int, driver_filter_t); -static driver_filter_t schizo_dmasync; +static driver_filter_t schizo_dma_sync_stub; +static driver_filter_t ichip_dma_sync_stub; static void schizo_intr_enable(void *); static void schizo_intr_disable(void *); static void schizo_intr_assign(void *); static void schizo_intr_clear(void *); +static int schizo_intr_register(struct schizo_softc *sc, u_int ino); static int schizo_get_intrmap(struct schizo_softc *, u_int, bus_addr_t *, bus_addr_t *); static bus_space_tag_t schizo_alloc_bus_tag(struct schizo_softc *, int); @@ -94,6 +96,7 @@ static driver_filter_t schizo_ue; static driver_filter_t schizo_ce; static driver_filter_t schizo_host_bus; +static driver_filter_t schizo_cdma; /* IOMMU support */ static void schizo_iommu_init(struct schizo_softc *, int, uint32_t); @@ -170,14 +173,16 @@ bus_addr_t sica_clr; }; -struct schizo_dmasync { +struct schizo_dma_sync { struct schizo_softc *sds_sc; driver_filter_t *sds_handler; void *sds_arg; void *sds_cookie; - bus_size_t sds_syncreg; uint64_t sds_syncval; - u_int sds_bswar; + device_t sds_ppb; /* farest PCI-PCI bridge */ + uint8_t sds_bus; /* bus of farest PCI device */ + uint8_t sds_slot; /* slot of farest PCI device */ + uint8_t sds_func; /* func. of farest PCI device */ }; #define SCHIZO_PERF_CNT_QLTY 100 @@ -212,7 +217,7 @@ const char *sd_name; }; -static const struct schizo_desc schizo_compats[] = { +static const struct schizo_desc const schizo_compats[] = { { "pci108e,8001", SCHIZO_MODE_SCZ, "Schizo" }, { "pci108e,a801", SCHIZO_MODE_TOM, "Tomatillo" }, { NULL, 0, NULL } @@ -252,10 +257,8 @@ { struct ofw_pci_ranges *range; const struct schizo_desc *desc; - struct schizo_icarg *sica; struct schizo_softc *asc, *sc, *osc; struct timecounter *tc; - bus_addr_t intrclr, intrmap; uint64_t ino_bitmap, reg; phandle_t node; uint32_t prop, prop_array[2]; @@ -269,6 +272,7 @@ sc->sc_dev = dev; sc->sc_node = node; sc->sc_mode = mode; + sc->sc_flags = 0; /* * The Schizo has three register banks: @@ -302,7 +306,7 @@ } /* - * Match other Schizo's that are already configured against + * Match other Schizos that are already configured against * the controller base physical address. This will be the * same for a pair of devices that share register space. */ @@ -322,6 +326,8 @@ panic("%s: could not malloc mutex", __func__); mtx_init(sc->sc_mtx, "pcib_mtx", NULL, MTX_SPIN); } else { + if (sc->sc_mode != SCHIZO_MODE_SCZ) + panic("%s: no partner expected", __func__); if (mtx_initialized(osc->sc_mtx) == 0) panic("%s: mutex not initialized", __func__); sc->sc_mtx = osc->sc_mtx; @@ -388,9 +394,10 @@ /* * Hunt through all the interrupt mapping regs and register - * the interrupt controller for our interrupt vectors. This - * is complicated by the fact that a pair of Schizo PBMs - * share one IGN. + * the interrupt controller for our interrupt vectors. We do + * this early in order to be able to catch stray interrupts. + * This is complicated by the fact that a pair of Schizo PBMs + * shares one IGN. */ n = OF_getprop(node, "ino-bitmap", (void *)prop_array, sizeof(prop_array)); @@ -403,24 +410,10 @@ if (n == STX_FB0_INO || n == STX_FB1_INO) /* Leave for upa(4). */ continue; - if (schizo_get_intrmap(sc, n, &intrmap, &intrclr) == 0) - continue; - sica = malloc(sizeof(*sica), M_DEVBUF, M_NOWAIT); - if (sica == NULL) - panic("%s: could not allocate interrupt controller " - "argument", __func__); - sica->sica_sc = sc; - sica->sica_map = intrmap; - sica->sica_clr = intrclr; -#ifdef SCHIZO_DEBUG - device_printf(dev, "intr map (INO %d) %#lx: %#lx, clr: %#lx\n", - n, (u_long)intrmap, (u_long)SCHIZO_PCI_READ_8(sc, intrmap), - (u_long)intrclr); -#endif - if (intr_controller_register(INTMAP_VEC(sc->sc_ign, n), - &schizo_ic, sica) != 0) - panic("%s: could not register interrupt controller " - "for INO %d", __func__, n); + i = schizo_intr_register(sc, n); + if (i != 0) + device_printf(dev, "could not register interrupt " + "controller for INO %d (%d)\n", n, i); } /* @@ -460,8 +453,10 @@ sc->sc_is.is_pmaxaddr = IOMMU_MAXADDR(STX_IOMMU_BITS); sc->sc_is.is_sb[0] = 0; sc->sc_is.is_sb[1] = 0; +#ifdef notyet if (OF_getproplen(node, "no-streaming-cache") < 0) sc->sc_is.is_sb[0] = STX_PCI_STRBUF; +#endif #define TSBCASE(x) \ case (IOTSB_BASESZ << (x)) << (IO_PAGE_SHIFT - IOTTE_SHIFT): \ @@ -489,6 +484,7 @@ } schizo_iommu_init(sc, tsbsize, prop_array[0]); } + #undef TSBCASE /* Initialize memory and I/O rmans. */ @@ -627,6 +623,39 @@ schizo_set_intr(sc, 3, STX_BUS_INO, schizo_host_bus); /* + * According to the Schizo Errata I-13, consistent DMA flushing/ + * syncing is FUBAR in version < 5 (i.e. revision < 2.3) bridges, + * so we can't use it and need to live with the consequences. + * With Schizo version >= 5, CDMA flushing/syncing is usable + * but requires the the workaround described in Schizo Errata + * I-23. With Tomatillo and XMITS, CDMA flushing/syncing works + * as expected, Tomatillo version <= 4 (i.e. revision <= 2.3) + * bridges additionally require a block store after a write to + * TOMXMS_PCI_DMA_SYNC_PEND though. + */ + if ((sc->sc_mode == SCHIZO_MODE_SCZ && sc->sc_ver >= 5) || + sc->sc_mode == SCHIZO_MODE_TOM || sc->sc_mode == SCHIZO_MODE_XMS) { + sc->sc_flags |= SCHIZO_FLAGS_CDMA; + if (sc->sc_mode == SCHIZO_MODE_SCZ) { + n = STX_CDMA_A_INO + sc->sc_half; + if (bus_set_resource(dev, SYS_RES_IRQ, 5, + INTMAP_VEC(sc->sc_ign, n), 1) != 0) + panic("%s: failed to add CDMA interrupt", + __func__); + i = schizo_intr_register(sc, n); + if (i != 0) + panic("%s: could not register interrupt " + "controller for CDMA (%d)", __func__, i); + (void)schizo_get_intrmap(sc, n, NULL, + &sc->sc_cdma_clr); + sc->sc_cdma_state = SCHIZO_CDMA_STATE_DONE; + schizo_set_intr(sc, 5, n, schizo_cdma); + } + if (sc->sc_mode == SCHIZO_MODE_TOM && sc->sc_ver <= 4) + sc->sc_flags |= SCHIZO_FLAGS_BSWAR; + } + + /* * Set the latency timer register as this isn't always done by the * firmware. */ @@ -653,12 +682,40 @@ INTIGN(vec = rman_get_start(sc->sc_irq_res[index])) != sc->sc_ign || INTINO(vec) != ino || intr_vectors[vec].iv_ic != &schizo_ic || - bus_setup_intr(sc->sc_dev, sc->sc_irq_res[index], INTR_TYPE_MISC, - handler, NULL, sc, &sc->sc_ihand[index]) != 0) + bus_setup_intr(sc->sc_dev, sc->sc_irq_res[index], + INTR_TYPE_MISC | INTR_FAST, handler, NULL, sc, + &sc->sc_ihand[index]) != 0) panic("%s: failed to set up interrupt %d", __func__, index); } static int +schizo_intr_register(struct schizo_softc *sc, u_int ino) +{ + struct schizo_icarg *sica; + bus_addr_t intrclr, intrmap; + int error; + + if (schizo_get_intrmap(sc, ino, &intrmap, &intrclr) == 0) + return (ENXIO); + sica = malloc(sizeof(*sica), M_DEVBUF, M_NOWAIT); + if (sica == NULL) + return (ENOMEM); + sica->sica_sc = sc; + sica->sica_map = intrmap; + sica->sica_clr = intrclr; +#ifdef SCHIZO_DEBUG + device_printf(sc->sc_dev, "intr map (INO %d) %#lx: %#lx, clr: %#lx\n", + ino, (u_long)intrmap, (u_long)SCHIZO_PCI_READ_8(sc, intrmap), + (u_long)intrclr); +#endif + error = (intr_controller_register(INTMAP_VEC(sc->sc_ign, ino), + &schizo_ic, sica)); + if (error != 0) + free(sica, M_DEVBUF); + return (error); +} + +static int schizo_get_intrmap(struct schizo_softc *sc, u_int ino, bus_addr_t *intrmapptr, bus_addr_t *intrclrptr) { @@ -801,6 +858,15 @@ return (FILTER_HANDLED); } +static int +schizo_cdma(void *arg) +{ + struct schizo_softc *sc = arg; + + atomic_store_rel_32(&sc->sc_cdma_state, SCHIZO_CDMA_STATE_DONE); + return (FILTER_HANDLED); +} + static void schizo_iommu_init(struct schizo_softc *sc, int tsbsize, uint32_t dvmabase) { @@ -947,33 +1013,65 @@ return (ENOENT); } +static int +schizo_dma_sync_stub(void *arg) +{ + struct timeval cur, end; + struct schizo_dma_sync *sds = arg; + struct schizo_softc *sc = sds->sds_sc; + uint32_t state; + + (void)PCIB_READ_CONFIG(sds->sds_ppb, sds->sds_bus, sds->sds_slot, + sds->sds_func, PCIR_VENDOR, 2); + for (; atomic_cmpset_acq_32(&sc->sc_cdma_state, SCHIZO_CDMA_STATE_DONE, + SCHIZO_CDMA_STATE_PENDING) == 0;) + ; + SCHIZO_PCI_WRITE_8(sc, sc->sc_cdma_clr, 1); + microuptime(&cur); + end.tv_sec = 1; + end.tv_usec = 0; + timevaladd(&end, &cur); + for (; (state = atomic_load_32(&sc->sc_cdma_state)) != + SCHIZO_CDMA_STATE_DONE && timevalcmp(&cur, &end, <=);) + microuptime(&cur); + if (state != SCHIZO_CDMA_STATE_DONE) + panic("%s: DMA does not sync", __func__); + return (sds->sds_handler(sds->sds_arg)); +} + #define VIS_BLOCKSIZE 64 static int -schizo_dmasync(void *arg) +ichip_dma_sync_stub(void *arg) { static u_char buf[VIS_BLOCKSIZE] __aligned(VIS_BLOCKSIZE); - struct schizo_dmasync *sds = arg; + struct timeval cur, end; + struct schizo_dma_sync *sds = arg; struct schizo_softc *sc = sds->sds_sc; - uint64_t reg; - int timeout; + register_t reg, s; - SCHIZO_PCI_WRITE_8(sc, sds->sds_syncreg, sds->sds_syncval); - timeout = 1000000; - for (; (SCHIZO_PCI_READ_8(sc, sds->sds_syncreg) & - sds->sds_syncval) != 0;) - if (--timeout < 0) - panic("%s: DMA does not sync", __func__); + (void)PCIB_READ_CONFIG(sds->sds_ppb, sds->sds_bus, sds->sds_slot, + sds->sds_func, PCIR_VENDOR, 2); + SCHIZO_PCI_WRITE_8(sc, TOMXMS_PCI_DMA_SYNC_PEND, sds->sds_syncval); + microuptime(&cur); + end.tv_sec = 1; + end.tv_usec = 0; + timevaladd(&end, &cur); + for (; ((reg = SCHIZO_PCI_READ_8(sc, TOMXMS_PCI_DMA_SYNC_PEND)) & + sds->sds_syncval) != 0 && timevalcmp(&cur, &end, <=);) + microuptime(&cur); + if ((reg & sds->sds_syncval) != 0) + panic("%s: DMA does not sync", __func__); - if (sds->sds_bswar != 0) { - critical_enter(); + if ((sc->sc_flags & SCHIZO_FLAGS_BSWAR) != 0) { + s = intr_disable(); reg = rd(fprs); wr(fprs, reg | FPRS_FEF, 0); - __asm__ __volatile__("stda %%f0, [%0] %1" + __asm __volatile("stda %%f0, [%0] %1" : : "r" (buf), "n" (ASI_BLK_COMMIT_S)); + membar(Sync); wr(fprs, reg, 0); - membar(Sync); - critical_exit(); + intr_restore(s); } return (sds->sds_handler(sds->sds_arg)); } @@ -1021,56 +1119,108 @@ int flags, driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep) { - struct schizo_dmasync *sds; + devclass_t pci_devclass; + device_t cdev, pdev, pcidev; + struct schizo_dma_sync *sds; struct schizo_softc *sc; u_long vec; - int error; + int error, found; sc = device_get_softc(dev); /* - * Make sure the vector is fully specified and we registered - * our interrupt controller for it. + * Make sure the vector is fully specified. */ vec = rman_get_start(ires); - if (INTIGN(vec) != sc->sc_ign || - intr_vectors[vec].iv_ic != &schizo_ic) { + if (INTIGN(vec) != sc->sc_ign) { device_printf(dev, "invalid interrupt vector 0x%lx\n", vec); return (EINVAL); } + if (intr_vectors[vec].iv_ic == &schizo_ic) { + /* + * Ensure we use the right softc in case the interrupt + * is routed to our companion PBM for some odd reason. + */ + sc = ((struct schizo_icarg *)intr_vectors[vec].iv_icarg)-> + sica_sc; + } else if (intr_vectors[vec].iv_ic == NULL) { + /* + * Work around broken firmware which misses entries in + * the ino-bitmap. + */ + error = schizo_intr_register(sc, INTINO(vec)); + if (error != 0) { + device_printf(dev, "could not register interrupt " + "controller for vector 0x%lx (%d)\n", vec, error); + return (error); + } + device_printf(dev, "belatedly registered as interrupt " + "controller for vector 0x%lx\n", vec); + } else { + device_printf(dev, + "invalid interrupt controller for vector 0x%lx\n", vec); + return (EINVAL); + } + /* - * Schizo revision >= 2.3 (i.e. version >= 5) and Tomatillo bridges - * need to be manually told to sync DMA writes. - * Tomatillo revision <= 2.3 (i.e. version <= 4) bridges additionally - * need a block store as a workaround for a hardware bug. - * XXX setup of the wrapper and the contents of schizo_dmasync() - * should be moved to schizo(4)-specific bus_dma_tag_create() and - * bus_dmamap_sync() methods, respectively, once DMA tag creation - * is newbus'ified, so the wrapper isn't only applied for interrupt - * handlers but also for polling(4) callbacks. + * Install a a wrapper for CDMA flushing/syncing for devices + * behind PCI-PCI bridges if possible. */ - if ((sc->sc_mode == SCHIZO_MODE_SCZ && sc->sc_ver >= 5) || - sc->sc_mode == SCHIZO_MODE_TOM) { + pcidev = NULL; + found = 0; + pci_devclass = devclass_find("pci"); + for (cdev = child; cdev != dev; cdev = pdev) { + pdev = device_get_parent(cdev); + if (pcidev == NULL) { + if (device_get_devclass(pdev) != pci_devclass) + continue; + pcidev = cdev; + continue; + } + if (pci_get_class(cdev) == PCIC_BRIDGE && + pci_get_subclass(cdev) == PCIS_BRIDGE_PCI) + found = 1; + } + if ((sc->sc_flags & SCHIZO_FLAGS_CDMA) != 0) { sds = malloc(sizeof(*sds), M_DEVBUF, M_NOWAIT | M_ZERO); if (sds == NULL) return (ENOMEM); - sds->sds_sc = sc; - sds->sds_arg = arg; - sds->sds_syncreg = sc->sc_mode == SCHIZO_MODE_SCZ ? - SCZ_PCI_DMA_SYNC : TOMXMS_PCI_DMA_SYNC_PEND; - sds->sds_syncval = 1ULL << INTINO(vec); - if (sc->sc_mode == SCHIZO_MODE_TOM && sc->sc_ver <= 4) - sds->sds_bswar = 1; - if (intr == NULL) { - sds->sds_handler = filt; + if (found != 0 && pcidev != NULL) { + sds->sds_sc = sc; + sds->sds_arg = arg; + sds->sds_ppb = + device_get_parent(device_get_parent(pcidev)); + sds->sds_bus = pci_get_bus(pcidev); + sds->sds_slot = pci_get_slot(pcidev); + sds->sds_func = pci_get_function(pcidev); + sds->sds_syncval = 1ULL << INTINO(vec); + if (bootverbose) + device_printf(dev, "installed DMA sync " + "wrapper for device %d.%d on bus %d\n", + sds->sds_slot, sds->sds_func, + sds->sds_bus); + +#define DMA_SYNC_STUB \ + (sc->sc_mode == SCHIZO_MODE_SCZ ? schizo_dma_sync_stub : \ + ichip_dma_sync_stub) + + if (intr == NULL) { + sds->sds_handler = filt; + error = bus_generic_setup_intr(dev, child, + ires, flags, DMA_SYNC_STUB, intr, sds, + cookiep); + } else { + sds->sds_handler = (driver_filter_t *)intr; + error = bus_generic_setup_intr(dev, child, + ires, flags, filt, (driver_intr_t *) + DMA_SYNC_STUB, sds, cookiep); + } + +#undef DMA_SYNC_STUB + + } else error = bus_generic_setup_intr(dev, child, ires, - flags, schizo_dmasync, intr, sds, cookiep); - } else { - sds->sds_handler = (driver_filter_t *)intr; - error = bus_generic_setup_intr(dev, child, ires, - flags, filt, (driver_intr_t *)schizo_dmasync, - sds, cookiep); - } + flags, filt, intr, arg, cookiep); if (error != 0) { free(sds, M_DEVBUF); return (error); @@ -1078,7 +1228,9 @@ sds->sds_cookie = *cookiep; *cookiep = sds; return (error); - } + } else if (found != 0) + device_printf(dev, "WARNING: using devices behind PCI-PCI " + "bridges may cause data corruption\n"); return (bus_generic_setup_intr(dev, child, ires, flags, filt, intr, arg, cookiep)); } @@ -1087,12 +1239,12 @@ schizo_teardown_intr(device_t dev, device_t child, struct resource *vec, void *cookie) { - struct schizo_dmasync *sds; + struct schizo_dma_sync *sds; struct schizo_softc *sc; int error; sc = device_get_softc(dev); - if (sc->sc_mode == SCHIZO_MODE_TOM) { + if ((sc->sc_flags & SCHIZO_FLAGS_CDMA) != 0) { sds = cookie; error = bus_generic_teardown_intr(dev, child, vec, sds->sds_cookie); @@ -1176,8 +1328,8 @@ type, rid, r)); if (type == SYS_RES_MEMORY) { /* - * Need to memory-map the device space, as some drivers depend - * on the virtual address being set and useable. + * Need to memory-map the device space, as some drivers + * depend on the virtual address being set and usable. */ error = sparc64_bus_mem_map(rman_get_bustag(r), rman_get_bushandle(r), rman_get_size(r), 0, 0, &p); ==== //depot/projects/usiii/sparc64/pci/schizoreg.h#6 (text+ko) ==== @@ -25,13 +25,13 @@ * POSSIBILITY OF SUCH DAMAGE. * * from: OpenBSD: schizoreg.h,v 1.8 2005/05/19 18:28:59 mickey Exp - * $FreeBSD$ + * $FreeBSD: src/sys/sparc64/pci/schizoreg.h,v 1.2 2008/11/20 18:44:09 marius Exp $ */ #ifndef _SPARC64_PCI_SCHIZOREG_H_ #define _SPARC64_PCI_SCHIZOREG_H_ -#define STX_NINTR 4 +#define STX_NINTR 5 /* 4 via OFW + 1 CDMA */ #define STX_NRANGE 4 #define SCZ_NREG 3 #define TOM_NREG 4 @@ -276,6 +276,8 @@ #define STX_PCIERR_A_INO 0x32 /* PCI bus A error */ #define STX_PCIERR_B_INO 0x33 /* PCI bus B error */ #define STX_BUS_INO 0x34 /* Safari/JBus error */ +#define STX_CDMA_A_INO 0x35 /* PCI bus A CDMA */ +#define STX_CDMA_B_INO 0x36 /* PCI bus B CDMA */ #define STX_MAX_INO 0x37 /* Device space defines */ ==== //depot/projects/usiii/sparc64/pci/schizovar.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/sparc64/pci/schizovar.h,v 1.2 2008/11/20 18:44:09 marius Exp $ */ #ifndef _SPARC64_PCI_SCHIZOVAR_H_ @@ -39,9 +39,18 @@ phandle_t sc_node; u_int sc_mode; -#define SCHIZO_MODE_SCZ 1 -#define SCHIZO_MODE_TOM 2 -#define SCHIZO_MODE_XMS 3 +#define SCHIZO_MODE_SCZ 0 +#define SCHIZO_MODE_TOM 1 +#define SCHIZO_MODE_XMS 2 + + u_int sc_flags; +#define SCHIZO_FLAGS_BSWAR (1 << 0) +#define SCHIZO_FLAGS_CDMA (1 << 1) + + bus_addr_t sc_cdma_clr; + uint32_t sc_cdma_state; +#define SCHIZO_CDMA_STATE_DONE (1 << 0) +#define SCHIZO_CDMA_STATE_PENDING (1 << 1) u_int sc_half; uint32_t sc_ign; ==== //depot/projects/usiii/sparc64/sparc64/jbusppm.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/jbusppm.c,v 1.1 2008/09/10 20:22:27 marius Exp $"); #include #include ==== //depot/projects/usiii/sparc64/sparc64/schppm.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/schppm.c,v 1.1 2008/09/10 20:22:27 marius Exp $"); #include #include ==== //depot/projects/usiii/ufs/ffs/ffs_alloc.c#5 (text+ko) ==== @@ -60,7 +60,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_alloc.c,v 1.150 2008/08/28 09:19:50 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_alloc.c,v 1.151 2009/01/27 21:48:47 rwatson Exp $"); #include "opt_quota.h" @@ -130,10 +130,10 @@ * available block is located. */ int -ffs_alloc(ip, lbn, bpref, size, cred, bnp) +ffs_alloc(ip, lbn, bpref, size, flags, cred, bnp) struct inode *ip; ufs2_daddr_t lbn, bpref; - int size; + int size, flags; struct ucred *cred; ufs2_daddr_t *bnp; { @@ -191,7 +191,10 @@ UFS_UNLOCK(ump); } DIP_SET(ip, i_blocks, DIP(ip, i_blocks) + delta); - ip->i_flag |= IN_CHANGE | IN_UPDATE; + if (flags & IO_EXT) + ip->i_flag |= IN_CHANGE; + else + ip->i_flag |= IN_CHANGE | IN_UPDATE; *bnp = bno; return (0); } @@ -227,12 +230,12 @@ * invoked to get an appropriate block. */ int -ffs_realloccg(ip, lbprev, bprev, bpref, osize, nsize, cred, bpp) +ffs_realloccg(ip, lbprev, bprev, bpref, osize, nsize, flags, cred, bpp) struct inode *ip; ufs2_daddr_t lbprev; ufs2_daddr_t bprev; ufs2_daddr_t bpref; - int osize, nsize; + int osize, nsize, flags; struct ucred *cred; struct buf **bpp; { @@ -317,7 +320,10 @@ UFS_UNLOCK(ump); } DIP_SET(ip, i_blocks, DIP(ip, i_blocks) + delta); - ip->i_flag |= IN_CHANGE | IN_UPDATE; + if (flags & IO_EXT) + ip->i_flag |= IN_CHANGE; + else + ip->i_flag |= IN_CHANGE | IN_UPDATE; allocbuf(bp, nsize); bp->b_flags |= B_DONE; if ((bp->b_flags & (B_MALLOC | B_VMIO)) != B_VMIO) @@ -392,7 +398,10 @@ UFS_UNLOCK(ump); } DIP_SET(ip, i_blocks, DIP(ip, i_blocks) + delta); - ip->i_flag |= IN_CHANGE | IN_UPDATE; + if (flags & IO_EXT) + ip->i_flag |= IN_CHANGE; + else + ip->i_flag |= IN_CHANGE | IN_UPDATE; allocbuf(bp, nsize); bp->b_flags |= B_DONE; if ((bp->b_flags & (B_MALLOC | B_VMIO)) != B_VMIO) ==== //depot/projects/usiii/ufs/ffs/ffs_balloc.c#5 (text+ko) ==== @@ -60,7 +60,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_balloc.c,v 1.54 2008/07/23 14:32:44 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_balloc.c,v 1.55 2009/01/27 21:48:47 rwatson Exp $"); #include #include @@ -133,7 +133,8 @@ UFS_LOCK(ump); error = ffs_realloccg(ip, nb, dp->di_db[nb], ffs_blkpref_ufs1(ip, lastlbn, (int)nb, - &dp->di_db[0]), osize, (int)fs->fs_bsize, cred, &bp); + &dp->di_db[0]), osize, (int)fs->fs_bsize, flags, + cred, &bp); if (error) return (error); if (DOINGSOFTDEP(vp)) @@ -184,7 +185,8 @@ UFS_LOCK(ump); error = ffs_realloccg(ip, lbn, dp->di_db[lbn], ffs_blkpref_ufs1(ip, lbn, (int)lbn, - &dp->di_db[0]), osize, nsize, cred, &bp); + &dp->di_db[0]), osize, nsize, flags, + cred, &bp); if (error) return (error); if (DOINGSOFTDEP(vp)) @@ -200,7 +202,7 @@ UFS_LOCK(ump); error = ffs_alloc(ip, lbn, ffs_blkpref_ufs1(ip, lbn, (int)lbn, &dp->di_db[0]), - nsize, cred, &newb); + nsize, flags, cred, &newb); if (error) return (error); bp = getblk(vp, lbn, nsize, 0, 0, 0); @@ -241,7 +243,7 @@ UFS_LOCK(ump); pref = ffs_blkpref_ufs1(ip, lbn, 0, (ufs1_daddr_t *)0); if ((error = ffs_alloc(ip, lbn, pref, (int)fs->fs_bsize, - cred, &newb)) != 0) { + flags, cred, &newb)) != 0) { curthread->td_pflags &= saved_inbdflush; return (error); } @@ -291,8 +293,8 @@ UFS_LOCK(ump); if (pref == 0) pref = ffs_blkpref_ufs1(ip, lbn, 0, (ufs1_daddr_t *)0); - if ((error = - ffs_alloc(ip, lbn, pref, (int)fs->fs_bsize, cred, &newb)) != 0) { + if ((error = ffs_alloc(ip, lbn, pref, (int)fs->fs_bsize, + flags, cred, &newb)) != 0) { brelse(bp); goto fail; } @@ -346,7 +348,7 @@ UFS_LOCK(ump); pref = ffs_blkpref_ufs1(ip, lbn, indirs[i].in_off, &bap[0]); error = ffs_alloc(ip, - lbn, pref, (int)fs->fs_bsize, cred, &newb); + lbn, pref, (int)fs->fs_bsize, flags, cred, &newb); if (error) { brelse(bp); goto fail; @@ -534,7 +536,7 @@ dp->di_extb[nb], ffs_blkpref_ufs2(ip, lastlbn, (int)nb, &dp->di_extb[0]), osize, - (int)fs->fs_bsize, cred, &bp); + (int)fs->fs_bsize, flags, cred, &bp); if (error) return (error); if (DOINGSOFTDEP(vp)) @@ -545,7 +547,7 @@ dp->di_extsize = smalllblktosize(fs, nb + 1); dp->di_extb[nb] = dbtofsb(fs, bp->b_blkno); bp->b_xflags |= BX_ALTDATA; - ip->i_flag |= IN_CHANGE | IN_UPDATE; + ip->i_flag |= IN_CHANGE; if (flags & IO_SYNC) bwrite(bp); else @@ -588,7 +590,8 @@ error = ffs_realloccg(ip, -1 - lbn, dp->di_extb[lbn], ffs_blkpref_ufs2(ip, lbn, (int)lbn, - &dp->di_extb[0]), osize, nsize, cred, &bp); + &dp->di_extb[0]), osize, nsize, flags, + cred, &bp); if (error) return (error); bp->b_xflags |= BX_ALTDATA; @@ -605,7 +608,7 @@ UFS_LOCK(ump); error = ffs_alloc(ip, lbn, ffs_blkpref_ufs2(ip, lbn, (int)lbn, &dp->di_extb[0]), - nsize, cred, &newb); + nsize, flags, cred, &newb); if (error) return (error); bp = getblk(vp, -1 - lbn, nsize, 0, 0, 0); @@ -618,7 +621,7 @@ nsize, 0, bp); } dp->di_extb[lbn] = dbtofsb(fs, bp->b_blkno); - ip->i_flag |= IN_CHANGE | IN_UPDATE; + ip->i_flag |= IN_CHANGE; *bpp = bp; return (0); } @@ -636,7 +639,7 @@ error = ffs_realloccg(ip, nb, dp->di_db[nb], ffs_blkpref_ufs2(ip, lastlbn, (int)nb, &dp->di_db[0]), osize, (int)fs->fs_bsize, - cred, &bp); + flags, cred, &bp); if (error) return (error); if (DOINGSOFTDEP(vp)) @@ -688,7 +691,8 @@ UFS_LOCK(ump); error = ffs_realloccg(ip, lbn, dp->di_db[lbn], ffs_blkpref_ufs2(ip, lbn, (int)lbn, - &dp->di_db[0]), osize, nsize, cred, &bp); + &dp->di_db[0]), osize, nsize, flags, + cred, &bp); if (error) return (error); if (DOINGSOFTDEP(vp)) @@ -704,7 +708,7 @@ UFS_LOCK(ump); error = ffs_alloc(ip, lbn, ffs_blkpref_ufs2(ip, lbn, (int)lbn, - &dp->di_db[0]), nsize, cred, &newb); + &dp->di_db[0]), nsize, flags, cred, &newb); if (error) return (error); bp = getblk(vp, lbn, nsize, 0, 0, 0); @@ -745,7 +749,7 @@ UFS_LOCK(ump); pref = ffs_blkpref_ufs2(ip, lbn, 0, (ufs2_daddr_t *)0); if ((error = ffs_alloc(ip, lbn, pref, (int)fs->fs_bsize, - cred, &newb)) != 0) { + flags, cred, &newb)) != 0) { curthread->td_pflags &= saved_inbdflush; return (error); } @@ -795,8 +799,8 @@ UFS_LOCK(ump); if (pref == 0) pref = ffs_blkpref_ufs2(ip, lbn, 0, (ufs2_daddr_t *)0); - if ((error = - ffs_alloc(ip, lbn, pref, (int)fs->fs_bsize, cred, &newb)) != 0) { + if ((error = ffs_alloc(ip, lbn, pref, (int)fs->fs_bsize, + flags, cred, &newb)) != 0) { brelse(bp); goto fail; } @@ -850,7 +854,7 @@ UFS_LOCK(ump); pref = ffs_blkpref_ufs2(ip, lbn, indirs[i].in_off, &bap[0]); error = ffs_alloc(ip, - lbn, pref, (int)fs->fs_bsize, cred, &newb); + lbn, pref, (int)fs->fs_bsize, flags, cred, &newb); if (error) { brelse(bp); goto fail; ==== //depot/projects/usiii/ufs/ffs/ffs_extern.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)ffs_extern.h 8.6 (Berkeley) 3/30/95 - * $FreeBSD: src/sys/ufs/ffs/ffs_extern.h,v 1.77 2008/09/16 11:51:06 kib Exp $ + * $FreeBSD: src/sys/ufs/ffs/ffs_extern.h,v 1.78 2009/01/27 21:48:47 rwatson Exp $ */ #ifndef _UFS_FFS_EXTERN_H @@ -48,8 +48,8 @@ struct vop_fsync_args; struct vop_reallocblks_args; -int ffs_alloc(struct inode *, - ufs2_daddr_t, ufs2_daddr_t, int, struct ucred *, ufs2_daddr_t *); +int ffs_alloc(struct inode *, ufs2_daddr_t, ufs2_daddr_t, int, int, + struct ucred *, ufs2_daddr_t *); int ffs_balloc_ufs1(struct vnode *a_vp, off_t a_startoffset, int a_size, struct ucred *a_cred, int a_flags, struct buf **a_bpp); int ffs_balloc_ufs2(struct vnode *a_vp, off_t a_startoffset, int a_size, @@ -72,7 +72,7 @@ int ffs_mountroot(void); int ffs_reallocblks(struct vop_reallocblks_args *); int ffs_realloccg(struct inode *, ufs2_daddr_t, ufs2_daddr_t, - ufs2_daddr_t, int, int, struct ucred *, struct buf **); + ufs2_daddr_t, int, int, int, struct ucred *, struct buf **); int ffs_sbupdate(struct ufsmount *, int, int); void ffs_setblock(struct fs *, u_char *, ufs1_daddr_t); int ffs_snapblkfree(struct fs *, struct vnode *, ufs2_daddr_t, long, ino_t); ==== //depot/projects/usiii/ufs/ffs/ffs_inode.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 28 20:08:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F6031065675; Wed, 28 Jan 2009 20:08: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 0DA78106566B for ; Wed, 28 Jan 2009 20:08:17 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EFBDD8FC23 for ; Wed, 28 Jan 2009 20:08:16 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0SK8GCn099484 for ; Wed, 28 Jan 2009 20:08:16 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0SK8Gxg099482 for perforce@freebsd.org; Wed, 28 Jan 2009 20:08:16 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 28 Jan 2009 20:08:16 GMT Message-Id: <200901282008.n0SK8Gxg099482@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 156825 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 Jan 2009 20:08:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=156825 Change 156825 by rene@rene_self on 2009/01/28 20:07:38 MFen handbook/security 1.332 -> 1.334 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#10 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#10 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml,v 1.80 2006/01/05 21:13:24 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/security/chapter.sgml - %SRCID% 1.332 + %SRCID% 1.334 --> @@ -667,26 +667,82 @@ bpf-apparaat of een ander snuffelapparaat te installeren in een draaiende kernel. Om deze problemen te voorkomen, moet de kernel op een hoger - veiligheidsniveau draaien, ten minste securelevel 1. Het - securelevel wordt ingesteld met sysctl op de - kern.securelevel variabele. Als securelevel - op 1 staat, is het niet langer mogelijk te schrijven naar ruwe - apparaten en speciale chflags vlaggen als - schg worden dan afgedwongen. Ook dient de - vlag schg gezet te worden op kritische - opstartbestanden, mappen en scriptbestanden. Alles dat wordt - uitgevoerd voordat het securelevel wordt ingesteld. Dit is - misschien wat overdreven en het wordt lastiger een systeem te - vernieuwen als dat in een hoger securelevel draait. Er is een - compromis mogelijk door het systeem in een hoger securelevel te - draaien maar de schg vlag niet op alle - systeembestanden en mappen te zetten die maar te vinden zijn. - / en /usr zouden ook - als alleen-lezen aangekoppeld kunnen worden. Het is nog - belangrijk om op te merken dat als de beheerder te draconisch - omgaat met dat wat hij wil beschermen, hij daardoor kan - veroorzaken dat die o-zo belangrijke detectie van een inbraak - wordt misgelopen. + veiligheidsniveau draaien, ten minste securelevel 1. + + Het veiligheidsniveau van de kernel kan op een aantal + manieren worden ingesteld. De eenvoudigste manier om het + veiligheidsniveau van een draaiende kernel te verhogen is met + sysctl op de kernelvariabele + kern.securelevel: + + &prompt.root; sysctl kern.securelevel=1 + + Standaard start de kernel van &os; op met een + veiligheidsniveau van -1. Het veiligheidsniveau blijft -1 + tenzij het is veranderd, òfwel door de beheerder + òfwel door &man.init.8; vanwege een instelling in de + opstartscripts. Het veiligheidsniveau kan tijdens het opstarten + van het systeem verhoogd worden door de variabele + kern_securelevel_enable op + YES te zetten in het bestand + /etc/rc.conf, en de waarde van de variabele + kern_securelevel op het gewenste + veiligheidsniveau in te stellen. + + Het standaard veiligheidsniveau van een &os;-systeem direct + nadat de opstartscripts zijn uitgevoerd is -1. Dit wordt + onveilige modus genoemd omdat de onveranderlijke + bestandsvlag uitgezet kan worden, er van/naar alle apparaten mag + worden gelezen en geschreven, enzovoorts. + + Als eenmaal het veiligheidsniveau op 1 of een hogere waarde + is ingesteld, worden de alleen-toevoegen en onveranderlijke + bestanden gehonoreerd, deze kunnen niet worden uitgezet, en + wordt toegang tot rauwe apparaten ontzegd. Hogere niveaus + beperken nog meer bewerkingen. Lees, voor een volledige + beschrijving van het effect van de verschillende + veiligheidsniveaus, de handleidingpagina &man.security.7; (of de + handleidingpagina van &man.init.8; voor uitgaven ouder dan &os; + 7.0). + + + Het ophogen van het veiligheidsniveau naar 1 of hoger kan + enkele problemen met X11 (toegang tot + /dev/io zal worden geblokkeerd), of met + de installatie van &os; wanneer die vanaf de broncode is + gebouwd (het gedeelte installword van + het proces moet tijdelijk de alleen-toevoegen en + onveranderlijke vlaggen van sommige bestanden uitzetten), en + met enkele andere gevallen veroorzaken. Soms, zoals het geval + is met X11, is het mogelijk om dit te omzeilen door + &man.xdm.1; behoorlijk vroeg in het opstartproces te starten, + wanneer het veiligheidsniveau nog laag genoeg is. + Omzeilmethoden zoals deze zijn misschien niet voor alle + veiligheidsniveaus of voor alle beperkingen die ze opleggen + mogelijk. Wat vooruit plannen is een goed idee. Het is + belangrijk om de beperkingen die door elk veiligheidsniveau + worden opgelegd te begrijpen omdat ze het gebruiksgemak van + het systeem sterk verminderen. Het vergemakkelijkt ook het + kiezen van eens standaardinstelling en voorkomt allerlei + verassingen. + + + Als het veiligheidsniveau van de kernel naar 1 of hoger + wordt verhoogd, kan het nuttig zijn om de vlag + schg aan te zetten voor kritieke + opstartprogramma's, mappen, en scriptbestanden (i.e. alles dat + gedraaid wordt tot het punt waar het veiligheidsniveau wordt + ingesteld). Dit kan overdreven zijn, en het bijwerken van het + systeem is veel moeilijker wanneer het op een hoog + veiligheidsniveau werkt. Een minder beperkend compromis is om + het systeem op een hoger veiligheidsniveau te draaien maar het + aanzetten van de vlag schg voor elk + systeembestand en -map onder de zon over te slaan. Een andere + mogelijkheid is om / en + /usr simpelweg als alleen-lezen aan te + koppelen. Het dient opgemerkt te worden dat het te draconisch + zijn over wat is toegestaan het belangrijke detecteren van een + inbraak kan verhinderen. From owner-p4-projects@FreeBSD.ORG Wed Jan 28 20:37:52 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5586F10657C4; Wed, 28 Jan 2009 20:37: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 0A69710657C0 for ; Wed, 28 Jan 2009 20:37:52 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C457A8FC0A for ; Wed, 28 Jan 2009 20:37:49 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0SKbnTh002018 for ; Wed, 28 Jan 2009 20:37:49 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0SKbnNU002016 for perforce@freebsd.org; Wed, 28 Jan 2009 20:37:49 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 28 Jan 2009 20:37:49 GMT Message-Id: <200901282037.n0SKbnNU002016@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 156827 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 Jan 2009 20:37:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=156827 Change 156827 by rene@rene_self on 2009/01/28 20:36:56 MFen handbook/ppp-and-slip 1.190 -> 1.191 Various grammar and whitespace fixes Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#16 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#16 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD$ %SOURCE% en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml - %SRCID% 1.190 + %SRCID% 1.191 --> @@ -73,12 +73,12 @@ PPP gebruiker PPP - + PPP kernel PPP - + PPP @@ -121,33 +121,33 @@ - - Tom - Rhodes - Geupdate en uitgebreid door - + + Tom + Rhodes + Bijgewerkt en uitgebreid door + - - Brian - Somers + + Brian + Somers Origineel bijgedragen door - + Nik Clayton Met input van - - + + Dirk - Frömberg - - - Peter - Childs - + Frömberg + + + Peter + Childs + @@ -264,7 +264,7 @@ andere kant welk adres er uitgegeven wordt. - + Als u niet in bezit bent van de vereiste informatie, moet u contact opnemen met uw ISP. @@ -281,7 +281,7 @@ - Automatische <application>PPP</application> configuratie + Automatische <application>PPP</application> configuratie PPP @@ -290,10 +290,11 @@ Zowel ppp als pppd (de implementatie van PPP op kernel niveau) gebruiken de - configuratie bestanden die zich in de - /etc/ppp directory bevinden. Voorbeelden + configuratie bestanden die zich in de map /etc/ppp bevinden. Voorbeelden configuraties voor gebruiker PPP kunnen gevonden worden in - /usr/share/examples/ppp/. + /usr/share/examples/ppp/. Het configureren van ppp vereist dat u een aantal bestanden bewerkt, afhankelijk van uw @@ -359,7 +360,7 @@ naar verwachting werkt, moet deze regel aangepast worden naar: - set log phase tun + set log phase tun om te voorkomen dat er extreem grote log files gemaakt worden. @@ -383,12 +384,12 @@ Regel 4: - Identificeert het apparaat waaraan de modem + Identificeert het apparaat waarmee het modem verbonden is. COM1 is - /dev/cuad0 + /dev/cuad0 en COM2 is - /dev/cuad1. + /dev/cuad1. @@ -485,7 +486,7 @@ andere nummers wilt draaien als het eerste nummer niet werkt, gebruik dan het pipe karakter. Quote altijd de hele set van telefoonnummers zoals getoond. - + U moet het telefoonnummer citeren met dubbele quotes (") als er enige intentie is in het gebruik van spaties in het telefoonummer. Dit kan een @@ -574,7 +575,7 @@ adres heeft gegeven, gebruik dan 10.0.0.2/0. Als u gebruik moet maken van een gegokt, zorg ervoor - dat er een regel staat in + dat er een regel staat in /etc/ppp/ppp.linkup zoals beschreven in de instructies voor PPP en dynamische IP @@ -613,9 +614,9 @@ opgezet is. Dit wordt later uitgelegd met een voorbeeld over sendmail. - Voorbeeld configuratie bestanden kunnen gevonden worden - in de usr/share/examples/ppp - directory. + Voorbeeld van configuratiebestanden kunnen gevonden + worden in de map usr/share/examples/ppp. @@ -845,9 +846,10 @@ pchilds:*:1011:300:Peter Childs PPP:/home/ppp:/etc/ppp/ppp-dialup - Creeër vervolgens een /home/ppp - directory die door iedereen gelezen en beschreven kan worden - en zet daar de volgende 0 byte grote bestanden in: + Creeër vervolgens een map /home/ppp die door iedereen + gelezen en beschreven kan worden en zet daar de volgende 0 + byte grote bestanden in: -r--r--r-- 1 root wheel 0 May 27 02:23 .hushlogin -r--r--r-- 1 root wheel 0 May 27 02:22 .rhosts @@ -886,10 +888,10 @@ Het instellen van <filename>ppp.conf</filename> voor dynamische IP gebruikers - + Het /etc/ppp/ppp.conf bestand moet iets zoals hieronder bevatten: - + default: set debug phase lcp chat set timeout 0 @@ -1006,7 +1008,7 @@ samen met de definities die hierboven gedaan zijn. pap: - enable pap + enable pap set ifaddr 203.14.100.1 203.14.100.20-203.14.100.40 enable proxy @@ -1070,12 +1072,12 @@ gevonden. - + PAP en CHAP authenticatie - PAP + PAP - CHAP + CHAP Sommige providers stellen hun systemen dusdanig in dat het authenticatie gedeelte van uw verbinding wordt @@ -1122,7 +1124,7 @@ U moet de juiste waarde invullen voor Mijnwachtwoord. Misschien wilt u een extra regel toevoegen als: - + 16 accept PAP of @@ -1303,7 +1305,7 @@ 3 add 0 0 HISADDR 4 !bg sendmail -bd -q30m - + SMTP @@ -1342,10 +1344,10 @@ - Zorg ervoor dat het - tunN - apparaat bestand beschikbaar is in de - /dev directory. + Zorg ervoor dat het apparaatbestand + tunN + beschikbaar is in de map /dev. @@ -1380,10 +1382,10 @@ - Zorg ervoor dat het - tunN - apparaat bestand beschikbaar is in de - /dev directory. + Zorg ervoor dat het apparaatbestand + tunN + beschikbaar is in de map /dev. @@ -1423,15 +1425,15 @@ - - Gennady B. - Sorokopud - Delen origineel bijgedragen door - - - Robert - Huff - + + Gennady B. + Sorokopud + Delen origineel bijgedragen door + + + Robert + Huff + @@ -1448,8 +1450,9 @@ Voordat u begint met het opzetten van PPP op uw machine, zorg ervoor dat het pppd commando zich - bevind in de /usr/sbin directory en dat - de directory /etc/ppp bestaat. + bevindt in de map /usr/sbin + en dat de map /etc/ppp + bestaat. pppd kan in twee verschillende modes werken: @@ -1461,7 +1464,7 @@ PPP verbinding of een modem lijn. - + PPP server @@ -1475,7 +1478,7 @@ In beide gevallen moet u een bestand met opties instellen - (/etc/ppp/options of + (/etc/ppp/options of ~/.ppprc als er meer dan één gebruiker is op uw machine die gebruik maakt van PPP). @@ -1496,7 +1499,7 @@ - + Gebruik maken van <command>pppd</command> als cliënt @@ -1567,7 +1570,7 @@ in het /etc/ppp/options bestand waarna op de console berichten kunnen worden geraadpleegd om het probleem te achterhalen. - + Het volgende /etc/ppp/pppup script zal alle drie de stappen automatisch doen: @@ -1602,7 +1605,7 @@ einde van dit document). Gebruik het volgende /etc/ppp/pppdown - script om de PPP lijn af te breken: + script om de PPP lijn af te breken: #!/bin/sh pid=`pgrep pppd` @@ -1732,7 +1735,7 @@ zal pppd vertellen zich te gedragen als server: - #!/bin/sh + #!/bin/sh pgrep -l pppd pid=`pgrep pppd` if [ "X${pid}" != "X" ] ; then @@ -1759,7 +1762,7 @@ Gebruik dit /etc/ppp/pppservdown script om de server te stoppen: - #!/bin/sh + #!/bin/sh pgrep -l pppd pid=`pgrep pppd` if [ "X${pid}" != "X" ] ; then @@ -1981,10 +1984,10 @@ moeten vinden als zijnde sio1 of COM2. Als dat klopt hoeft u de kernel niet opnieuw te bouwen. Wanneer u de sio apparaten - controlleert en de modem is op sio1 + controleert en de modem is op sio1 te vinden of als COM2 als u zich - onder &ms-dos; bevind, dan is uw modem apparaat - /dev/cuad1. + onder &ms-dos; bevindt, dan is uw modem apparaat + /dev/cuad1. @@ -2006,7 +2009,7 @@ We hebben nu ppp gestart. - ppp ON example> set device /dev/cuad1 + ppp ON example> set device /dev/cuad1 We stellen ons modem in, in dit geval is dat cuad1. @@ -2029,7 +2032,7 @@ Wissel naar terminal mode zodat we handmatig de modem kunnen bedienen. - deflink: Entering terminal mode on /dev/cuad1 + deflink: Entering terminal mode on /dev/cuad1 type '~h' for help at @@ -2202,10 +2205,10 @@ - - Jim - Mock - Bijgedragen (vanaf http://node.to/freebsd/how-tos/how-to-freebsd-pppoe.html) door + + Jim + Mock + Bijgedragen (vanaf http://node.to/freebsd/how-tos/how-to-freebsd-pppoe.html) door @@ -2240,7 +2243,7 @@ Het instellen van <filename>ppp.conf</filename> Hieronder volgt een voorbeeld van een werkende - ppp.conf: + ppp.conf: default: set log Phase tun command # Er kan meer gedetailleerde logging ingeschakeld worden indien gewenst @@ -2462,16 +2465,17 @@ Eerst moet u de port installeren waarna mpd geconfigureerd kan worden om uw eisen en provider instellingen op te geven. De port - plaatst een set van voorbeeld configuratie bestanden welke - goed gedocumenteerd zijn in - PREFIX/etc/mpd/. + plaatst een verzameling voorbeeldconfiguratiebestanden welke + goed gedocumenteerd zijn in PREFIX/etc/mpd/. Let op dat PREFIX betekend dat dit de directory is waar uw ports in worden geïnstalleerd. - Standaard is dit /usr/local/. Een complete + Standaard is dit /usr/local/. Een complete handleiding om mpd te configureren is beschikbaar in HTML formaat zodra de port geïnstalleerd is. - Deze wordt geplaatst in - PREFIX/share/doc/mpd/. + Deze wordt geplaatst in PREFIX/share/doc/mpd/. Hieronder staat een voorbeeld configuratie om verbinding te maken met een ADSL dienstverlener door het gebruik van mpd. De configuratie is verspreid @@ -2488,15 +2492,15 @@ set bundle password wachtwoord set bundle disable multilink - + set link no pap acfcomp protocomp set link disable chap set link accept chap set link keep-alive 30 10 - + set ipcp no vjcomp set ipcp ranges 0.0.0.0/0 0.0.0.0/0 - + set iface route default set iface disable on-demand set iface enable proxy-arp @@ -2555,7 +2559,7 @@ &prompt.user; ifconfig ng0 ng0: flags=88d1<UP,POINTOPOINT,RUNNING,NOARP,SIMPLEX,MULTICAST> mtu 1500 inet 216.136.204.117 --> 204.152.186.171 netmask 0xffffffff - + Het gebruik van mpd is de aangeraden manier om met een ADSL dienst te verbinden met &os;. @@ -2563,11 +2567,11 @@ Gebruik maken van pptpclient - + Het is ook mogelijk om &os; te gebruiken om naar een andere PPPoA dienstenm verbinding te maken door middel van de net/pptpclient port. - + Om gebruik te maken van net/pptpclient om naar een DSL dienst verbinding te maken, installeert u de port of package en bewerkt @@ -2628,7 +2632,7 @@ vorige commando, omdat pptp uw prompt niet teruggeeft. - + Er wordt een tun virtueel tunnel apparaat gecreeërd voor interactie tussen de pptp en ppp @@ -2638,7 +2642,7 @@ &prompt.user; ifconfig tun0 tun0: flags=8051<UP,POINTOPOINT,RUNNING,MULTICAST> mtu 1500 - inet 216.136.204.21 --> 204.152.186.171 netmask 0xffffff00 + inet 216.136.204.21 --> 204.152.186.171 netmask 0xffffff00 Opened by PID 918 Als het niet mogelijk is om verbinding te maken, controleert @@ -2669,7 +2673,7 @@ Piero - Serini + Serini @@ -2695,26 +2699,27 @@ Bepaal eerst aan welke seriële poort uw modem verbonden is. Veel mensen gebruiken hiervoor een symbolische link zoals - /dev/modem welke verwijst naar de echte - naam van het apparaat /dev/cuadN. Dit + /dev/modem welke + verwijst naar de echte naam van het apparaat /dev/cuadN. Dit geeft de mogelijkheid om naam abstract te houden, voor het geval de modem ooit verplaatst wordt naar een andere poort. Het kan - best een vervelende klus zijn wanneer er een aantal bestanden - gerepareerd moeten worden in /etc en + best een vervelende klus zijn wanneer er een aantal bestanden in + /etc en .kermrc bestanden verspreid over het gehele - systeem! + systeem gerepareerd moeten worden! - /dev/cuad0 + /dev/cuad0 is - COM1, cuad1 + COM1, cuad1 is COM2, etc. Zorg ervoor dat u het volgende in uw kernel configuratie bestand hebt: - + device sl Deze is standaard opgenomen in de @@ -2753,7 +2758,7 @@ Stel uw hostnaam in door de regel te bewerken die aangeeft: - + hostname="myname.my.domain" De volledig gekwalificeerde internet hostnaam @@ -2868,7 +2873,7 @@ van de router, bent u verbonden! Als dit niet werkt kunt u wellicht de gebruiken in plaats van de als argument voor - slattach. + slattach. @@ -3027,7 +3032,7 @@ /etc/sliphome/slip.login wordt uitgevoerd om de SLIP interface te configureren. - + Een voorbeeld SLIP server login Bijvoorbeeld, als een SLIP user ID is @@ -3107,12 +3112,12 @@ gateway_enable variabele moeten aanpassen naar . Dit zorgt ervoor dat de machine na een herstart zich zal blijven gedragen als router. - + Om de instellingen meteen actief te maken kunt u het volgende commando als root uitvoeren: - &prompt.root; /etc/rc.d/routing start + &prompt.root; /etc/rc.d/routing start Raadpleeg aub over het configureren van de &os; kernel voor meer hulp over het @@ -3122,9 +3127,9 @@ Sliplogin configuratie - Zoals eerder vermeld, zijn er drie bestanden in de - /etc/sliphome directory die onderdeel - zijn van de configuratie voor + Zoals eerder vermeld, zijn er drie bestanden in de map + /etc/sliphome die + onderdeel zijn van de configuratie voor /usr/sbin/sliplogin (zie &man.sliplogin.8; voor de actuele handleiding voor sliplogin): slip.hosts, @@ -3135,7 +3140,7 @@ slip.login ongedaan maakt wanneer de seriële verbinding verbroken wordt. - + <filename>slip.hosts</filename> configuratie /etc/sliphome/slip.hosts bevat @@ -3173,7 +3178,7 @@ volgt uit: # -# login local-addr remote-addr mask opt1 opt2 +# login local-addr remote-addr mask opt1 opt2 # (normal,compress,noicmp) # Shelmerg dc-slip sl-helmerg 0xfffffc00 autocomp @@ -3205,9 +3210,9 @@ - SLIP + SLIP - TCP/IP networking + TCP/IP networking Uw keuze van een lokaal en remote adres voor uw SLIP verbindingen is afhankelijk van of u een speciaal toegewezen @@ -3228,7 +3233,7 @@ een statische route configureren voor uw SLIP subnet via uw SLIP server naar de dichtsbijzijnde IP router. - Ethernet + Ethernet In het andere geval moet u gebruik maken van de proxy ARP methode, u moet elke SLIP @@ -3281,7 +3286,7 @@ # 1 2 3 4 5 6 7-n # slipunit ttyspeed loginname local-addr remote-addr mask opt-args # -/sbin/ifconfig sl$1 inet $4 $5 netmask $6 +/sbin/ifconfig sl$1 inet $4 $5 netmask $6 # Beantwoord ARP Verzoeken voor de SLIP cliënt met ons Ethernet # adres /usr/sbin/arp -s $5 00:11:22:33:44:55 pub @@ -3295,7 +3300,7 @@ een andere IP node op het Ethernet vraagt om te communiceren met het IP adres van de SLIP cliënt. - + Ethernet MAC address From owner-p4-projects@FreeBSD.ORG Wed Jan 28 22:39:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 276951065676; Wed, 28 Jan 2009 22:38: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 CAA3D106566C for ; Wed, 28 Jan 2009 22:38:58 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B72BB8FC20 for ; Wed, 28 Jan 2009 22:38:58 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0SMcwlL025483 for ; Wed, 28 Jan 2009 22:38:58 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0SMcwML025481 for perforce@freebsd.org; Wed, 28 Jan 2009 22:38:58 GMT (envelope-from jhb@freebsd.org) Date: Wed, 28 Jan 2009 22:38:58 GMT Message-Id: <200901282238.n0SMcwML025481@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 156836 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 Jan 2009 22:39:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=156836 Change 156836 by jhb@jhb_jhbbsd on 2009/01/28 22:38:17 IFC @156833 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/fpu.c#11 integrate .. //depot/projects/smpng/sys/amd64/include/fpu.h#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#41 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_types.h#5 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#70 integrate .. //depot/projects/smpng/sys/conf/options#160 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah.h#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_internal.h#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_regdomain.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5210/ar5210.h#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5211/ar5211.h#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar2316.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar2317.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar2413.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar2425.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5111.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5112.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212.h#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#4 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5413.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5312/ar5312.h#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar2133.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416.h#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#64 integrate .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#40 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_core.c#3 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_intel.c#5 integrate .. //depot/projects/smpng/sys/dev/hwpmc/pmc_events.h#5 integrate .. //depot/projects/smpng/sys/dev/mmc/mmc.c#9 integrate .. //depot/projects/smpng/sys/dev/ppbus/lpt.c#24 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#46 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#24 integrate .. //depot/projects/smpng/sys/dev/usb/u3g.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#124 integrate .. //depot/projects/smpng/sys/dev/usb2/bluetooth/ng_ubt2.c#5 integrate .. //depot/projects/smpng/sys/dev/usb2/bluetooth/ng_ubt2_var.h#3 integrate .. //depot/projects/smpng/sys/dev/usb2/bluetooth/ubtbcmfw2.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/uhci2.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/usb2_controller.h#3 integrate .. //depot/projects/smpng/sys/dev/usb2/core/usb2_hub.c#4 integrate .. //depot/projects/smpng/sys/dev/usb2/include/usb2_devid.h#4 integrate .. //depot/projects/smpng/sys/dev/usb2/include/usb2_devtable.h#4 integrate .. //depot/projects/smpng/sys/dev/usb2/include/usb2_ioctl.h#4 integrate .. //depot/projects/smpng/sys/dev/usb2/quirk/usb2_quirk.c#4 integrate .. //depot/projects/smpng/sys/dev/usb2/serial/u3g2.c#3 integrate .. //depot/projects/smpng/sys/dev/usb2/storage/umass2.c#4 integrate .. //depot/projects/smpng/sys/dev/xen/blkback/blkback.c#3 integrate .. //depot/projects/smpng/sys/fs/cd9660/cd9660_lookup.c#3 integrate .. //depot/projects/smpng/sys/fs/cd9660/cd9660_node.c#6 integrate .. //depot/projects/smpng/sys/fs/cd9660/cd9660_node.h#3 integrate .. //depot/projects/smpng/sys/fs/cd9660/cd9660_rrip.c#6 integrate .. //depot/projects/smpng/sys/fs/cd9660/cd9660_vfsops.c#9 integrate .. //depot/projects/smpng/sys/fs/cd9660/cd9660_vnops.c#6 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_devs.c#30 integrate .. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#48 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#63 integrate .. //depot/projects/smpng/sys/kern/kern_mib.c#40 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#58 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#53 integrate .. //depot/projects/smpng/sys/kern/tty.c#83 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#48 integrate .. //depot/projects/smpng/sys/modules/usb2/Makefile#4 integrate .. //depot/projects/smpng/sys/net80211/_ieee80211.h#14 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#33 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.h#17 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto.h#13 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ddb.c#9 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ht.h#7 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#41 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.h#19 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.h#25 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_regdomain.c#6 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_regdomain.h#3 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#33 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#101 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_mbuf.c#14 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_subs.c#6 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#69 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#80 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#47 integrate .. //depot/projects/smpng/sys/opencrypto/cryptosoft.c#15 integrate .. //depot/projects/smpng/sys/sys/conf.h#56 integrate .. //depot/projects/smpng/sys/sys/param.h#133 integrate .. //depot/projects/smpng/sys/sys/pmc.h#15 integrate .. //depot/projects/smpng/sys/sys/types.h#38 integrate .. //depot/projects/smpng/sys/sys/vnode.h#94 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#49 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_balloc.c#21 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_extern.h#26 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_inode.c#32 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#63 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/fpu.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.159 2006/06/19 22:36:01 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.160 2009/01/28 20:35:16 jhb Exp $"); #include #include @@ -391,6 +391,7 @@ { struct pcb *pcb; register_t s; + u_short control; if (PCPU_GET(fpcurthread) == curthread) { printf("fpudna: fpcurthread == curthread %d times\n", @@ -421,6 +422,10 @@ * explicitly load sanitized registers. */ fxrstor(&fpu_cleanstate); + if (pcb->pcb_flags & PCB_32BIT) { + control = __INITIAL_FPUCW_I386__; + fldcw(&control); + } pcb->pcb_flags |= PCB_FPUINITDONE; } else fxrstor(&pcb->pcb_save); ==== //depot/projects/smpng/sys/amd64/include/fpu.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)npx.h 5.3 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/amd64/include/fpu.h,v 1.33 2004/04/05 21:25:51 imp Exp $ + * $FreeBSD: src/sys/amd64/include/fpu.h,v 1.34 2009/01/28 20:35:16 jhb Exp $ */ /* @@ -92,6 +92,7 @@ * SSE2 based math. For FreeBSD/amd64, we go with the default settings. */ #define __INITIAL_FPUCW__ 0x037F +#define __INITIAL_FPUCW_I386__ 0x127F #define __INITIAL_MXCSR__ 0x1F80 #define __INITIAL_MXCSR_MASK__ 0xFFBF ==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 (text+ko) ==== @@ -494,7 +494,7 @@ static uint64_t zfs_expldev(dev_t dev) { - return (((uint64_t)umajor(dev) << NBITSMINOR64) | uminor(dev)); + return (((uint64_t)major(dev) << NBITSMINOR64) | minor(dev)); } /* * Special cmpldev for ZFS private use. ==== //depot/projects/smpng/sys/compat/linux/linux_stats.c#41 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.93 2008/08/20 08:31:58 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.94 2009/01/28 17:57:16 ed Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -88,7 +88,7 @@ /* XXX this may not be quite right */ /* Map major number to 0 */ - tbuf.st_dev = uminor(buf->st_dev) & 0xf; + tbuf.st_dev = minor(buf->st_dev) & 0xf; tbuf.st_rdev = buf->st_rdev & 0xff; } dev_relthread(dev); @@ -156,7 +156,7 @@ struct l_newstat tbuf; bzero(&tbuf, sizeof(tbuf)); - tbuf.st_dev = uminor(buf->st_dev) | (umajor(buf->st_dev) << 8); + tbuf.st_dev = minor(buf->st_dev) | (major(buf->st_dev) << 8); tbuf.st_ino = buf->st_ino; tbuf.st_mode = buf->st_mode; tbuf.st_nlink = buf->st_nlink; @@ -487,7 +487,7 @@ struct l_stat64 lbuf; bzero(&lbuf, sizeof(lbuf)); - lbuf.st_dev = uminor(buf->st_dev) | (umajor(buf->st_dev) << 8); + lbuf.st_dev = minor(buf->st_dev) | (major(buf->st_dev) << 8); lbuf.st_ino = buf->st_ino; lbuf.st_mode = buf->st_mode; lbuf.st_nlink = buf->st_nlink; ==== //depot/projects/smpng/sys/compat/svr4/svr4_types.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/svr4/svr4_types.h,v 1.6 2005/01/05 22:34:37 imp Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_types.h,v 1.7 2009/01/28 17:57:16 ed Exp $ */ #ifndef _SVR4_TYPES_H_ @@ -69,13 +69,13 @@ (((y) << 0) & 0x00ff))) #define svr4_to_bsd_odev_t(d) makedev(svr4_omajor(d), svr4_ominor(d)) -#define bsd_to_svr4_odev_t(d) svr4_omakedev(umajor(d), uminor(d)) +#define bsd_to_svr4_odev_t(d) svr4_omakedev(major(d), minor(d)) #define svr4_major(x) ((int32_t)((((x) & 0xfffc0000) >> 18))) #define svr4_minor(x) ((int32_t)((((x) & 0x0003ffff) >> 0))) #define svr4_makedev(x,y) ((svr4_dev_t)((((x) << 18) & 0xfffc0000) | \ (((y) << 0) & 0x0003ffff))) #define svr4_to_bsd_dev_t(d) makedev(svr4_major(d), svr4_minor(d)) -#define bsd_to_svr4_dev_t(d) svr4_makedev(umajor(d), uminor(d)) +#define bsd_to_svr4_dev_t(d) svr4_makedev(major(d), minor(d)) #endif /* !_SVR4_TYPES_H_ */ ==== //depot/projects/smpng/sys/conf/kmod.mk#70 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.224 2008/11/04 03:42:01 alfred Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.225 2009/01/26 17:00:58 rdivacky Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -89,10 +89,9 @@ .if ${CC} == "icc" NOSTDINC= -X .else -C_DIALECT= -std=c99 +CSTD= c99 NOSTDINC= -nostdinc .endif -CFLAGS+= ${C_DIALECT} CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} ${INCLMAGIC} ${CFLAGS:M-I*} .if defined(KERNBUILDDIR) CFLAGS+= -DHAVE_KERNEL_OPTION_HEADERS -include ${KERNBUILDDIR}/opt_global.h ==== //depot/projects/smpng/sys/conf/options#160 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.657 2009/01/17 16:37:13 ed Exp $ +# $FreeBSD: src/sys/conf/options,v 1.658 2009/01/28 18:00:22 sam Exp $ # # On the handling of kernel options # @@ -762,7 +762,7 @@ AH_PRIVATE_DIAG opt_ah.h AH_NEED_DESC_SWAP opt_ah.h AH_USE_INIPDGAIN opt_ah.h -AH_SUPPORT_11D opt_ah.h +AH_MAXCHAN opt_ah.h # options for the Marvell 8335 wireless driver MALO_DEBUG opt_malo.h ==== //depot/projects/smpng/sys/dev/ath/ath_hal/ah.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting * Copyright (c) 2002-2008 Atheros Communications, Inc. * * Permission to use, copy, modify, and/or distribute this software for any @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ah.c,v 1.2 2008/12/13 03:48:33 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah.c,v 1.3 2009/01/28 18:00:22 sam Exp $ */ #include "opt_ah.h" @@ -78,6 +78,15 @@ return AH_NULL; } +/* + * Return the mask of available modes based on the hardware capabilities. + */ +u_int +ath_hal_getwirelessmodes(struct ath_hal*ah) +{ + return ath_hal_getWirelessModes(ah); +} + /* linker set of registered RF backends */ OS_SET_DECLARE(ah_rfs, struct ath_hal_rf); @@ -152,8 +161,10 @@ kbps = rates->info[rateix].rateKbps; /* * index can be invalid duting dynamic Turbo transitions. + * XXX */ - if(kbps == 0) return 0; + if (kbps == 0) + return 0; switch (rates->info[rateix].phy) { case IEEE80211_T_CCK: @@ -187,8 +198,8 @@ #define OFDM_PLCP_BITS_QUARTER 22 #define OFDM_SYMBOL_TIME_QUARTER 16 - if (AH_PRIVATE(ah)->ah_curchan && - IS_CHAN_QUARTER_RATE(AH_PRIVATE(ah)->ah_curchan)) { + if (AH_PRIVATE(ah)->ah_curchan != AH_NULL && + IEEE80211_IS_CHAN_QUARTER(AH_PRIVATE(ah)->ah_curchan)) { bitsPerSymbol = (kbps * OFDM_SYMBOL_TIME_QUARTER) / 1000; HALASSERT(bitsPerSymbol != 0); @@ -197,8 +208,8 @@ txTime = OFDM_SIFS_TIME_QUARTER + OFDM_PREAMBLE_TIME_QUARTER + (numSymbols * OFDM_SYMBOL_TIME_QUARTER); - } else if (AH_PRIVATE(ah)->ah_curchan && - IS_CHAN_HALF_RATE(AH_PRIVATE(ah)->ah_curchan)) { + } else if (AH_PRIVATE(ah)->ah_curchan != AH_NULL && + IEEE80211_IS_CHAN_HALF(AH_PRIVATE(ah)->ah_curchan)) { bitsPerSymbol = (kbps * OFDM_SYMBOL_TIME_HALF) / 1000; HALASSERT(bitsPerSymbol != 0); @@ -252,71 +263,6 @@ return txTime; } -static __inline int -mapgsm(u_int freq, u_int flags) -{ - freq *= 10; - if (flags & CHANNEL_QUARTER) - freq += 5; - else if (flags & CHANNEL_HALF) - freq += 10; - else - freq += 20; - return (freq - 24220) / 5; -} - -static __inline int -mappsb(u_int freq, u_int flags) -{ - return ((freq * 10) + (((freq % 5) == 2) ? 5 : 0) - 49400) / 5; -} - -/* - * Convert GHz frequency to IEEE channel number. - */ -int -ath_hal_mhz2ieee(struct ath_hal *ah, u_int freq, u_int flags) -{ - if (flags & CHANNEL_2GHZ) { /* 2GHz band */ - if (freq == 2484) - return 14; - if (freq < 2484) { - if (ath_hal_isgsmsku(ah)) - return mapgsm(freq, flags); - return ((int)freq - 2407) / 5; - } else - return 15 + ((freq - 2512) / 20); - } else if (flags & CHANNEL_5GHZ) {/* 5Ghz band */ - if (ath_hal_ispublicsafetysku(ah) && - IS_CHAN_IN_PUBLIC_SAFETY_BAND(freq)) { - return mappsb(freq, flags); - } else if ((flags & CHANNEL_A) && (freq <= 5000)) { - return (freq - 4000) / 5; - } else { - return (freq - 5000) / 5; - } - } else { /* either, guess */ - if (freq == 2484) - return 14; - if (freq < 2484) { - if (ath_hal_isgsmsku(ah)) - return mapgsm(freq, flags); - return ((int)freq - 2407) / 5; - } - if (freq < 5000) { - if (ath_hal_ispublicsafetysku(ah) && - IS_CHAN_IN_PUBLIC_SAFETY_BAND(freq)) { - return mappsb(freq, flags); - } else if (freq > 4900) { - return (freq - 4000) / 5; - } else { - return 15 + ((freq - 2512) / 20); - } - } - return (freq - 5000) / 5; - } -} - typedef enum { WIRELESS_MODE_11a = 0, WIRELESS_MODE_TURBO = 1, @@ -328,15 +274,15 @@ } WIRELESS_MODE; static WIRELESS_MODE -ath_hal_chan2wmode(struct ath_hal *ah, const HAL_CHANNEL *chan) +ath_hal_chan2wmode(struct ath_hal *ah, const struct ieee80211_channel *chan) { - if (IS_CHAN_CCK(chan)) + if (IEEE80211_IS_CHAN_B(chan)) return WIRELESS_MODE_11b; - if (IS_CHAN_G(chan)) + if (IEEE80211_IS_CHAN_G(chan)) return WIRELESS_MODE_11g; - if (IS_CHAN_108G(chan)) + if (IEEE80211_IS_CHAN_108G(chan)) return WIRELESS_MODE_108g; - if (IS_CHAN_TURBO(chan)) + if (IEEE80211_IS_CHAN_TURBO(chan)) return WIRELESS_MODE_TURBO; return WIRELESS_MODE_11a; } @@ -350,17 +296,17 @@ u_int ath_hal_mac_clks(struct ath_hal *ah, u_int usecs) { - const HAL_CHANNEL *c = (const HAL_CHANNEL *) AH_PRIVATE(ah)->ah_curchan; + const struct ieee80211_channel *c = AH_PRIVATE(ah)->ah_curchan; u_int clks; /* NB: ah_curchan may be null when called attach time */ if (c != AH_NULL) { clks = usecs * CLOCK_RATE[ath_hal_chan2wmode(ah, c)]; - if (IS_CHAN_HT40(c)) + if (IEEE80211_IS_CHAN_HT40(c)) clks <<= 1; - else if (IS_CHAN_HALF_RATE(c)) + else if (IEEE80211_IS_CHAN_HALF(c)) clks >>= 1; - else if (IS_CHAN_QUARTER_RATE(c)) + else if (IEEE80211_IS_CHAN_QUARTER(c)) clks >>= 2; } else clks = usecs * CLOCK_RATE[WIRELESS_MODE_11b]; @@ -370,17 +316,17 @@ u_int ath_hal_mac_usec(struct ath_hal *ah, u_int clks) { - const HAL_CHANNEL *c = (const HAL_CHANNEL *) AH_PRIVATE(ah)->ah_curchan; + const struct ieee80211_channel *c = AH_PRIVATE(ah)->ah_curchan; u_int usec; /* NB: ah_curchan may be null when called attach time */ if (c != AH_NULL) { usec = clks / CLOCK_RATE[ath_hal_chan2wmode(ah, c)]; - if (IS_CHAN_HT40(c)) + if (IEEE80211_IS_CHAN_HT40(c)) usec >>= 1; - else if (IS_CHAN_HALF_RATE(c)) + else if (IEEE80211_IS_CHAN_HALF(c)) usec <<= 1; - else if (IS_CHAN_QUARTER_RATE(c)) + else if (IEEE80211_IS_CHAN_QUARTER(c)) usec <<= 2; } else usec = clks / CLOCK_RATE[WIRELESS_MODE_11b]; @@ -505,11 +451,7 @@ } return HAL_ENOTSUPP; case HAL_CAP_11D: -#ifdef AH_SUPPORT_11D return HAL_OK; -#else - return HAL_ENOTSUPP; -#endif case HAL_CAP_RXORN_FATAL: /* HAL_INT_RXORN treated as fatal */ return AH_PRIVATE(ah)->ah_rxornIsFatal ? HAL_OK : HAL_ENOTSUPP; case HAL_CAP_HT: @@ -764,7 +706,7 @@ * implement the ah_getChanNoise method. */ int16_t -ath_hal_getChanNoise(struct ath_hal *ah, HAL_CHANNEL *chan) +ath_hal_getChanNoise(struct ath_hal *ah, const struct ieee80211_channel *chan) { HAL_CHANNEL_INTERNAL *ichan; @@ -772,7 +714,7 @@ if (ichan == AH_NULL) { HALDEBUG(ah, HAL_DEBUG_NFCAL, "%s: invalid channel %u/0x%x; no mapping\n", - __func__, chan->channel, chan->channelFlags); + __func__, chan->ic_freq, chan->ic_flags); return 0; } if (ichan->rawNoiseFloor == 0) { @@ -811,8 +753,8 @@ c = &AH_PRIVATE(ah)->ah_channels[i]; if (c->rawNoiseFloor >= 0) continue; - mode = ath_hal_chan2wmode(ah, (HAL_CHANNEL *) c); - HALASSERT(mode < WIRELESS_MODE_MAX); + /* XXX can't identify proper mode */ + mode = IS_CHAN_5GHZ(c) ? WIRELESS_MODE_11a : WIRELESS_MODE_11g; nf = c->rawNoiseFloor + NOISE_FLOOR[mode] + ath_hal_getNfAdjust(ah, c); if (IS_CHAN_5GHZ(c)) { @@ -838,9 +780,8 @@ /* Apply correction factor */ c->noiseFloorAdjust = ath_hal_getNfAdjust(ah, c) + (IS_CHAN_5GHZ(c) ? correct5 : correct2); - HALDEBUG(ah, HAL_DEBUG_NFCAL, "%u/0x%x raw nf %d adjust %d\n", - c->channel, c->channelFlags, c->rawNoiseFloor, - c->noiseFloorAdjust); + HALDEBUG(ah, HAL_DEBUG_NFCAL, "%u raw nf %d adjust %d\n", + c->channel, c->rawNoiseFloor, c->noiseFloorAdjust); } } ==== //depot/projects/smpng/sys/dev/ath/ath_hal/ah.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting * Copyright (c) 2002-2008 Atheros Communications, Inc. * * Permission to use, copy, modify, and/or distribute this software for any @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ah.h,v 1.15 2008/11/15 03:43:50 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah.h,v 1.2 2009/01/28 18:00:22 sam Exp $ */ #ifndef _ATH_AH_H_ @@ -63,6 +63,8 @@ HAL_ENOTSUPP = 13, /* Hardware revision not supported */ HAL_ESELFTEST = 14, /* Hardware self-test failed */ HAL_EINPROGRESS = 15, /* Operation incomplete */ + HAL_EEBADREG = 16, /* EEPROM invalid regulatory contents */ + HAL_EEBADCC = 17, /* EEPROM invalid country code */ } HAL_STATUS; typedef enum { @@ -362,65 +364,9 @@ HAL_RFGAIN_NEED_CHANGE = 2 } HAL_RFGAIN; -/* - * Channels are specified by frequency. - */ -typedef struct { - uint32_t channelFlags; /* see below */ - uint16_t channel; /* setting in Mhz */ - uint8_t privFlags; - int8_t maxRegTxPower; /* max regulatory tx power in dBm */ - int8_t maxTxPower; /* max true tx power in 0.5 dBm */ - int8_t minTxPower; /* min true tx power in 0.5 dBm */ -} HAL_CHANNEL; - -/* channelFlags */ -#define CHANNEL_CW_INT 0x00002 /* CW interference detected on channel */ -#define CHANNEL_TURBO 0x00010 /* Turbo Channel */ -#define CHANNEL_CCK 0x00020 /* CCK channel */ -#define CHANNEL_OFDM 0x00040 /* OFDM channel */ -#define CHANNEL_2GHZ 0x00080 /* 2 GHz spectrum channel */ -#define CHANNEL_5GHZ 0x00100 /* 5 GHz spectrum channel */ -#define CHANNEL_PASSIVE 0x00200 /* Only passive scan allowed in the channel */ -#define CHANNEL_DYN 0x00400 /* dynamic CCK-OFDM channel */ -#define CHANNEL_STURBO 0x02000 /* Static turbo, no 11a-only usage */ -#define CHANNEL_HALF 0x04000 /* Half rate channel */ -#define CHANNEL_QUARTER 0x08000 /* Quarter rate channel */ -#define CHANNEL_HT20 0x10000 /* 11n 20MHZ channel */ -#define CHANNEL_HT40PLUS 0x20000 /* 11n 40MHZ channel w/ ext chan above */ -#define CHANNEL_HT40MINUS 0x40000 /* 11n 40MHZ channel w/ ext chan below */ +typedef uint16_t HAL_CTRY_CODE; /* country code */ +typedef uint16_t HAL_REG_DOMAIN; /* regulatory domain code */ -/* privFlags */ -#define CHANNEL_INTERFERENCE 0x01 /* Software use: channel interference - used for as AR as well as RADAR - interference detection */ -#define CHANNEL_DFS 0x02 /* DFS required on channel */ -#define CHANNEL_4MS_LIMIT 0x04 /* 4msec packet limit on this channel */ -#define CHANNEL_DFS_CLEAR 0x08 /* if channel has been checked for DFS */ - -#define CHANNEL_A (CHANNEL_5GHZ|CHANNEL_OFDM) -#define CHANNEL_B (CHANNEL_2GHZ|CHANNEL_CCK) -#define CHANNEL_PUREG (CHANNEL_2GHZ|CHANNEL_OFDM) -#ifdef notdef -#define CHANNEL_G (CHANNEL_2GHZ|CHANNEL_DYN) -#else -#define CHANNEL_G (CHANNEL_2GHZ|CHANNEL_OFDM) -#endif -#define CHANNEL_T (CHANNEL_5GHZ|CHANNEL_OFDM|CHANNEL_TURBO) -#define CHANNEL_ST (CHANNEL_T|CHANNEL_STURBO) -#define CHANNEL_108G (CHANNEL_2GHZ|CHANNEL_OFDM|CHANNEL_TURBO) -#define CHANNEL_108A CHANNEL_T -#define CHANNEL_G_HT20 (CHANNEL_G|CHANNEL_HT20) -#define CHANNEL_A_HT20 (CHANNEL_A|CHANNEL_HT20) -#define CHANNEL_G_HT40PLUS (CHANNEL_G|CHANNEL_HT40PLUS) -#define CHANNEL_G_HT40MINUS (CHANNEL_G|CHANNEL_HT40MINUS) -#define CHANNEL_A_HT40PLUS (CHANNEL_A|CHANNEL_HT40PLUS) -#define CHANNEL_A_HT40MINUS (CHANNEL_A|CHANNEL_HT40MINUS) -#define CHANNEL_ALL \ - (CHANNEL_OFDM | CHANNEL_CCK| CHANNEL_2GHZ | CHANNEL_5GHZ | \ - CHANNEL_TURBO | CHANNEL_HT20 | CHANNEL_HT40PLUS | CHANNEL_HT40MINUS) -#define CHANNEL_ALL_NOTURBO (CHANNEL_ALL &~ CHANNEL_TURBO) - #define HAL_ANTENNA_MIN_MODE 0 #define HAL_ANTENNA_FIXED_A 1 #define HAL_ANTENNA_FIXED_B 2 @@ -434,14 +380,6 @@ uint32_t beacons; } HAL_MIB_STATS; -typedef uint16_t HAL_CTRY_CODE; /* country code */ -typedef uint16_t HAL_REG_DOMAIN; /* regulatory domain code */ - -enum { - CTRY_DEBUG = 0x1ff, /* debug country code */ - CTRY_DEFAULT = 0 /* default country code */ -}; - enum { HAL_MODE_11A = 0x001, /* 11a channels */ HAL_MODE_TURBO = 0x002, /* 11a turbo-only channels */ @@ -630,6 +568,7 @@ struct ath_desc; struct ath_tx_status; struct ath_rx_status; +struct ieee80211_channel; /* * Hardware Access Layer (HAL) API. @@ -665,16 +604,18 @@ /* Reset functions */ HAL_BOOL __ahdecl(*ah_reset)(struct ath_hal *, HAL_OPMODE, - HAL_CHANNEL *, HAL_BOOL bChannelChange, - HAL_STATUS *status); + struct ieee80211_channel *, + HAL_BOOL bChannelChange, HAL_STATUS *status); HAL_BOOL __ahdecl(*ah_phyDisable)(struct ath_hal *); HAL_BOOL __ahdecl(*ah_disable)(struct ath_hal *); void __ahdecl(*ah_setPCUConfig)(struct ath_hal *); - HAL_BOOL __ahdecl(*ah_perCalibration)(struct ath_hal*, HAL_CHANNEL *, - HAL_BOOL *); - HAL_BOOL __ahdecl(*ah_perCalibrationN)(struct ath_hal *, HAL_CHANNEL *, - u_int chainMask, HAL_BOOL longCal, HAL_BOOL *isCalDone); - HAL_BOOL __ahdecl(*ah_resetCalValid)(struct ath_hal *, HAL_CHANNEL *); + HAL_BOOL __ahdecl(*ah_perCalibration)(struct ath_hal*, + struct ieee80211_channel *, HAL_BOOL *); + HAL_BOOL __ahdecl(*ah_perCalibrationN)(struct ath_hal *, + struct ieee80211_channel *, u_int chainMask, + HAL_BOOL longCal, HAL_BOOL *isCalDone); + HAL_BOOL __ahdecl(*ah_resetCalValid)(struct ath_hal *, + const struct ieee80211_channel *); HAL_BOOL __ahdecl(*ah_setTxPowerLimit)(struct ath_hal *, uint32_t); /* Transmit functions */ @@ -735,7 +676,8 @@ struct ath_desc *next, uint64_t tsf, struct ath_rx_status *); void __ahdecl(*ah_rxMonitor)(struct ath_hal *, - const HAL_NODE_STATS *, HAL_CHANNEL *); + const HAL_NODE_STATS *, + const struct ieee80211_channel *); void __ahdecl(*ah_procMibEvent)(struct ath_hal *, const HAL_NODE_STATS *); @@ -804,7 +746,8 @@ HAL_BOOL __ahdecl(*ah_setPowerMode)(struct ath_hal*, HAL_POWER_MODE mode, int setChip); HAL_POWER_MODE __ahdecl(*ah_getPowerMode)(struct ath_hal*); - int16_t __ahdecl(*ah_getChanNoise)(struct ath_hal *, HAL_CHANNEL *); + int16_t __ahdecl(*ah_getChanNoise)(struct ath_hal *, + const struct ieee80211_channel *); /* Beacon Management Functions */ void __ahdecl(*ah_setBeaconTimers)(struct ath_hal*, @@ -847,53 +790,64 @@ HAL_BUS_TAG, HAL_BUS_HANDLE, HAL_STATUS* status); /* - * Return a list of channels available for use with the hardware. - * The list is based on what the hardware is capable of, the specified - * country code, the modeSelect mask, and whether or not outdoor - * channels are to be permitted. + * Regulatory interfaces. Drivers should use ath_hal_init_channels to + * request a set of channels for a particular country code and/or + * regulatory domain. If CTRY_DEFAULT and SKU_NONE are specified then + * this list is constructed according to the contents of the EEPROM. + * ath_hal_getchannels acts similarly but does not alter the operating + * state; this can be used to collect information for a particular + * regulatory configuration. Finally ath_hal_set_channels installs a + * channel list constructed outside the driver. The HAL will adopt the + * channel list and setup internal state according to the specified + * regulatory configuration (e.g. conformance test limits). * - * The channel list is returned in the supplied array. maxchans - * defines the maximum size of this array. nchans contains the actual - * number of channels returned. If a problem occurred or there were - * no channels that met the criteria then AH_FALSE is returned. + * For all interfaces the channel list is returned in the supplied array. + * maxchans defines the maximum size of this array. nchans contains the + * actual number of channels returned. If a problem occurred then a + * status code != HAL_OK is returned. */ -extern HAL_BOOL __ahdecl ath_hal_init_channels(struct ath_hal *, - HAL_CHANNEL *chans, u_int maxchans, u_int *nchans, - uint8_t *regclassids, u_int maxregids, u_int *nregids, - HAL_CTRY_CODE cc, u_int modeSelect, - HAL_BOOL enableOutdoor, HAL_BOOL enableExtendedChannels); +struct ieee80211_channel; /* - * Calibrate noise floor data following a channel scan or similar. - * This must be called prior retrieving noise floor data. + * Return a list of channels according to the specified regulatory. */ -extern void __ahdecl ath_hal_process_noisefloor(struct ath_hal *ah); +extern HAL_STATUS __ahdecl ath_hal_getchannels(struct ath_hal *, + struct ieee80211_channel *chans, u_int maxchans, int *nchans, + u_int modeSelect, HAL_CTRY_CODE cc, HAL_REG_DOMAIN regDmn, + HAL_BOOL enableExtendedChannels); /* - * Return bit mask of wireless modes supported by the hardware. + * Return a list of channels and install it as the current operating + * regulatory list. */ -extern u_int __ahdecl ath_hal_getwirelessmodes(struct ath_hal*, HAL_CTRY_CODE); +extern HAL_STATUS __ahdecl ath_hal_init_channels(struct ath_hal *, + struct ieee80211_channel *chans, u_int maxchans, int *nchans, + u_int modeSelect, HAL_CTRY_CODE cc, HAL_REG_DOMAIN rd, + HAL_BOOL enableExtendedChannels); /* - * Calculate the transmit duration of a frame. + * Install the list of channels as the current operating regulatory + * and setup related state according to the country code and sku. */ -extern uint16_t __ahdecl ath_hal_computetxtime(struct ath_hal *, - const HAL_RATE_TABLE *rates, uint32_t frameLen, - uint16_t rateix, HAL_BOOL shortPreamble); +extern HAL_STATUS __ahdecl ath_hal_set_channels(struct ath_hal *, + struct ieee80211_channel *chans, int nchans, + HAL_CTRY_CODE cc, HAL_REG_DOMAIN regDmn); /* - * Return if device is public safety. + * Calibrate noise floor data following a channel scan or similar. + * This must be called prior retrieving noise floor data. */ -extern HAL_BOOL __ahdecl ath_hal_ispublicsafetysku(struct ath_hal *); +extern void __ahdecl ath_hal_process_noisefloor(struct ath_hal *ah); /* - * Return if device is operating in 900 MHz band. + * Return bit mask of wireless modes supported by the hardware. */ -extern HAL_BOOL ath_hal_isgsmsku(struct ath_hal *); +extern u_int __ahdecl ath_hal_getwirelessmodes(struct ath_hal*); /* - * Convert between IEEE channel number and channel frequency - * using the specified channel flags; e.g. CHANNEL_2GHZ. + * Calculate the transmit duration of a frame. */ -extern int __ahdecl ath_hal_mhz2ieee(struct ath_hal *, u_int mhz, u_int flags); +extern uint16_t __ahdecl ath_hal_computetxtime(struct ath_hal *, + const HAL_RATE_TABLE *rates, uint32_t frameLen, + uint16_t rateix, HAL_BOOL shortPreamble); #endif /* _ATH_AH_H_ */ ==== //depot/projects/smpng/sys/dev/ath/ath_hal/ah_internal.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting * Copyright (c) 2002-2008 Atheros Communications, Inc. * * Permission to use, copy, modify, and/or distribute this software for any @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ah_internal.h,v 1.2 2008/12/13 03:50:31 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah_internal.h,v 1.3 2009/01/28 18:00:22 sam Exp $ */ #ifndef _ATH_AH_INTERAL_H_ #define _ATH_AH_INTERAL_H_ @@ -27,6 +27,8 @@ #define AH_MIN(a,b) ((a)<(b)?(a):(b)) #define AH_MAX(a,b) ((a)>(b)?(a):(b)) +#include + #ifndef NBBY #define NBBY 8 /* number of bits/byte */ #endif @@ -108,32 +110,44 @@ struct ath_hal_rf *ath_hal_rfprobe(struct ath_hal *ah, HAL_STATUS *ecode); /* - * Internal form of a HAL_CHANNEL. Note that the structure - * must be defined such that you can cast references to a - * HAL_CHANNEL so don't shuffle the first two members. + * Maximum number of internal channels. Entries are per unique + * frequency so this might be need to be increased to handle all + * usage cases; typically no more than 32 are really needed but + * dynamically allocating the data structures is a bit painful + * right now. + */ +#ifndef AH_MAXCHAN +#define AH_MAXCHAN 96 +#endif + +/* + * Internal per-channel state. These are found + * using ic_devdata in the ieee80211_channel. */ typedef struct { - uint32_t channelFlags; - uint16_t channel; /* NB: must be first for casting */ + uint16_t channel; /* h/w frequency, NB: may be mapped */ uint8_t privFlags; - int8_t maxRegTxPower; - int8_t maxTxPower; - int8_t minTxPower; /* as above... */ - - HAL_BOOL bssSendHere; - uint8_t gainI; - HAL_BOOL iqCalValid; - uint8_t calValid; /* bitmask of cal types */ +#define CHANNEL_IQVALID 0x01 /* IQ calibration valid */ +#define CHANNEL_ANI_INIT 0x02 /* ANI state initialized */ +#define CHANNEL_ANI_SETUP 0x04 /* ANI state setup */ + uint8_t calValid; /* bitmask of cal types */ int8_t iCoff; int8_t qCoff; int16_t rawNoiseFloor; int16_t noiseFloorAdjust; - int8_t antennaMax; - uint32_t regDmnFlags; /* Flags for channel use in reg */ - uint32_t conformanceTestLimit; /* conformance test limit from reg domain */ - uint16_t mainSpur; /* cached spur value for this cahnnel */ + uint16_t mainSpur; /* cached spur value for this channel */ } HAL_CHANNEL_INTERNAL; +/* channel requires noise floor check */ +#define CHANNEL_NFCREQUIRED IEEE80211_CHAN_PRIV0 + +/* all full-width channels */ +#define IEEE80211_CHAN_ALLFULL \ + (IEEE80211_CHAN_ALL - (IEEE80211_CHAN_HALF | IEEE80211_CHAN_QUARTER)) +#define IEEE80211_CHAN_ALLTURBOFULL \ + (IEEE80211_CHAN_ALLTURBO - \ + (IEEE80211_CHAN_HALF | IEEE80211_CHAN_QUARTER)) + typedef struct { uint32_t halChanSpreadSupport : 1, halSleepAfterBeaconBroken : 1, @@ -189,6 +203,8 @@ uint8_t halNumAntCfg5GHz; } HAL_CAPABILITIES; +struct regDomain; + /* * The ``private area'' follows immediately after the ``public area'' * in the data structure returned by ath_hal_attach. Private data are @@ -228,7 +244,7 @@ uint32_t gpio, uint32_t val); void (*ah_gpioSetIntr)(struct ath_hal*, u_int, uint32_t); HAL_BOOL (*ah_getChipPowerLimits)(struct ath_hal *, - HAL_CHANNEL *, uint32_t); + struct ieee80211_channel *); int16_t (*ah_getNfAdjust)(struct ath_hal *, const HAL_CHANNEL_INTERNAL*); void (*ah_getNoiseFloor)(struct ath_hal *, @@ -255,8 +271,8 @@ uint16_t ah_analog5GhzRev; /* 2GHz radio revision */ uint16_t ah_analog2GhzRev; /* 5GHz radio revision */ - HAL_OPMODE ah_opmode; /* operating mode from reset */ + const struct ieee80211_channel *ah_curchan;/* operating channel */ HAL_CAPABILITIES ah_caps; /* device capabilities */ uint32_t ah_diagreg; /* user-specified AR_DIAG_SW */ int16_t ah_powerLimit; /* tx power cap */ @@ -267,14 +283,13 @@ /* * State for regulatory domain handling. */ - HAL_REG_DOMAIN ah_currentRD; /* Current regulatory domain */ - HAL_CTRY_CODE ah_countryCode; /* current country code */ - HAL_CHANNEL_INTERNAL ah_channels[256]; /* calculated channel list */ - u_int ah_nchan; /* valid channels in list */ - HAL_CHANNEL_INTERNAL *ah_curchan; /* current channel */ + HAL_REG_DOMAIN ah_currentRD; /* EEPROM regulatory domain */ + HAL_CHANNEL_INTERNAL ah_channels[AH_MAXCHAN]; /* private chan state */ + u_int ah_nchan; /* valid items in ah_channels */ + const struct regDomain *ah_rd2GHz; /* reg state for 2G band */ + const struct regDomain *ah_rd5GHz; /* reg state for 5G band */ uint8_t ah_coverageClass; /* coverage class */ - HAL_BOOL ah_regdomainUpdate; /* regdomain is updated? */ /* * RF Silent handling; setup according to the EEPROM. */ @@ -307,8 +322,8 @@ AH_PRIVATE(_ah)->ah_gpioGet(_ah, _gpio, _val) #define ath_hal_gpioSetIntr(_ah, _gpio, _ilevel) \ AH_PRIVATE(_ah)->ah_gpioSetIntr(_ah, _gpio, _ilevel) -#define ath_hal_getpowerlimits(_ah, _chans, _nchan) \ - AH_PRIVATE(_ah)->ah_getChipPowerLimits(_ah, _chans, _nchan) +#define ath_hal_getpowerlimits(_ah, _chan) \ + AH_PRIVATE(_ah)->ah_getChipPowerLimits(_ah, _chan) #define ath_hal_getNfAdjust(_ah, _c) \ AH_PRIVATE(_ah)->ah_getNfAdjust(_ah, _c) #define ath_hal_getNoiseFloor(_ah, _nfArray) \ @@ -327,38 +342,22 @@ #define ath_hal_eepromDiag(_ah, _request, _a, _asize, _r, _rsize) \ AH_PRIVATE(_ah)->ah_eepromDiag(_ah, _request, _a, _asize, _r, _rsize) -#if !defined(_NET_IF_IEEE80211_H_) && !defined(_NET80211__IEEE80211_H_) +#ifndef _NET_IF_IEEE80211_H_ /* * Stuff that would naturally come from _ieee80211.h */ #define IEEE80211_ADDR_LEN 6 -#define IEEE80211_WEP_KEYLEN 5 /* 40bit */ #define IEEE80211_WEP_IVLEN 3 /* 24bit */ #define IEEE80211_WEP_KIDLEN 1 /* 1 octet */ #define IEEE80211_WEP_CRCLEN 4 /* CRC-32 */ #define IEEE80211_CRC_LEN 4 -#define IEEE80211_MTU 1500 #define IEEE80211_MAX_LEN (2300 + IEEE80211_CRC_LEN + \ (IEEE80211_WEP_IVLEN + IEEE80211_WEP_KIDLEN + IEEE80211_WEP_CRCLEN)) - -enum { - IEEE80211_T_DS, /* direct sequence spread spectrum */ - IEEE80211_T_FH, /* frequency hopping */ - IEEE80211_T_OFDM, /* frequency division multiplexing */ - IEEE80211_T_TURBO, /* high rate DS */ - IEEE80211_T_HT, /* HT - full GI */ -}; -#define IEEE80211_T_CCK IEEE80211_T_DS /* more common nomenclatur */ #endif /* _NET_IF_IEEE80211_H_ */ -/* NB: these are defined privately until XR support is announced */ -enum { - ATHEROS_T_XR = IEEE80211_T_HT+1, /* extended range */ -}; - #define HAL_TXQ_USE_LOCKOUT_BKOFF_DIS 0x00000001 #define INIT_AIFS 2 @@ -411,43 +410,11 @@ #define HAL_BIN_WIDTH_TURBO_100HZ 6250 #define HAL_MAX_BINS_ALLOWED 28 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 29 09:51:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBE881065672; Thu, 29 Jan 2009 09:51: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 79EDA106566B for ; Thu, 29 Jan 2009 09:51:53 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6758F8FC0A for ; Thu, 29 Jan 2009 09:51:53 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0T9prwP033770 for ; Thu, 29 Jan 2009 09:51:53 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0T9pqNN033768 for perforce@freebsd.org; Thu, 29 Jan 2009 09:51:52 GMT (envelope-from trasz@freebsd.org) Date: Thu, 29 Jan 2009 09:51:52 GMT Message-Id: <200901290951.n0T9pqNN033768@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 156848 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 Jan 2009 09:51:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=156848 Change 156848 by trasz@trasz_victim7 on 2009/01/29 09:51:00 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/Makefile.inc1#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/chmod/chmod.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/dd/dd.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/README#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/g_Qfmt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/g__fmt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/g_ddfmt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/g_dfmt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/g_ffmt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/g_xLfmt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/g_xfmt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/gdtoa.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/gdtoa.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/gdtoa_fltrnds.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/gdtoaimp.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/gethex.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/smisc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/strtod.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/strtodg.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/strtof.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/strtopQ.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/strtopd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/strtopdd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/strtopf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/strtopx.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/strtopxL.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/README#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/getround.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/obad/strtodt.out#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/obad/xL.out#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/xsum0.out#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/xsum0.out#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/smbfs/mount_smbfs/mount_smbfs.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/smbfs/mount_smbfs/mount_smbfs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/ChangeLog#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/base64.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/ctrl_iface.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/ctrl_iface_dbus.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/ctrl_iface_unix.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/dbus_dict_helpers.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/docbook/wpa_background.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/driver_ndis.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_aka.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_gpsk.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_gpsk_common.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_ttls.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eloop.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eloop.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eloop_none.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/mlme.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/os_unix.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/preauth_test.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/radius.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/sha1.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/tls_openssl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/version.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_cli.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.cpp#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_i.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_supplicant.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/devd.conf#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/jail#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/ntpd#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.shutdown#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/regdomain.xml#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/paths.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_disk.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/Makefile#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk_failures.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk_secure.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_write_disk_sparse.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/sysctl.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/ferror.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/printf.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/printfcommon.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/vfprintf.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/vfscanf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/vfwprintf.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/vfwscanf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/string/strlen.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/libpmc.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/dumpfs/dumpfs.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/dumpfs/dumpfs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/fsck_ffs/fsck.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/fsck_ffs/fsck_ffs.8#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/fsck_ffs/fsutil.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/fsck_ffs/main.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifieee80211.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ipfw/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ipfw/dummynet.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ipfw/ipfw2.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ipfw/ipfw2.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ipfw/ipv6.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ipfw/main.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ipfw/nat.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_nfs/mount_nfs.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_ntfs/mount_ntfs.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/restore/interactive.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/Makefile#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/iic.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.powerpc/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.powerpc/snd_ai2s.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.powerpc/snd_davbus.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/nge.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/sk.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/urtw.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/portindex.5#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/rc.conf.5#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man7/build.7#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man7/ports.7#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man7/tuning.7#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/kthread.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/asia#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/backward#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/europe#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/leapseconds#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/northamerica#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/zone.tab#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/cpu_switch.S#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/fpu.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/identcpu.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/local_apic.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/mp_machdep.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/msi.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/GENERIC#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/apicvar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/fpu.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_mci.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_twi.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_twireg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91var.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/uart_bus_at91usart.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/uart_cpu_at91rm9200usart.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/uart_dev_at91usart.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/forth/loader.conf#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_periph.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_xpt.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linprocfs/linprocfs.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_stats.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_types.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#24 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.amd64#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.i386#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.pc98#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.powerpc#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/kmod.mk#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/newvers.sh#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/altq/altq/altq_subr.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/pf/net/pf_ioctl.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/adb/adb_mouse.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/agp/agp_via.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ah.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ah.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ah_internal.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ah_regdomain.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5210/ar5210.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5211/ar5211.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5212/ar2316.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5212/ar2317.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5212/ar2413.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5212/ar2425.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5212/ar5111.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5212/ar5112.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5212/ar5212.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5212/ar5413.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5312/ar5312.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5416/ar2133.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5416/ar5416.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_ath.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_athvar.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_core.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_intel.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/pmc_events.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/iic.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/iic.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/iicbus.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mmc/mmc.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ofw/ofw_iicbus.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pci.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/if_plip.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/immio.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/lpbb.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/lpt.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/pcfclock.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/ppb_1284.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/ppb_base.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/ppb_msq.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/ppbconf.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/ppbconf.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/ppi.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/pps.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/vpo.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/vpoio.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppc/ppc.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppc/ppc_acpi.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppc/ppc_isa.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppc/ppc_pci.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppc/ppc_puc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppc/ppcreg.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppc/ppcvar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/puc/pucdata.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/re/if_re.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sdhci/sdhci.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/macio/aoa.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/macio/aoa.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/macio/davbus.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/macio/davbusreg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/macio/i2s.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/macio/snapper.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/macio/tumbler.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/speaker/spkr.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/sequences#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_demo.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_scs.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_subr.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/if_urtw.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/if_urtwreg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/if_urtwvar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/u3g.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/uftdi.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdi.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/bluetooth/ng_ubt2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/bluetooth/ng_ubt2_var.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/bluetooth/ubtbcmfw2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uhci2.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/usb2_controller.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_hub.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_devid.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_devtable.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_ioctl.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/quirk/usb2_quirk.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/u3g2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ufoma2.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/storage/umass2.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/blkback/blkback.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_lookup.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_node.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_node.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_rrip.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_vfsops.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_vnops.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/devfs/devfs_devs.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_dev.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/GENERIC#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/cpufreq/smist.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/identcpu.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/io_apic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/local_apic.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/mp_machdep.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/msi.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/apicvar.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/intr_machdep.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/imgact_elf.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_jail.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_malloc.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_mib.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_proc.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_sysctl.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_timeout.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sched_4bsd.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sched_ule.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_smp.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_witness.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sys_generic.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_info.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_pty.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_aio.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_cache.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#23 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_syscalls.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_vnops.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vnode_if.src#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/Makefile#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/agp/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/sound/driver/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/sound/driver/ai2s/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/sound/driver/davbus/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/urtw/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/Makefile#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/rtsock.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/_ieee80211.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_crypto.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ddb.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ht.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ioctl.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ioctl.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_node.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_regdomain.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_regdomain.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_var.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_iface.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_iface.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_pcb.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_fw2.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/raw_ip.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_var.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/raw_ip6.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec_mbuf.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfs4client/nfs4_subs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vfsops.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vnops.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_srvsubs.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/opencrypto/cryptosoft.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pci/if_rlreg.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/conf/GENERIC#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/conf/NOTES#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/ata_macio.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/kiic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/intr_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_audit.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_framework.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_priv.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/conf.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/jail.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/lock.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/param.h#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/pcpu.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/pmc.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sysctl.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/types.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_alloc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_balloc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_extern.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_inode.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vnops.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_dirhash.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_lookup.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#25 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/uma.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/uma_core.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/uma_dbg.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/uma_int.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_meter.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_mmap.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/sched/schedgraph.py#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/buf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/suff.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/split/split.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/truss.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/Makefile#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/config/config.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/i2c/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/i2c/i2c.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/i2c/i2c.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jail/jail.8#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/devices.c#9 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/Makefile.inc1#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.615 2009/01/15 04:19:03 imp Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.616 2009/01/23 18:23:16 imp Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -702,6 +702,10 @@ NO_KERNELCLEAN= t NO_KERNELCONFIG= t NO_KERNELDEPEND= t +# Shortcut for KERNCONF=Blah -DKERNFAST is now KERNFAST=Blah +.if !defined(KERNCONF) && ${KERNFAST} != "1" +KERNCONF=${KERNFAST} +.endif .endif .if !defined(KERNCONF) && defined(KERNEL) KERNCONF= ${KERNEL} ==== //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#16 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.166 2009/01/03 11:25:50 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.167 2009/01/25 19:03:30 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090122: tzdata2009a import +OLD_FILES+=usr/share/zoneinfo/Asia/Katmandu +# 20090102: file 4.26 import +OLD_FILES+=usr/share/misc/magic.mime +OLD_FILES+=usr/share/misc/magic.mime.mgc # 20081223: bind 9.4.3 import, nsupdate.8 moved to nsupdate.1 OLD_FILES+=usr/share/man/man8/nsupdate.8.gz # 20081223: ipprotosw.h removed ==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#17 (text+ko) ==== @@ -22,6 +22,14 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090119: + NTFS has been removed from GENERIC kernel on amd64 to match + GENERIC on i386. Should not cause any issues since mount_ntfs(8) + will load ntfs.ko module automatically when NTFS support is + actually needed, unless ntfs.ko is not installed or security + level prohibits loading kernel modules. If either is the case, + "options NTFS" has to be added into kernel config. + 20090115: TCP Appropriate Byte Counting (RFC 3465) support added to kernel. New field in struct tcpcb breaks ABI, so bump __FreeBSD_version to @@ -1207,4 +1215,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.558 2009/01/15 06:44:22 lstewart Exp $ +$FreeBSD: src/UPDATING,v 1.559 2009/01/19 17:00:42 sobomax Exp $ ==== //depot/projects/soc2008/trasz_nfs4acl/bin/chmod/chmod.1#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)chmod.1 8.4 (Berkeley) 3/31/94 -.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.40 2006/12/22 07:28:38 ru Exp $ +.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.42 2009/01/26 18:14:21 trhodes Exp $ .\" -.Dd December 22, 2006 +.Dd January 26, 2009 .Dt CHMOD 1 .Os .Sh NAME @@ -281,6 +281,10 @@ ``o'' by itself), in combination with the .Ar perm symbols ``s'' or ``t'', are ignored. +.Pp +The ``w'' permission on directories will permit file creation, relocation, +and copy into that directory. +Files created within the directory itself will inherit its group ID. .Sh EXAMPLES .Bl -tag -width "u=rwx,go=u-w" -compact .It Li 644 @@ -343,4 +347,4 @@ .Sh BUGS There is no .Ar perm -option for the naughty bits. +option for the naughty bits of a horse. ==== //depot/projects/soc2008/trasz_nfs4acl/bin/dd/dd.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 -.\" $FreeBSD: src/bin/dd/dd.1,v 1.31 2005/07/28 18:28:11 keramida Exp $ +.\" $FreeBSD: src/bin/dd/dd.1,v 1.32 2009/01/23 03:46:44 keramida Exp $ .\" .Dd August 15, 2004 .Dt DD 1 @@ -392,6 +392,11 @@ Check for (even) parity errors on a file: .Pp .Dl "dd if=file conv=pareven | cmp -x - file" +.Pp +To create an image of a Mode-1 CD-ROM, which is a commonly used format +for data CD-ROM disks, use a block size of 2048 bytes: +.Pp +.Dl "dd if=/dev/acd0 of=filename.iso bs=2048" .Sh SEE ALSO .Xr cp 1 , .Xr mt 1 , ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/README#3 (text+ko) ==== @@ -56,7 +56,9 @@ whose sum is the desired value For decimal -> binary conversions, there are three families of -helper routines: one for round-nearest: +helper routines: one for round-nearest (or the current rounding +mode on IEEE-arithmetic systems that provide the C99 fegetround() +function, if compiled with -DHonor_FLT_ROUNDS): strtof strtod @@ -191,6 +193,9 @@ conversion are easily done with the help of gdtoa(), such as %e or %f style and conversions with direction of rounding specified (so that, if desired, the decimal value is either >= or <= the binary value). +On IEEE-arithmetic systems that provide the C99 fegetround() function, +if compiled with -DHonor_FLT_ROUNDS, these routines honor the current +rounding mode. For an example of more general conversions based on dtoa(), see netlib's "printf.c from ampl/solvers". @@ -342,5 +347,11 @@ current rounding mode is obtained from fegetround() rather than from FLT_ROUNDS, unless Trust_FLT_ROUNDS is also #defined. +Compile with -DUSE_LOCALE to use the current locale; otherwise +decimal points are assumed to be '.'. With -DUSE_LOCALE, unless +you also compile with -DNO_LOCALE_CACHE, the details about the +current "decimal point" character string are cached and assumed not +to change during the program's execution. + Please send comments to David M. Gay (dmg at acm dot org, with " at " changed at "@" and " dot " changed to "."). ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/g_Qfmt.c#2 (text+ko) ==== @@ -51,15 +51,20 @@ char* #ifdef KR_headers -g_Qfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; unsigned bufsize; +g_Qfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; size_t bufsize; #else -g_Qfmt(char *buf, void *V, int ndig, unsigned bufsize) +g_Qfmt(char *buf, void *V, int ndig, size_t bufsize) #endif { - static FPI fpi = { 113, 1-16383-113+1, 32766 - 16383 - 113 + 1, 1, 0 }; + static FPI fpi0 = { 113, 1-16383-113+1, 32766 - 16383 - 113 + 1, 1, 0 }; char *b, *s, *se; ULong bits[4], *L, sign; int decpt, ex, i, mode; +#ifdef Honor_FLT_ROUNDS +#include "gdtoa_fltrnds.h" +#else +#define fpi &fpi0 +#endif if (ndig < 0) ndig = 0; @@ -109,6 +114,6 @@ return 0; mode = 0; } - s = gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se); - return g__fmt(buf, s, se, decpt, sign); + s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); + return g__fmt(buf, s, se, decpt, sign, bufsize); } ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/g__fmt.c#2 (text+ko) ==== @@ -37,24 +37,51 @@ char * #ifdef KR_headers -g__fmt(b, s, se, decpt, sign) char *b; char *s; char *se; int decpt; ULong sign; +g__fmt(b, s, se, decpt, sign, blen) char *b; char *s; char *se; int decpt; ULong sign; size_t blen; #else -g__fmt(char *b, char *s, char *se, int decpt, ULong sign) +g__fmt(char *b, char *s, char *se, int decpt, ULong sign, size_t blen) #endif { int i, j, k; - char *s0 = s; + char *be, *s0; + size_t len; #ifdef USE_LOCALE - char decimalpoint = *localeconv()->decimal_point; +#ifdef NO_LOCALE_CACHE + char *decimalpoint = localeconv()->decimal_point; + size_t dlen = strlen(decimalpoint); +#else + char *decimalpoint; + static char *decimalpoint_cache; + static size_t dlen; + if (!(s0 = decimalpoint_cache)) { + s0 = localeconv()->decimal_point; + dlen = strlen(s0); + if ((decimalpoint_cache = (char*)malloc(strlen(s0) + 1))) { + strcpy(decimalpoint_cache, s0); + s0 = decimalpoint_cache; + } + } + decimalpoint = s0; +#endif #else -#define decimalpoint '.' +#define dlen 0 #endif + s0 = s; + len = (se-s) + dlen + 6; /* 6 = sign + e+dd + trailing null */ + if (blen < len) + goto ret0; + be = b + blen - 1; if (sign) *b++ = '-'; if (decpt <= -4 || decpt > se - s + 5) { *b++ = *s++; if (*s) { - *b++ = decimalpoint; +#ifdef USE_LOCALE + while((*b = *decimalpoint++)) + ++b; +#else + *b++ = '.'; +#endif while((*b = *s++) !=0) b++; } @@ -69,6 +96,8 @@ for(j = 2, k = 10; 10*k <= decpt; j++, k *= 10){} for(;;) { i = decpt / k; + if (b >= be) + goto ret0; *b++ = i + '0'; if (--j <= 0) break; @@ -78,22 +107,41 @@ *b = 0; } else if (decpt <= 0) { - *b++ = decimalpoint; +#ifdef USE_LOCALE + while((*b = *decimalpoint++)) + ++b; +#else + *b++ = '.'; +#endif + if (be < b - decpt + (se - s)) + goto ret0; for(; decpt < 0; decpt++) *b++ = '0'; - while((*b = *s++) !=0) + while((*b = *s++) != 0) b++; } else { - while((*b = *s++) !=0) { + while((*b = *s++) != 0) { b++; - if (--decpt == 0 && *s) - *b++ = decimalpoint; + if (--decpt == 0 && *s) { +#ifdef USE_LOCALE + while(*b = *decimalpoint++) + ++b; +#else + *b++ = '.'; +#endif + } + } + if (b + decpt > be) { + ret0: + b = 0; + goto ret; } for(; decpt > 0; decpt--) *b++ = '0'; *b = 0; } + ret: freedtoa(s0); return b; } ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/g_ddfmt.c#2 (text+ko) ==== @@ -33,9 +33,9 @@ char * #ifdef KR_headers -g_ddfmt(buf, dd, ndig, bufsize) char *buf; double *dd; int ndig; unsigned bufsize; +g_ddfmt(buf, dd, ndig, bufsize) char *buf; double *dd; int ndig; size_t bufsize; #else -g_ddfmt(char *buf, double *dd, int ndig, unsigned bufsize) +g_ddfmt(char *buf, double *dd, int ndig, size_t bufsize) #endif { FPI fpi; @@ -44,6 +44,21 @@ int bx, by, decpt, ex, ey, i, j, mode; Bigint *x, *y, *z; double ddx[2]; +#ifdef Honor_FLT_ROUNDS /*{{*/ + int Rounding; +#ifdef Trust_FLT_ROUNDS /*{{ only define this if FLT_ROUNDS really works! */ + Rounding = Flt_Rounds; +#else /*}{*/ + Rounding = 1; + switch(fegetround()) { + case FE_TOWARDZERO: Rounding = 0; break; + case FE_UPWARD: Rounding = 2; break; + case FE_DOWNWARD: Rounding = 3; + } +#endif /*}}*/ +#else /*}{*/ +#define Rounding FPI_Round_near +#endif /*}}*/ if (bufsize < 10 || bufsize < ndig + 8) return 0; @@ -144,11 +159,11 @@ } fpi.emin = 1-1023-53+1; fpi.emax = 2046-1023-106+1; - fpi.rounding = FPI_Round_near; + fpi.rounding = Rounding; fpi.sudden_underflow = 0; i = STRTOG_Normal; s = gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se); - b = g__fmt(buf, s, se, decpt, z->sign); + b = g__fmt(buf, s, se, decpt, z->sign, bufsize); Bfree(z); return b; } ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/g_dfmt.c#2 (text+ko) ==== @@ -33,15 +33,20 @@ char* #ifdef KR_headers -g_dfmt(buf, d, ndig, bufsize) char *buf; double *d; int ndig; unsigned bufsize; +g_dfmt(buf, d, ndig, bufsize) char *buf; double *d; int ndig; size_t bufsize; #else -g_dfmt(char *buf, double *d, int ndig, unsigned bufsize) +g_dfmt(char *buf, double *d, int ndig, size_t bufsize) #endif { - static FPI fpi = { 53, 1-1023-53+1, 2046-1023-53+1, 1, 0 }; + static FPI fpi0 = { 53, 1-1023-53+1, 2046-1023-53+1, 1, 0 }; char *b, *s, *se; ULong bits[2], *L, sign; int decpt, ex, i, mode; +#ifdef Honor_FLT_ROUNDS +#include "gdtoa_fltrnds.h" +#else +#define fpi &fpi0 +#endif if (ndig < 0) ndig = 0; @@ -52,6 +57,8 @@ sign = L[_0] & 0x80000000L; if ((L[_0] & 0x7ff00000) == 0x7ff00000) { /* Infinity or NaN */ + if (bufsize < 10) + return 0; if (L[_0] & 0xfffff || L[_1]) { return strcp(buf, "NaN"); } @@ -78,12 +85,9 @@ ex = 1; ex -= 0x3ff + 52; mode = 2; - if (ndig <= 0) { - if (bufsize < 25) - return 0; + if (ndig <= 0) mode = 0; - } i = STRTOG_Normal; - s = gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se); - return g__fmt(buf, s, se, decpt, sign); + s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); + return g__fmt(buf, s, se, decpt, sign, bufsize); } ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/g_ffmt.c#2 (text+ko) ==== @@ -33,15 +33,20 @@ char* #ifdef KR_headers -g_ffmt(buf, f, ndig, bufsize) char *buf; float *f; int ndig; unsigned bufsize; +g_ffmt(buf, f, ndig, bufsize) char *buf; float *f; int ndig; size_t bufsize; #else -g_ffmt(char *buf, float *f, int ndig, unsigned bufsize) +g_ffmt(char *buf, float *f, int ndig, size_t bufsize) #endif { - static FPI fpi = { 24, 1-127-24+1, 254-127-24+1, 1, 0 }; + static FPI fpi0 = { 24, 1-127-24+1, 254-127-24+1, 1, 0 }; char *b, *s, *se; ULong bits[1], *L, sign; int decpt, ex, i, mode; +#ifdef Honor_FLT_ROUNDS +#include "gdtoa_fltrnds.h" +#else +#define fpi &fpi0 +#endif if (ndig < 0) ndig = 0; @@ -83,6 +88,6 @@ mode = 0; } i = STRTOG_Normal; - s = gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se); - return g__fmt(buf, s, se, decpt, sign); + s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); + return g__fmt(buf, s, se, decpt, sign, bufsize); } ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/g_xLfmt.c#2 (text+ko) ==== @@ -49,15 +49,20 @@ char* #ifdef KR_headers -g_xLfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; unsigned bufsize; +g_xLfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; size_t bufsize; #else -g_xLfmt(char *buf, void *V, int ndig, unsigned bufsize) +g_xLfmt(char *buf, void *V, int ndig, size_t bufsize) #endif { - static FPI fpi = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, 0 }; + static FPI fpi0 = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, 0 }; char *b, *s, *se; ULong bits[2], *L, sign; int decpt, ex, i, mode; +#ifdef Honor_FLT_ROUNDS +#include "gdtoa_fltrnds.h" +#else +#define fpi &fpi0 +#endif if (ndig < 0) ndig = 0; @@ -103,6 +108,6 @@ return 0; mode = 0; } - s = gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se); - return g__fmt(buf, s, se, decpt, sign); + s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); + return g__fmt(buf, s, se, decpt, sign, bufsize); } ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/g_xfmt.c#2 (text+ko) ==== @@ -53,16 +53,21 @@ char* #ifdef KR_headers -g_xfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; unsigned bufsize; +g_xfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; size_t bufsize; #else -g_xfmt(char *buf, void *V, int ndig, unsigned bufsize) +g_xfmt(char *buf, void *V, int ndig, size_t bufsize) #endif { - static FPI fpi = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, 0 }; + static FPI fpi0 = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, 0 }; char *b, *s, *se; ULong bits[2], sign; UShort *L; int decpt, ex, i, mode; +#ifdef Honor_FLT_ROUNDS +#include "gdtoa_fltrnds.h" +#else +#define fpi &fpi0 +#endif if (ndig < 0) ndig = 0; @@ -109,6 +114,6 @@ return 0; mode = 0; } - s = gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se); - return g__fmt(buf, s, se, decpt, sign); + s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); + return g__fmt(buf, s, se, decpt, sign, bufsize); } ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/gdtoa.c#2 (text+ko) ==== @@ -417,11 +417,9 @@ if (dval(d) > ds + dval(eps)) goto bump_up; else if (dval(d) < ds - dval(eps)) { - while(*--s == '0'){} - s++; if (dval(d)) inex = STRTOG_Inexlo; - goto ret1; + goto clear_trailing0; } break; } @@ -479,8 +477,12 @@ } ++*s++; } - else + else { inex = STRTOG_Inexlo; + clear_trailing0: + while(*--s == '0'){} + ++s; + } break; } } @@ -738,7 +740,7 @@ if (b->wds > 1 || b->x[0]) inex = STRTOG_Inexlo; while(*--s == '0'){} - s++; + ++s; } ret: Bfree(S); ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/gdtoa.h#3 (text+ko) ==== @@ -33,6 +33,7 @@ #define GDTOA_H_INCLUDED #include "arith.h" +#include /* for size_t */ #ifndef Long #define Long long @@ -111,12 +112,12 @@ extern double strtod ANSI((CONST char *, char **)); extern int strtodg ANSI((CONST char*, char**, FPI*, Long*, ULong*)); -extern char* g_ddfmt ANSI((char*, double*, int, unsigned)); -extern char* g_dfmt ANSI((char*, double*, int, unsigned)); -extern char* g_ffmt ANSI((char*, float*, int, unsigned)); -extern char* g_Qfmt ANSI((char*, void*, int, unsigned)); -extern char* g_xfmt ANSI((char*, void*, int, unsigned)); -extern char* g_xLfmt ANSI((char*, void*, int, unsigned)); +extern char* g_ddfmt ANSI((char*, double*, int, size_t)); +extern char* g_dfmt ANSI((char*, double*, int, size_t)); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 29 13:46:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 510A31065674; Thu, 29 Jan 2009 13:46: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 0AC59106564A for ; Thu, 29 Jan 2009 13:46:54 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EB1A58FC1E for ; Thu, 29 Jan 2009 13:46:53 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0TDkrqC076900 for ; Thu, 29 Jan 2009 13:46:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0TDkrJP076898 for perforce@freebsd.org; Thu, 29 Jan 2009 13:46:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 29 Jan 2009 13:46:53 GMT Message-Id: <200901291346.n0TDkrJP076898@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156857 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 Jan 2009 13:46:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=156857 Change 156857 by rwatson@rwatson_freebsd_capabilities on 2009/01/29 13:46:23 Print [zombie] rather than [unknown] when ^T is pressed and a zombie process is the one we're giving information on. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/tty_info.c#3 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/tty_info.c#3 (text+ko) ==== @@ -285,6 +285,8 @@ state = "suspended"; else if (TD_AWAITING_INTR(td)) state = "intrwait"; + else if (pick->p_state == PRS_ZOMBIE) + state = "zombie"; else state = "unknown"; pctcpu = (sched_pctcpu(td) * 10000 + FSCALE / 2) >> FSHIFT; From owner-p4-projects@FreeBSD.ORG Thu Jan 29 13:54:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78E1010656F0; Thu, 29 Jan 2009 13:54: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 261B610656E6 for ; Thu, 29 Jan 2009 13:54:01 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 122168FC33 for ; Thu, 29 Jan 2009 13:54:01 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0TDs0Jv077483 for ; Thu, 29 Jan 2009 13:54:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0TDs0Uw077481 for perforce@freebsd.org; Thu, 29 Jan 2009 13:54:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 29 Jan 2009 13:54:00 GMT Message-Id: <200901291354.n0TDs0Uw077481@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156858 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 Jan 2009 13:54:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=156858 Change 156858 by rwatson@rwatson_freebsd_capabilities on 2009/01/29 13:53:14 Update for proc_reap(). Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exit.c#11 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exit.c#11 (text+ko) ==== @@ -827,7 +827,7 @@ mac_proc_destroy(p); #endif KASSERT(FIRST_THREAD_IN_PROC(p), - ("kern_wait: no residual thread!")); + ("proc_reap: no residual thread!")); uma_zfree(proc_zone, p); sx_xlock(&allproc_lock); nprocs--; From owner-p4-projects@FreeBSD.ORG Thu Jan 29 14:21:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53EA91065673; Thu, 29 Jan 2009 14:21: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 0514B106566B for ; Thu, 29 Jan 2009 14:21:29 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E3BE88FC0A for ; Thu, 29 Jan 2009 14:21:28 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0TELSP8080528 for ; Thu, 29 Jan 2009 14:21:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0TELSAx080526 for perforce@freebsd.org; Thu, 29 Jan 2009 14:21:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 29 Jan 2009 14:21:28 GMT Message-Id: <200901291421.n0TELSAx080526@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156859 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 Jan 2009 14:21:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=156859 Change 156859 by rwatson@rwatson_freebsd_capabilities on 2009/01/29 14:20:44 Move down the process descriptor exemption in the wait loop, and change the logic slightly: only exempt processes with process descriptors from visibility in wait4() if they aren't being debugged with ptrace(). Otherwise decidedly odd things happen when gdb fails to detach the process and exits, as the parent process becomes init while it still has a process descriptor. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exit.c#12 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exit.c#12 (text+ko) ==== @@ -872,15 +872,6 @@ } /* - * If a process has a process descriptor, then it won't be - * picked up by wait4(). - */ - if (p->p_procdesc != NULL) { - PROC_UNLOCK(p); - continue; - } - - /* * This special case handles a kthread spawned by linux_clone * (see linux_misc.c). The linux_wait4 and linux_waitpid * functions need to be able to distinguish between waiting @@ -894,6 +885,17 @@ continue; } + /* + * If a process has a process descriptor, then it won't be + * picked up by wait4(). Unless it's being debugged, in + * which case the debugging process will need to manage it + * with waitpid(). + */ + if (p->p_procdesc != NULL && p->p_oppid == 0) { + PROC_UNLOCK(p); + continue; + } + nfound++; PROC_SLOCK(p); if (p->p_state == PRS_ZOMBIE) { From owner-p4-projects@FreeBSD.ORG Thu Jan 29 14:25:33 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81AF51065672; Thu, 29 Jan 2009 14:25: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 4083B106566C for ; Thu, 29 Jan 2009 14:25:33 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2CCFE8FC18 for ; Thu, 29 Jan 2009 14:25:33 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0TEPXBb081227 for ; Thu, 29 Jan 2009 14:25:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0TEPXrT081225 for perforce@freebsd.org; Thu, 29 Jan 2009 14:25:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 29 Jan 2009 14:25:33 GMT Message-Id: <200901291425.n0TEPXrT081225@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156860 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 Jan 2009 14:25:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=156860 Change 156860 by rwatson@rwatson_freebsd_capabilities on 2009/01/29 14:25:22 When close() is called on a process descriptor and the process isn't yet dead, we will kill it with SIGKILL--detach the process from its descriptor before reparenting to init since otherwise init won't be able to see it in wait4() and we end up with a zombie. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#10 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#10 (text+ko) ==== @@ -244,6 +244,12 @@ procdesc_free(struct procdesc *pd) { + /* + * When the last reference is released, we assert that the descriptor + * has been closed, but not that the process has exited, as we will + * detach the descriptor before the process dies if the descript is + * closed, as we can't wait synchronously. + */ if (refcount_release(&pd->pd_refcount)) { KASSERT(pd->pd_proc == NULL, ("procdesc_free: pd_proc != NULL")); @@ -351,9 +357,17 @@ /* * If the process is not yet dead, we need to kill it, but we * can't wait around synchronously for it to go away, as that - * path leads to madness (and deadlocks). Reparent the - * target to init(8) so that there's someone to pick up the - * pieces, then terminate with prejudice. + * path leads to madness (and deadlocks). First, detach the + * process from its descriptor so that its exit status will + * be reported normally. + */ + pd->pd_proc = NULL; + p->p_procdesc = NULL; + procdesc_free(pd); + + /* + * Next, reparent it to init(8) so that there's someone to + * pick up the pieces; finally, terminate with prejudice. */ p->p_sigparent = SIGCHLD; proc_reparent(p, initproc); From owner-p4-projects@FreeBSD.ORG Thu Jan 29 14:57:09 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A6B301065769; Thu, 29 Jan 2009 14:57: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 3B7FB1065765 for ; Thu, 29 Jan 2009 14:57:08 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 468938FC19 for ; Thu, 29 Jan 2009 14:57:05 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0TEv5wn083999 for ; Thu, 29 Jan 2009 14:57:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0TEv5UP083997 for perforce@freebsd.org; Thu, 29 Jan 2009 14:57:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 29 Jan 2009 14:57:05 GMT Message-Id: <200901291457.n0TEv5UP083997@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156862 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 Jan 2009 14:57:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=156862 Change 156862 by rwatson@rwatson_freebsd_capabilities on 2009/01/29 14:56:51 Once the process descriptor's pointer to its process is cleared, don't use that pointer during close(). Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#11 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#11 (text+ko) ==== @@ -371,8 +371,8 @@ */ p->p_sigparent = SIGCHLD; proc_reparent(p, initproc); - psignal(pd->pd_proc, SIGKILL); - PROC_UNLOCK(pd->pd_proc); + psignal(p, SIGKILL); + PROC_UNLOCK(p); sx_xunlock(&proctree_lock); } From owner-p4-projects@FreeBSD.ORG Thu Jan 29 15:08:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F1801065670; Thu, 29 Jan 2009 15:08: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 122C4106566B for ; Thu, 29 Jan 2009 15:08:17 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D80B38FC12 for ; Thu, 29 Jan 2009 15:08:16 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0TF8GtF085679 for ; Thu, 29 Jan 2009 15:08:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0TF8Ghk085677 for perforce@freebsd.org; Thu, 29 Jan 2009 15:08:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 29 Jan 2009 15:08:16 GMT Message-Id: <200901291508.n0TF8Ghk085677@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156864 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 Jan 2009 15:08:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=156864 Change 156864 by rwatson@rwatson_freebsd_capabilities on 2009/01/29 15:07:43 Remove extra printfs in process descriptor regression test since it's hard to see the proper output Affected files ... .. //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/procdesc_test.c#5 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/procdesc_test.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/procdesc_test.c#4 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/procdesc_test.c#5 $ */ #include @@ -79,7 +79,6 @@ err(-1, "fstat"); if (sb.st_mode != (S_IFREG | S_IRWXU)) errx(-1, "stat mode 0%05o", sb.st_mode); - printf("before sleep: pid %d mode 0%05o\n", pid, sb.st_mode); sleep(10); if (pdgetpid(fd, &pid) < 0) err(-1, "pdgetpid"); @@ -90,7 +89,6 @@ err(-1, "fstat"); if (sb.st_mode != S_IFREG) errx(-1, "stat mode 0%05o", sb.st_mode); - printf("after sleep: pid %d mode %05o\n", pid, sb.st_mode); close(fd); } @@ -112,7 +110,6 @@ err(-1, "fstat"); if (sb.st_mode != (S_IFREG | S_IRWXU)) errx(-1, "stat mode 0%05o", sb.st_mode); - printf("before sleep: pid %d mode %05o\n", pid, sb.st_mode); sleep(2); if (pdgetpid(fd, &pid) < 0) err(-1, "pdgetpid"); @@ -123,7 +120,6 @@ err(-1, "fstat"); if (sb.st_mode != (S_IFREG | S_IRWXU)) errx(-1, "stat mode 0%05o", sb.st_mode); - printf("after sleep: pid %d mode %05o\n", pid, sb.st_mode); close(fd); } @@ -145,7 +141,6 @@ err(-1, "fstat"); if (sb.st_mode != (S_IFREG | S_IRWXU)) errx(-1, "stat mode 0%05o", sb.st_mode); - printf("before sleep: pid %d mode %05o\n", pid, sb.st_mode); sleep(2); if (pdgetpid(fd, &pid) < 0) err(-1, "pdgetpid"); @@ -156,7 +151,6 @@ err(-1, "fstat"); if (sb.st_mode != (S_IFREG | S_IRWXU)) errx(-1, "stat mode 0%05o", sb.st_mode); - printf("after sleep: pid %d mode %05o\n", pid, sb.st_mode); if (pdkill(fd, SIGKILL) < 0) err(-1, "pdkill"); sleep(1); @@ -169,7 +163,6 @@ err(-1, "fstat"); if (sb.st_mode != S_IFREG) errx(-1, "stat mode 0%05o", sb.st_mode); - printf("after kill: pid %d mode %05o\n", pid, sb.st_mode); close(fd); } From owner-p4-projects@FreeBSD.ORG Thu Jan 29 15:54:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D38061065670; Thu, 29 Jan 2009 15:54:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8F008106566B for ; Thu, 29 Jan 2009 15:54:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 60FDD8FC19 for ; Thu, 29 Jan 2009 15:54:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0TFs3tv089194 for ; Thu, 29 Jan 2009 15:54:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0TFs3LN089192 for perforce@freebsd.org; Thu, 29 Jan 2009 15:54:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 29 Jan 2009 15:54:03 GMT Message-Id: <200901291554.n0TFs3LN089192@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156866 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 Jan 2009 15:54:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=156866 Change 156866 by rwatson@rwatson_freebsd_capabilities on 2009/01/29 15:53:27 New regression test: confirm that when a process that has created process descriptor children dies, its children also die. This is a little different than the regression test that checks that closing a descriptor kills the child, as it exercises the case where the parent is dead by the time the child dies. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/procdesc_test.c#6 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/procdesc_test.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/procdesc_test.c#5 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/procdesc_test.c#6 $ */ #include @@ -58,8 +58,8 @@ main(int argc, char *argv[]) { struct stat sb; - pid_t pid, realpid; - int fd; + pid_t parentpid, pid, realpid; + int error, fd, pipefd[2]; printf("1. pdfork() and allow to exit before close().\n"); @@ -182,6 +182,42 @@ if (errno != ECHILD) err(-1, "waitpid unexpected error %d", errno); } + close(fd); + + printf("5. Confirm killing parent kills child\n"); + + if (pipe(pipefd) < 0) + err(-1, "pipe"); + parentpid = fork(); + if (parentpid < 0) + err(-1, "fork"); + if (parentpid == 0) { + realpid = pdfork(&fd); + if (realpid < 0) + err(-1, "pdfork"); + if (realpid == 0) { + while (1) + sleep(1); + } else { + if (write(pipefd[1], &realpid, sizeof(realpid)) < 0) + err(-1, "write"); + } + exit(0); + } else { + if (read(pipefd[0], &realpid, sizeof(realpid)) < 0) + err(-1, "read"); + pid = waitpid(parentpid, NULL, 0); + if (pid != parentpid) + errx(-1, "waitpid returned unexpected pid %d", pid); + sleep(1); + error = kill(realpid, 0); + if (error < 0 && errno != ESRCH) + err(-1, "process didn't die"); + if (error == 0) + errx(-1, "process didn't die"); + } + close(pipefd[0]); + close(pipefd[1]); exit(0); } From owner-p4-projects@FreeBSD.ORG Thu Jan 29 16:24:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B24D81065677; Thu, 29 Jan 2009 16:24: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 6CCD11065675 for ; Thu, 29 Jan 2009 16:24:35 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5ABBB8FC19 for ; Thu, 29 Jan 2009 16:24:35 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0TGOZ9j092549 for ; Thu, 29 Jan 2009 16:24:35 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0TGOZDd092547 for perforce@freebsd.org; Thu, 29 Jan 2009 16:24:35 GMT (envelope-from nwhitehorn@freebsd.org) Date: Thu, 29 Jan 2009 16:24:35 GMT Message-Id: <200901291624.n0TGOZDd092547@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 156869 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 Jan 2009 16:24:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=156869 Change 156869 by nwhitehorn@nwhitehorn_trantor on 2009/01/29 16:23:36 Change the synchronization strategy for tlbie calls to correctly use ptesync and to avoid unnecessary sync operations at the end. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea64.c#13 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea64.c#13 (text+ko) ==== @@ -191,8 +191,6 @@ uint64_t vpn; register_t vpn_hi, vpn_lo; - SYNC(); - #if 1 /* * CPU documentation says that tlbie takes the VPN, not the @@ -214,19 +212,17 @@ clrldi %1,%0,49; \ insrdi %1,1,1,0; \ mtmsrd %1; \ - isync; \ + ptesync; \ \ sld %1,%2,%4; \ or %1,%1,%3; \ tlbie %1; \ \ mtmsrd %0; \ - isync;" + eieio; \ + tlbsync; \ + ptesync;" : "=r"(msr), "=r"(scratch) : "r"(vpn_hi), "r"(vpn_lo), "r"(32)); - - EIEIO(); - TLBSYNC(); - SYNC(); } #define DISABLE_TRANS(msr) msr = mfmsr(); mtmsr(msr & ~PSL_DR); isync() From owner-p4-projects@FreeBSD.ORG Thu Jan 29 18:13:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5D3C1065674; Thu, 29 Jan 2009 18:13: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 924211065670 for ; Thu, 29 Jan 2009 18:13:29 +0000 (UTC) (envelope-from marius@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7EC0D8FC1B for ; Thu, 29 Jan 2009 18:13:29 +0000 (UTC) (envelope-from marius@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0TIDSmH014758 for ; Thu, 29 Jan 2009 18:13:28 GMT (envelope-from marius@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0TIDRqo014754 for perforce@freebsd.org; Thu, 29 Jan 2009 18:13:27 GMT (envelope-from marius@freebsd.org) Date: Thu, 29 Jan 2009 18:13:27 GMT Message-Id: <200901291813.n0TIDRqo014754@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marius@freebsd.org using -f From: Marius Strobl To: Perforce Change Reviews Cc: Subject: PERFORCE change 156883 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 Jan 2009 18:13:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=156883 Change 156883 by marius@flak on 2009/01/29 18:12:31 IFC @156833 Affected files ... .. //depot/projects/usiii/amd64/amd64/fpu.c#2 integrate .. //depot/projects/usiii/amd64/include/fpu.h#2 integrate .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate .. //depot/projects/usiii/compat/linux/linux_stats.c#7 integrate .. //depot/projects/usiii/compat/svr4/svr4_types.h#2 integrate .. //depot/projects/usiii/conf/options#17 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ah.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ah.h#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ah_internal.h#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ah_regdomain.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5210/ar5210.h#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5210/ar5210_attach.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5210/ar5210_misc.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5210/ar5210_reset.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5210/ar5210_xmit.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5211/ar5211.h#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5211/ar5211_attach.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5211/ar5211_misc.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5211/ar5211_reset.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5211/ar5211_xmit.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar2316.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar2317.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar2413.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar2425.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5111.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5112.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5212.h#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5212_ani.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5212_attach.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5212_misc.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5212_reset.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5212_xmit.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5212/ar5413.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5312/ar5312.h#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5312/ar5312_reset.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar2133.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416.h#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416_ani.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416_cal.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416_cal.h#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416_reset.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_hal/ar5416/ar5416_xmit.c#2 integrate .. //depot/projects/usiii/dev/ath/if_ath.c#12 integrate .. //depot/projects/usiii/dev/ath/if_athvar.h#8 integrate .. //depot/projects/usiii/dev/mmc/mmc.c#3 integrate .. //depot/projects/usiii/dev/sbni/if_sbni.c#4 integrate .. //depot/projects/usiii/dev/sbni/if_sbni_isa.c#4 integrate .. //depot/projects/usiii/dev/sbni/if_sbni_pci.c#4 integrate .. //depot/projects/usiii/dev/sbni/if_sbnireg.h#4 integrate .. //depot/projects/usiii/dev/sbni/if_sbnivar.h#4 integrate .. //depot/projects/usiii/dev/usb/u3g.c#3 integrate .. //depot/projects/usiii/dev/usb2/bluetooth/ng_ubt2.c#2 integrate .. //depot/projects/usiii/dev/usb2/bluetooth/ubtbcmfw2.c#2 integrate .. //depot/projects/usiii/dev/xen/blkback/blkback.c#3 integrate .. //depot/projects/usiii/fs/cd9660/cd9660_lookup.c#3 integrate .. //depot/projects/usiii/fs/cd9660/cd9660_node.c#3 integrate .. //depot/projects/usiii/fs/cd9660/cd9660_node.h#3 integrate .. //depot/projects/usiii/fs/cd9660/cd9660_rrip.c#5 integrate .. //depot/projects/usiii/fs/cd9660/cd9660_vfsops.c#5 integrate .. //depot/projects/usiii/fs/cd9660/cd9660_vnops.c#5 integrate .. //depot/projects/usiii/fs/devfs/devfs_devs.c#6 integrate .. //depot/projects/usiii/fs/fifofs/fifo_vnops.c#5 integrate .. //depot/projects/usiii/kern/kern_jail.c#8 integrate .. //depot/projects/usiii/kern/kern_mib.c#9 integrate .. //depot/projects/usiii/kern/kern_sysctl.c#5 integrate .. //depot/projects/usiii/kern/vfs_cache.c#12 integrate .. //depot/projects/usiii/modules/sbni/Makefile#4 integrate .. //depot/projects/usiii/modules/usb2/Makefile#2 integrate .. //depot/projects/usiii/net80211/_ieee80211.h#6 integrate .. //depot/projects/usiii/net80211/ieee80211.c#11 integrate .. //depot/projects/usiii/net80211/ieee80211.h#9 integrate .. //depot/projects/usiii/net80211/ieee80211_crypto.h#5 integrate .. //depot/projects/usiii/net80211/ieee80211_ddb.c#6 integrate .. //depot/projects/usiii/net80211/ieee80211_ht.h#9 integrate .. //depot/projects/usiii/net80211/ieee80211_ioctl.c#9 integrate .. //depot/projects/usiii/net80211/ieee80211_ioctl.h#8 integrate .. //depot/projects/usiii/net80211/ieee80211_node.h#7 integrate .. //depot/projects/usiii/net80211/ieee80211_regdomain.c#5 integrate .. //depot/projects/usiii/net80211/ieee80211_regdomain.h#3 integrate .. //depot/projects/usiii/net80211/ieee80211_var.h#9 integrate .. //depot/projects/usiii/netinet/ip_fw2.c#15 integrate .. //depot/projects/usiii/netipsec/ipsec_mbuf.c#4 integrate .. //depot/projects/usiii/nfs4client/nfs4_subs.c#2 integrate .. //depot/projects/usiii/nfsclient/nfs_vfsops.c#14 integrate .. //depot/projects/usiii/nfsclient/nfs_vnops.c#11 integrate .. //depot/projects/usiii/nfsserver/nfs_srvsubs.c#8 integrate .. //depot/projects/usiii/opencrypto/cryptosoft.c#3 integrate .. //depot/projects/usiii/sparc64/include/dcr.h#3 integrate .. //depot/projects/usiii/sparc64/pci/schizo.c#14 integrate .. //depot/projects/usiii/sparc64/pci/schizoreg.h#7 integrate .. //depot/projects/usiii/sparc64/pci/schizovar.h#6 integrate .. //depot/projects/usiii/sparc64/sparc64/jbusppm.c#3 integrate .. //depot/projects/usiii/sparc64/sparc64/schppm.c#3 integrate .. //depot/projects/usiii/sys/conf.h#9 integrate .. //depot/projects/usiii/sys/param.h#16 integrate .. //depot/projects/usiii/sys/types.h#6 integrate .. //depot/projects/usiii/sys/vnode.h#11 integrate .. //depot/projects/usiii/ufs/ffs/ffs_alloc.c#6 integrate .. //depot/projects/usiii/ufs/ffs/ffs_balloc.c#6 integrate .. //depot/projects/usiii/ufs/ffs/ffs_extern.h#5 integrate .. //depot/projects/usiii/ufs/ffs/ffs_inode.c#7 integrate .. //depot/projects/usiii/ufs/ffs/ffs_vnops.c#9 integrate Differences ... ==== //depot/projects/usiii/amd64/amd64/fpu.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.159 2006/06/19 22:36:01 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.160 2009/01/28 20:35:16 jhb Exp $"); #include #include @@ -391,6 +391,7 @@ { struct pcb *pcb; register_t s; + u_short control; if (PCPU_GET(fpcurthread) == curthread) { printf("fpudna: fpcurthread == curthread %d times\n", @@ -421,6 +422,10 @@ * explicitly load sanitized registers. */ fxrstor(&fpu_cleanstate); + if (pcb->pcb_flags & PCB_32BIT) { + control = __INITIAL_FPUCW_I386__; + fldcw(&control); + } pcb->pcb_flags |= PCB_FPUINITDONE; } else fxrstor(&pcb->pcb_save); ==== //depot/projects/usiii/amd64/include/fpu.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)npx.h 5.3 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/amd64/include/fpu.h,v 1.33 2004/04/05 21:25:51 imp Exp $ + * $FreeBSD: src/sys/amd64/include/fpu.h,v 1.34 2009/01/28 20:35:16 jhb Exp $ */ /* @@ -92,6 +92,7 @@ * SSE2 based math. For FreeBSD/amd64, we go with the default settings. */ #define __INITIAL_FPUCW__ 0x037F +#define __INITIAL_FPUCW_I386__ 0x127F #define __INITIAL_MXCSR__ 0x1F80 #define __INITIAL_MXCSR_MASK__ 0xFFBF ==== //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 (text+ko) ==== @@ -494,7 +494,7 @@ static uint64_t zfs_expldev(dev_t dev) { - return (((uint64_t)umajor(dev) << NBITSMINOR64) | uminor(dev)); + return (((uint64_t)major(dev) << NBITSMINOR64) | minor(dev)); } /* * Special cmpldev for ZFS private use. ==== //depot/projects/usiii/compat/linux/linux_stats.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.93 2008/08/20 08:31:58 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.94 2009/01/28 17:57:16 ed Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -88,7 +88,7 @@ /* XXX this may not be quite right */ /* Map major number to 0 */ - tbuf.st_dev = uminor(buf->st_dev) & 0xf; + tbuf.st_dev = minor(buf->st_dev) & 0xf; tbuf.st_rdev = buf->st_rdev & 0xff; } dev_relthread(dev); @@ -156,7 +156,7 @@ struct l_newstat tbuf; bzero(&tbuf, sizeof(tbuf)); - tbuf.st_dev = uminor(buf->st_dev) | (umajor(buf->st_dev) << 8); + tbuf.st_dev = minor(buf->st_dev) | (major(buf->st_dev) << 8); tbuf.st_ino = buf->st_ino; tbuf.st_mode = buf->st_mode; tbuf.st_nlink = buf->st_nlink; @@ -487,7 +487,7 @@ struct l_stat64 lbuf; bzero(&lbuf, sizeof(lbuf)); - lbuf.st_dev = uminor(buf->st_dev) | (umajor(buf->st_dev) << 8); + lbuf.st_dev = minor(buf->st_dev) | (major(buf->st_dev) << 8); lbuf.st_ino = buf->st_ino; lbuf.st_mode = buf->st_mode; lbuf.st_nlink = buf->st_nlink; ==== //depot/projects/usiii/compat/svr4/svr4_types.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/svr4/svr4_types.h,v 1.6 2005/01/05 22:34:37 imp Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_types.h,v 1.7 2009/01/28 17:57:16 ed Exp $ */ #ifndef _SVR4_TYPES_H_ @@ -69,13 +69,13 @@ (((y) << 0) & 0x00ff))) #define svr4_to_bsd_odev_t(d) makedev(svr4_omajor(d), svr4_ominor(d)) -#define bsd_to_svr4_odev_t(d) svr4_omakedev(umajor(d), uminor(d)) +#define bsd_to_svr4_odev_t(d) svr4_omakedev(major(d), minor(d)) #define svr4_major(x) ((int32_t)((((x) & 0xfffc0000) >> 18))) #define svr4_minor(x) ((int32_t)((((x) & 0x0003ffff) >> 0))) #define svr4_makedev(x,y) ((svr4_dev_t)((((x) << 18) & 0xfffc0000) | \ (((y) << 0) & 0x0003ffff))) #define svr4_to_bsd_dev_t(d) makedev(svr4_major(d), svr4_minor(d)) -#define bsd_to_svr4_dev_t(d) svr4_makedev(umajor(d), uminor(d)) +#define bsd_to_svr4_dev_t(d) svr4_makedev(major(d), minor(d)) #endif /* !_SVR4_TYPES_H_ */ ==== //depot/projects/usiii/conf/options#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.657 2009/01/17 16:37:13 ed Exp $ +# $FreeBSD: src/sys/conf/options,v 1.658 2009/01/28 18:00:22 sam Exp $ # # On the handling of kernel options # @@ -762,7 +762,7 @@ AH_PRIVATE_DIAG opt_ah.h AH_NEED_DESC_SWAP opt_ah.h AH_USE_INIPDGAIN opt_ah.h -AH_SUPPORT_11D opt_ah.h +AH_MAXCHAN opt_ah.h # options for the Marvell 8335 wireless driver MALO_DEBUG opt_malo.h ==== //depot/projects/usiii/dev/ath/ath_hal/ah.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting * Copyright (c) 2002-2008 Atheros Communications, Inc. * * Permission to use, copy, modify, and/or distribute this software for any @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ah.c,v 1.2 2008/12/13 03:48:33 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah.c,v 1.3 2009/01/28 18:00:22 sam Exp $ */ #include "opt_ah.h" @@ -78,6 +78,15 @@ return AH_NULL; } +/* + * Return the mask of available modes based on the hardware capabilities. + */ +u_int +ath_hal_getwirelessmodes(struct ath_hal*ah) +{ + return ath_hal_getWirelessModes(ah); +} + /* linker set of registered RF backends */ OS_SET_DECLARE(ah_rfs, struct ath_hal_rf); @@ -152,8 +161,10 @@ kbps = rates->info[rateix].rateKbps; /* * index can be invalid duting dynamic Turbo transitions. + * XXX */ - if(kbps == 0) return 0; + if (kbps == 0) + return 0; switch (rates->info[rateix].phy) { case IEEE80211_T_CCK: @@ -187,8 +198,8 @@ #define OFDM_PLCP_BITS_QUARTER 22 #define OFDM_SYMBOL_TIME_QUARTER 16 - if (AH_PRIVATE(ah)->ah_curchan && - IS_CHAN_QUARTER_RATE(AH_PRIVATE(ah)->ah_curchan)) { + if (AH_PRIVATE(ah)->ah_curchan != AH_NULL && + IEEE80211_IS_CHAN_QUARTER(AH_PRIVATE(ah)->ah_curchan)) { bitsPerSymbol = (kbps * OFDM_SYMBOL_TIME_QUARTER) / 1000; HALASSERT(bitsPerSymbol != 0); @@ -197,8 +208,8 @@ txTime = OFDM_SIFS_TIME_QUARTER + OFDM_PREAMBLE_TIME_QUARTER + (numSymbols * OFDM_SYMBOL_TIME_QUARTER); - } else if (AH_PRIVATE(ah)->ah_curchan && - IS_CHAN_HALF_RATE(AH_PRIVATE(ah)->ah_curchan)) { + } else if (AH_PRIVATE(ah)->ah_curchan != AH_NULL && + IEEE80211_IS_CHAN_HALF(AH_PRIVATE(ah)->ah_curchan)) { bitsPerSymbol = (kbps * OFDM_SYMBOL_TIME_HALF) / 1000; HALASSERT(bitsPerSymbol != 0); @@ -252,71 +263,6 @@ return txTime; } -static __inline int -mapgsm(u_int freq, u_int flags) -{ - freq *= 10; - if (flags & CHANNEL_QUARTER) - freq += 5; - else if (flags & CHANNEL_HALF) - freq += 10; - else - freq += 20; - return (freq - 24220) / 5; -} - -static __inline int -mappsb(u_int freq, u_int flags) -{ - return ((freq * 10) + (((freq % 5) == 2) ? 5 : 0) - 49400) / 5; -} - -/* - * Convert GHz frequency to IEEE channel number. - */ -int -ath_hal_mhz2ieee(struct ath_hal *ah, u_int freq, u_int flags) -{ - if (flags & CHANNEL_2GHZ) { /* 2GHz band */ - if (freq == 2484) - return 14; - if (freq < 2484) { - if (ath_hal_isgsmsku(ah)) - return mapgsm(freq, flags); - return ((int)freq - 2407) / 5; - } else - return 15 + ((freq - 2512) / 20); - } else if (flags & CHANNEL_5GHZ) {/* 5Ghz band */ - if (ath_hal_ispublicsafetysku(ah) && - IS_CHAN_IN_PUBLIC_SAFETY_BAND(freq)) { - return mappsb(freq, flags); - } else if ((flags & CHANNEL_A) && (freq <= 5000)) { - return (freq - 4000) / 5; - } else { - return (freq - 5000) / 5; - } - } else { /* either, guess */ - if (freq == 2484) - return 14; - if (freq < 2484) { - if (ath_hal_isgsmsku(ah)) - return mapgsm(freq, flags); - return ((int)freq - 2407) / 5; - } - if (freq < 5000) { - if (ath_hal_ispublicsafetysku(ah) && - IS_CHAN_IN_PUBLIC_SAFETY_BAND(freq)) { - return mappsb(freq, flags); - } else if (freq > 4900) { - return (freq - 4000) / 5; - } else { - return 15 + ((freq - 2512) / 20); - } - } - return (freq - 5000) / 5; - } -} - typedef enum { WIRELESS_MODE_11a = 0, WIRELESS_MODE_TURBO = 1, @@ -328,15 +274,15 @@ } WIRELESS_MODE; static WIRELESS_MODE -ath_hal_chan2wmode(struct ath_hal *ah, const HAL_CHANNEL *chan) +ath_hal_chan2wmode(struct ath_hal *ah, const struct ieee80211_channel *chan) { - if (IS_CHAN_CCK(chan)) + if (IEEE80211_IS_CHAN_B(chan)) return WIRELESS_MODE_11b; - if (IS_CHAN_G(chan)) + if (IEEE80211_IS_CHAN_G(chan)) return WIRELESS_MODE_11g; - if (IS_CHAN_108G(chan)) + if (IEEE80211_IS_CHAN_108G(chan)) return WIRELESS_MODE_108g; - if (IS_CHAN_TURBO(chan)) + if (IEEE80211_IS_CHAN_TURBO(chan)) return WIRELESS_MODE_TURBO; return WIRELESS_MODE_11a; } @@ -350,17 +296,17 @@ u_int ath_hal_mac_clks(struct ath_hal *ah, u_int usecs) { - const HAL_CHANNEL *c = (const HAL_CHANNEL *) AH_PRIVATE(ah)->ah_curchan; + const struct ieee80211_channel *c = AH_PRIVATE(ah)->ah_curchan; u_int clks; /* NB: ah_curchan may be null when called attach time */ if (c != AH_NULL) { clks = usecs * CLOCK_RATE[ath_hal_chan2wmode(ah, c)]; - if (IS_CHAN_HT40(c)) + if (IEEE80211_IS_CHAN_HT40(c)) clks <<= 1; - else if (IS_CHAN_HALF_RATE(c)) + else if (IEEE80211_IS_CHAN_HALF(c)) clks >>= 1; - else if (IS_CHAN_QUARTER_RATE(c)) + else if (IEEE80211_IS_CHAN_QUARTER(c)) clks >>= 2; } else clks = usecs * CLOCK_RATE[WIRELESS_MODE_11b]; @@ -370,17 +316,17 @@ u_int ath_hal_mac_usec(struct ath_hal *ah, u_int clks) { - const HAL_CHANNEL *c = (const HAL_CHANNEL *) AH_PRIVATE(ah)->ah_curchan; + const struct ieee80211_channel *c = AH_PRIVATE(ah)->ah_curchan; u_int usec; /* NB: ah_curchan may be null when called attach time */ if (c != AH_NULL) { usec = clks / CLOCK_RATE[ath_hal_chan2wmode(ah, c)]; - if (IS_CHAN_HT40(c)) + if (IEEE80211_IS_CHAN_HT40(c)) usec >>= 1; - else if (IS_CHAN_HALF_RATE(c)) + else if (IEEE80211_IS_CHAN_HALF(c)) usec <<= 1; - else if (IS_CHAN_QUARTER_RATE(c)) + else if (IEEE80211_IS_CHAN_QUARTER(c)) usec <<= 2; } else usec = clks / CLOCK_RATE[WIRELESS_MODE_11b]; @@ -505,11 +451,7 @@ } return HAL_ENOTSUPP; case HAL_CAP_11D: -#ifdef AH_SUPPORT_11D return HAL_OK; -#else - return HAL_ENOTSUPP; -#endif case HAL_CAP_RXORN_FATAL: /* HAL_INT_RXORN treated as fatal */ return AH_PRIVATE(ah)->ah_rxornIsFatal ? HAL_OK : HAL_ENOTSUPP; case HAL_CAP_HT: @@ -764,7 +706,7 @@ * implement the ah_getChanNoise method. */ int16_t -ath_hal_getChanNoise(struct ath_hal *ah, HAL_CHANNEL *chan) +ath_hal_getChanNoise(struct ath_hal *ah, const struct ieee80211_channel *chan) { HAL_CHANNEL_INTERNAL *ichan; @@ -772,7 +714,7 @@ if (ichan == AH_NULL) { HALDEBUG(ah, HAL_DEBUG_NFCAL, "%s: invalid channel %u/0x%x; no mapping\n", - __func__, chan->channel, chan->channelFlags); + __func__, chan->ic_freq, chan->ic_flags); return 0; } if (ichan->rawNoiseFloor == 0) { @@ -811,8 +753,8 @@ c = &AH_PRIVATE(ah)->ah_channels[i]; if (c->rawNoiseFloor >= 0) continue; - mode = ath_hal_chan2wmode(ah, (HAL_CHANNEL *) c); - HALASSERT(mode < WIRELESS_MODE_MAX); + /* XXX can't identify proper mode */ + mode = IS_CHAN_5GHZ(c) ? WIRELESS_MODE_11a : WIRELESS_MODE_11g; nf = c->rawNoiseFloor + NOISE_FLOOR[mode] + ath_hal_getNfAdjust(ah, c); if (IS_CHAN_5GHZ(c)) { @@ -838,9 +780,8 @@ /* Apply correction factor */ c->noiseFloorAdjust = ath_hal_getNfAdjust(ah, c) + (IS_CHAN_5GHZ(c) ? correct5 : correct2); - HALDEBUG(ah, HAL_DEBUG_NFCAL, "%u/0x%x raw nf %d adjust %d\n", - c->channel, c->channelFlags, c->rawNoiseFloor, - c->noiseFloorAdjust); + HALDEBUG(ah, HAL_DEBUG_NFCAL, "%u raw nf %d adjust %d\n", + c->channel, c->rawNoiseFloor, c->noiseFloorAdjust); } } ==== //depot/projects/usiii/dev/ath/ath_hal/ah.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting * Copyright (c) 2002-2008 Atheros Communications, Inc. * * Permission to use, copy, modify, and/or distribute this software for any @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ah.h,v 1.15 2008/11/15 03:43:50 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah.h,v 1.2 2009/01/28 18:00:22 sam Exp $ */ #ifndef _ATH_AH_H_ @@ -63,6 +63,8 @@ HAL_ENOTSUPP = 13, /* Hardware revision not supported */ HAL_ESELFTEST = 14, /* Hardware self-test failed */ HAL_EINPROGRESS = 15, /* Operation incomplete */ + HAL_EEBADREG = 16, /* EEPROM invalid regulatory contents */ + HAL_EEBADCC = 17, /* EEPROM invalid country code */ } HAL_STATUS; typedef enum { @@ -362,65 +364,9 @@ HAL_RFGAIN_NEED_CHANGE = 2 } HAL_RFGAIN; -/* - * Channels are specified by frequency. - */ -typedef struct { - uint32_t channelFlags; /* see below */ - uint16_t channel; /* setting in Mhz */ - uint8_t privFlags; - int8_t maxRegTxPower; /* max regulatory tx power in dBm */ - int8_t maxTxPower; /* max true tx power in 0.5 dBm */ - int8_t minTxPower; /* min true tx power in 0.5 dBm */ -} HAL_CHANNEL; - -/* channelFlags */ -#define CHANNEL_CW_INT 0x00002 /* CW interference detected on channel */ -#define CHANNEL_TURBO 0x00010 /* Turbo Channel */ -#define CHANNEL_CCK 0x00020 /* CCK channel */ -#define CHANNEL_OFDM 0x00040 /* OFDM channel */ -#define CHANNEL_2GHZ 0x00080 /* 2 GHz spectrum channel */ -#define CHANNEL_5GHZ 0x00100 /* 5 GHz spectrum channel */ -#define CHANNEL_PASSIVE 0x00200 /* Only passive scan allowed in the channel */ -#define CHANNEL_DYN 0x00400 /* dynamic CCK-OFDM channel */ -#define CHANNEL_STURBO 0x02000 /* Static turbo, no 11a-only usage */ -#define CHANNEL_HALF 0x04000 /* Half rate channel */ -#define CHANNEL_QUARTER 0x08000 /* Quarter rate channel */ -#define CHANNEL_HT20 0x10000 /* 11n 20MHZ channel */ -#define CHANNEL_HT40PLUS 0x20000 /* 11n 40MHZ channel w/ ext chan above */ -#define CHANNEL_HT40MINUS 0x40000 /* 11n 40MHZ channel w/ ext chan below */ +typedef uint16_t HAL_CTRY_CODE; /* country code */ +typedef uint16_t HAL_REG_DOMAIN; /* regulatory domain code */ -/* privFlags */ -#define CHANNEL_INTERFERENCE 0x01 /* Software use: channel interference - used for as AR as well as RADAR - interference detection */ -#define CHANNEL_DFS 0x02 /* DFS required on channel */ -#define CHANNEL_4MS_LIMIT 0x04 /* 4msec packet limit on this channel */ -#define CHANNEL_DFS_CLEAR 0x08 /* if channel has been checked for DFS */ - -#define CHANNEL_A (CHANNEL_5GHZ|CHANNEL_OFDM) -#define CHANNEL_B (CHANNEL_2GHZ|CHANNEL_CCK) -#define CHANNEL_PUREG (CHANNEL_2GHZ|CHANNEL_OFDM) -#ifdef notdef -#define CHANNEL_G (CHANNEL_2GHZ|CHANNEL_DYN) -#else -#define CHANNEL_G (CHANNEL_2GHZ|CHANNEL_OFDM) -#endif -#define CHANNEL_T (CHANNEL_5GHZ|CHANNEL_OFDM|CHANNEL_TURBO) -#define CHANNEL_ST (CHANNEL_T|CHANNEL_STURBO) -#define CHANNEL_108G (CHANNEL_2GHZ|CHANNEL_OFDM|CHANNEL_TURBO) -#define CHANNEL_108A CHANNEL_T -#define CHANNEL_G_HT20 (CHANNEL_G|CHANNEL_HT20) -#define CHANNEL_A_HT20 (CHANNEL_A|CHANNEL_HT20) -#define CHANNEL_G_HT40PLUS (CHANNEL_G|CHANNEL_HT40PLUS) -#define CHANNEL_G_HT40MINUS (CHANNEL_G|CHANNEL_HT40MINUS) -#define CHANNEL_A_HT40PLUS (CHANNEL_A|CHANNEL_HT40PLUS) -#define CHANNEL_A_HT40MINUS (CHANNEL_A|CHANNEL_HT40MINUS) -#define CHANNEL_ALL \ - (CHANNEL_OFDM | CHANNEL_CCK| CHANNEL_2GHZ | CHANNEL_5GHZ | \ - CHANNEL_TURBO | CHANNEL_HT20 | CHANNEL_HT40PLUS | CHANNEL_HT40MINUS) -#define CHANNEL_ALL_NOTURBO (CHANNEL_ALL &~ CHANNEL_TURBO) - #define HAL_ANTENNA_MIN_MODE 0 #define HAL_ANTENNA_FIXED_A 1 #define HAL_ANTENNA_FIXED_B 2 @@ -434,14 +380,6 @@ uint32_t beacons; } HAL_MIB_STATS; -typedef uint16_t HAL_CTRY_CODE; /* country code */ -typedef uint16_t HAL_REG_DOMAIN; /* regulatory domain code */ - -enum { - CTRY_DEBUG = 0x1ff, /* debug country code */ - CTRY_DEFAULT = 0 /* default country code */ -}; - enum { HAL_MODE_11A = 0x001, /* 11a channels */ HAL_MODE_TURBO = 0x002, /* 11a turbo-only channels */ @@ -630,6 +568,7 @@ struct ath_desc; struct ath_tx_status; struct ath_rx_status; +struct ieee80211_channel; /* * Hardware Access Layer (HAL) API. @@ -665,16 +604,18 @@ /* Reset functions */ HAL_BOOL __ahdecl(*ah_reset)(struct ath_hal *, HAL_OPMODE, - HAL_CHANNEL *, HAL_BOOL bChannelChange, - HAL_STATUS *status); + struct ieee80211_channel *, + HAL_BOOL bChannelChange, HAL_STATUS *status); HAL_BOOL __ahdecl(*ah_phyDisable)(struct ath_hal *); HAL_BOOL __ahdecl(*ah_disable)(struct ath_hal *); void __ahdecl(*ah_setPCUConfig)(struct ath_hal *); - HAL_BOOL __ahdecl(*ah_perCalibration)(struct ath_hal*, HAL_CHANNEL *, - HAL_BOOL *); - HAL_BOOL __ahdecl(*ah_perCalibrationN)(struct ath_hal *, HAL_CHANNEL *, - u_int chainMask, HAL_BOOL longCal, HAL_BOOL *isCalDone); - HAL_BOOL __ahdecl(*ah_resetCalValid)(struct ath_hal *, HAL_CHANNEL *); + HAL_BOOL __ahdecl(*ah_perCalibration)(struct ath_hal*, + struct ieee80211_channel *, HAL_BOOL *); + HAL_BOOL __ahdecl(*ah_perCalibrationN)(struct ath_hal *, + struct ieee80211_channel *, u_int chainMask, + HAL_BOOL longCal, HAL_BOOL *isCalDone); + HAL_BOOL __ahdecl(*ah_resetCalValid)(struct ath_hal *, + const struct ieee80211_channel *); HAL_BOOL __ahdecl(*ah_setTxPowerLimit)(struct ath_hal *, uint32_t); /* Transmit functions */ @@ -735,7 +676,8 @@ struct ath_desc *next, uint64_t tsf, struct ath_rx_status *); void __ahdecl(*ah_rxMonitor)(struct ath_hal *, - const HAL_NODE_STATS *, HAL_CHANNEL *); + const HAL_NODE_STATS *, + const struct ieee80211_channel *); void __ahdecl(*ah_procMibEvent)(struct ath_hal *, const HAL_NODE_STATS *); @@ -804,7 +746,8 @@ HAL_BOOL __ahdecl(*ah_setPowerMode)(struct ath_hal*, HAL_POWER_MODE mode, int setChip); HAL_POWER_MODE __ahdecl(*ah_getPowerMode)(struct ath_hal*); - int16_t __ahdecl(*ah_getChanNoise)(struct ath_hal *, HAL_CHANNEL *); + int16_t __ahdecl(*ah_getChanNoise)(struct ath_hal *, + const struct ieee80211_channel *); /* Beacon Management Functions */ void __ahdecl(*ah_setBeaconTimers)(struct ath_hal*, @@ -847,53 +790,64 @@ HAL_BUS_TAG, HAL_BUS_HANDLE, HAL_STATUS* status); /* - * Return a list of channels available for use with the hardware. - * The list is based on what the hardware is capable of, the specified - * country code, the modeSelect mask, and whether or not outdoor - * channels are to be permitted. + * Regulatory interfaces. Drivers should use ath_hal_init_channels to + * request a set of channels for a particular country code and/or + * regulatory domain. If CTRY_DEFAULT and SKU_NONE are specified then + * this list is constructed according to the contents of the EEPROM. + * ath_hal_getchannels acts similarly but does not alter the operating + * state; this can be used to collect information for a particular + * regulatory configuration. Finally ath_hal_set_channels installs a + * channel list constructed outside the driver. The HAL will adopt the + * channel list and setup internal state according to the specified + * regulatory configuration (e.g. conformance test limits). * - * The channel list is returned in the supplied array. maxchans - * defines the maximum size of this array. nchans contains the actual - * number of channels returned. If a problem occurred or there were - * no channels that met the criteria then AH_FALSE is returned. + * For all interfaces the channel list is returned in the supplied array. + * maxchans defines the maximum size of this array. nchans contains the + * actual number of channels returned. If a problem occurred then a + * status code != HAL_OK is returned. */ -extern HAL_BOOL __ahdecl ath_hal_init_channels(struct ath_hal *, - HAL_CHANNEL *chans, u_int maxchans, u_int *nchans, - uint8_t *regclassids, u_int maxregids, u_int *nregids, - HAL_CTRY_CODE cc, u_int modeSelect, - HAL_BOOL enableOutdoor, HAL_BOOL enableExtendedChannels); +struct ieee80211_channel; /* - * Calibrate noise floor data following a channel scan or similar. - * This must be called prior retrieving noise floor data. + * Return a list of channels according to the specified regulatory. */ -extern void __ahdecl ath_hal_process_noisefloor(struct ath_hal *ah); +extern HAL_STATUS __ahdecl ath_hal_getchannels(struct ath_hal *, + struct ieee80211_channel *chans, u_int maxchans, int *nchans, + u_int modeSelect, HAL_CTRY_CODE cc, HAL_REG_DOMAIN regDmn, + HAL_BOOL enableExtendedChannels); /* - * Return bit mask of wireless modes supported by the hardware. + * Return a list of channels and install it as the current operating + * regulatory list. */ -extern u_int __ahdecl ath_hal_getwirelessmodes(struct ath_hal*, HAL_CTRY_CODE); +extern HAL_STATUS __ahdecl ath_hal_init_channels(struct ath_hal *, + struct ieee80211_channel *chans, u_int maxchans, int *nchans, + u_int modeSelect, HAL_CTRY_CODE cc, HAL_REG_DOMAIN rd, + HAL_BOOL enableExtendedChannels); /* - * Calculate the transmit duration of a frame. + * Install the list of channels as the current operating regulatory + * and setup related state according to the country code and sku. */ -extern uint16_t __ahdecl ath_hal_computetxtime(struct ath_hal *, - const HAL_RATE_TABLE *rates, uint32_t frameLen, - uint16_t rateix, HAL_BOOL shortPreamble); +extern HAL_STATUS __ahdecl ath_hal_set_channels(struct ath_hal *, + struct ieee80211_channel *chans, int nchans, + HAL_CTRY_CODE cc, HAL_REG_DOMAIN regDmn); /* - * Return if device is public safety. + * Calibrate noise floor data following a channel scan or similar. + * This must be called prior retrieving noise floor data. */ -extern HAL_BOOL __ahdecl ath_hal_ispublicsafetysku(struct ath_hal *); +extern void __ahdecl ath_hal_process_noisefloor(struct ath_hal *ah); /* - * Return if device is operating in 900 MHz band. + * Return bit mask of wireless modes supported by the hardware. */ -extern HAL_BOOL ath_hal_isgsmsku(struct ath_hal *); +extern u_int __ahdecl ath_hal_getwirelessmodes(struct ath_hal*); /* - * Convert between IEEE channel number and channel frequency - * using the specified channel flags; e.g. CHANNEL_2GHZ. + * Calculate the transmit duration of a frame. */ -extern int __ahdecl ath_hal_mhz2ieee(struct ath_hal *, u_int mhz, u_int flags); +extern uint16_t __ahdecl ath_hal_computetxtime(struct ath_hal *, + const HAL_RATE_TABLE *rates, uint32_t frameLen, + uint16_t rateix, HAL_BOOL shortPreamble); #endif /* _ATH_AH_H_ */ ==== //depot/projects/usiii/dev/ath/ath_hal/ah_internal.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting * Copyright (c) 2002-2008 Atheros Communications, Inc. * * Permission to use, copy, modify, and/or distribute this software for any @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ah_internal.h,v 1.2 2008/12/13 03:50:31 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah_internal.h,v 1.3 2009/01/28 18:00:22 sam Exp $ */ #ifndef _ATH_AH_INTERAL_H_ #define _ATH_AH_INTERAL_H_ @@ -27,6 +27,8 @@ #define AH_MIN(a,b) ((a)<(b)?(a):(b)) #define AH_MAX(a,b) ((a)>(b)?(a):(b)) +#include + #ifndef NBBY #define NBBY 8 /* number of bits/byte */ #endif @@ -108,32 +110,44 @@ struct ath_hal_rf *ath_hal_rfprobe(struct ath_hal *ah, HAL_STATUS *ecode); /* - * Internal form of a HAL_CHANNEL. Note that the structure - * must be defined such that you can cast references to a - * HAL_CHANNEL so don't shuffle the first two members. + * Maximum number of internal channels. Entries are per unique + * frequency so this might be need to be increased to handle all + * usage cases; typically no more than 32 are really needed but + * dynamically allocating the data structures is a bit painful + * right now. + */ +#ifndef AH_MAXCHAN +#define AH_MAXCHAN 96 +#endif + +/* + * Internal per-channel state. These are found + * using ic_devdata in the ieee80211_channel. */ typedef struct { - uint32_t channelFlags; - uint16_t channel; /* NB: must be first for casting */ + uint16_t channel; /* h/w frequency, NB: may be mapped */ uint8_t privFlags; - int8_t maxRegTxPower; - int8_t maxTxPower; - int8_t minTxPower; /* as above... */ - - HAL_BOOL bssSendHere; - uint8_t gainI; - HAL_BOOL iqCalValid; - uint8_t calValid; /* bitmask of cal types */ +#define CHANNEL_IQVALID 0x01 /* IQ calibration valid */ +#define CHANNEL_ANI_INIT 0x02 /* ANI state initialized */ +#define CHANNEL_ANI_SETUP 0x04 /* ANI state setup */ + uint8_t calValid; /* bitmask of cal types */ int8_t iCoff; int8_t qCoff; int16_t rawNoiseFloor; int16_t noiseFloorAdjust; - int8_t antennaMax; - uint32_t regDmnFlags; /* Flags for channel use in reg */ - uint32_t conformanceTestLimit; /* conformance test limit from reg domain */ - uint16_t mainSpur; /* cached spur value for this cahnnel */ + uint16_t mainSpur; /* cached spur value for this channel */ } HAL_CHANNEL_INTERNAL; +/* channel requires noise floor check */ +#define CHANNEL_NFCREQUIRED IEEE80211_CHAN_PRIV0 + +/* all full-width channels */ +#define IEEE80211_CHAN_ALLFULL \ + (IEEE80211_CHAN_ALL - (IEEE80211_CHAN_HALF | IEEE80211_CHAN_QUARTER)) +#define IEEE80211_CHAN_ALLTURBOFULL \ + (IEEE80211_CHAN_ALLTURBO - \ + (IEEE80211_CHAN_HALF | IEEE80211_CHAN_QUARTER)) + typedef struct { uint32_t halChanSpreadSupport : 1, halSleepAfterBeaconBroken : 1, @@ -189,6 +203,8 @@ uint8_t halNumAntCfg5GHz; } HAL_CAPABILITIES; +struct regDomain; + /* * The ``private area'' follows immediately after the ``public area'' * in the data structure returned by ath_hal_attach. Private data are @@ -228,7 +244,7 @@ uint32_t gpio, uint32_t val); void (*ah_gpioSetIntr)(struct ath_hal*, u_int, uint32_t); HAL_BOOL (*ah_getChipPowerLimits)(struct ath_hal *, - HAL_CHANNEL *, uint32_t); + struct ieee80211_channel *); int16_t (*ah_getNfAdjust)(struct ath_hal *, const HAL_CHANNEL_INTERNAL*); void (*ah_getNoiseFloor)(struct ath_hal *, @@ -255,8 +271,8 @@ uint16_t ah_analog5GhzRev; /* 2GHz radio revision */ uint16_t ah_analog2GhzRev; /* 5GHz radio revision */ - HAL_OPMODE ah_opmode; /* operating mode from reset */ + const struct ieee80211_channel *ah_curchan;/* operating channel */ HAL_CAPABILITIES ah_caps; /* device capabilities */ uint32_t ah_diagreg; /* user-specified AR_DIAG_SW */ int16_t ah_powerLimit; /* tx power cap */ @@ -267,14 +283,13 @@ /* * State for regulatory domain handling. */ - HAL_REG_DOMAIN ah_currentRD; /* Current regulatory domain */ - HAL_CTRY_CODE ah_countryCode; /* current country code */ - HAL_CHANNEL_INTERNAL ah_channels[256]; /* calculated channel list */ - u_int ah_nchan; /* valid channels in list */ - HAL_CHANNEL_INTERNAL *ah_curchan; /* current channel */ + HAL_REG_DOMAIN ah_currentRD; /* EEPROM regulatory domain */ + HAL_CHANNEL_INTERNAL ah_channels[AH_MAXCHAN]; /* private chan state */ + u_int ah_nchan; /* valid items in ah_channels */ + const struct regDomain *ah_rd2GHz; /* reg state for 2G band */ + const struct regDomain *ah_rd5GHz; /* reg state for 5G band */ uint8_t ah_coverageClass; /* coverage class */ - HAL_BOOL ah_regdomainUpdate; /* regdomain is updated? */ /* * RF Silent handling; setup according to the EEPROM. */ @@ -307,8 +322,8 @@ AH_PRIVATE(_ah)->ah_gpioGet(_ah, _gpio, _val) #define ath_hal_gpioSetIntr(_ah, _gpio, _ilevel) \ AH_PRIVATE(_ah)->ah_gpioSetIntr(_ah, _gpio, _ilevel) -#define ath_hal_getpowerlimits(_ah, _chans, _nchan) \ - AH_PRIVATE(_ah)->ah_getChipPowerLimits(_ah, _chans, _nchan) +#define ath_hal_getpowerlimits(_ah, _chan) \ + AH_PRIVATE(_ah)->ah_getChipPowerLimits(_ah, _chan) #define ath_hal_getNfAdjust(_ah, _c) \ AH_PRIVATE(_ah)->ah_getNfAdjust(_ah, _c) #define ath_hal_getNoiseFloor(_ah, _nfArray) \ @@ -327,38 +342,22 @@ #define ath_hal_eepromDiag(_ah, _request, _a, _asize, _r, _rsize) \ AH_PRIVATE(_ah)->ah_eepromDiag(_ah, _request, _a, _asize, _r, _rsize) -#if !defined(_NET_IF_IEEE80211_H_) && !defined(_NET80211__IEEE80211_H_) +#ifndef _NET_IF_IEEE80211_H_ /* * Stuff that would naturally come from _ieee80211.h */ #define IEEE80211_ADDR_LEN 6 -#define IEEE80211_WEP_KEYLEN 5 /* 40bit */ #define IEEE80211_WEP_IVLEN 3 /* 24bit */ #define IEEE80211_WEP_KIDLEN 1 /* 1 octet */ #define IEEE80211_WEP_CRCLEN 4 /* CRC-32 */ #define IEEE80211_CRC_LEN 4 -#define IEEE80211_MTU 1500 #define IEEE80211_MAX_LEN (2300 + IEEE80211_CRC_LEN + \ (IEEE80211_WEP_IVLEN + IEEE80211_WEP_KIDLEN + IEEE80211_WEP_CRCLEN)) - -enum { - IEEE80211_T_DS, /* direct sequence spread spectrum */ - IEEE80211_T_FH, /* frequency hopping */ - IEEE80211_T_OFDM, /* frequency division multiplexing */ - IEEE80211_T_TURBO, /* high rate DS */ - IEEE80211_T_HT, /* HT - full GI */ -}; -#define IEEE80211_T_CCK IEEE80211_T_DS /* more common nomenclatur */ #endif /* _NET_IF_IEEE80211_H_ */ -/* NB: these are defined privately until XR support is announced */ -enum { - ATHEROS_T_XR = IEEE80211_T_HT+1, /* extended range */ -}; - #define HAL_TXQ_USE_LOCKOUT_BKOFF_DIS 0x00000001 #define INIT_AIFS 2 @@ -411,43 +410,11 @@ #define HAL_BIN_WIDTH_TURBO_100HZ 6250 #define HAL_MAX_BINS_ALLOWED 28 -/* - * A = 5GHZ|OFDM - * T = 5GHZ|OFDM|TURBO - * - * IS_CHAN_A(T) will return TRUE. This is probably - * not the default behavior we want. We should migrate to a better mask -- - * perhaps CHANNEL_ALL. - * - * For now, IS_CHAN_G() masks itself with CHANNEL_108G. - * - */ +#define IS_CHAN_5GHZ(_c) ((_c)->channel > 4900) +#define IS_CHAN_2GHZ(_c) (!IS_CHAN_5GHZ(_c)) -#define IS_CHAN_A(_c) (((_c)->channelFlags & CHANNEL_A) == CHANNEL_A) -#define IS_CHAN_B(_c) (((_c)->channelFlags & CHANNEL_B) == CHANNEL_B) -#define IS_CHAN_G(_c) (((_c)->channelFlags & (CHANNEL_108G|CHANNEL_G)) == CHANNEL_G) -#define IS_CHAN_108G(_c)(((_c)->channelFlags & CHANNEL_108G) == CHANNEL_108G) -#define IS_CHAN_T(_c) (((_c)->channelFlags & CHANNEL_T) == CHANNEL_T) -#define IS_CHAN_PUREG(_c) \ - (((_c)->channelFlags & CHANNEL_PUREG) == CHANNEL_PUREG) - -#define IS_CHAN_TURBO(_c) (((_c)->channelFlags & CHANNEL_TURBO) != 0) -#define IS_CHAN_CCK(_c) (((_c)->channelFlags & CHANNEL_CCK) != 0) -#define IS_CHAN_OFDM(_c) (((_c)->channelFlags & CHANNEL_OFDM) != 0) -#define IS_CHAN_5GHZ(_c) (((_c)->channelFlags & CHANNEL_5GHZ) != 0) -#define IS_CHAN_2GHZ(_c) (((_c)->channelFlags & CHANNEL_2GHZ) != 0) -#define IS_CHAN_PASSIVE(_c) (((_c)->channelFlags & CHANNEL_PASSIVE) != 0) -#define IS_CHAN_HALF_RATE(_c) (((_c)->channelFlags & CHANNEL_HALF) != 0) -#define IS_CHAN_QUARTER_RATE(_c) (((_c)->channelFlags & CHANNEL_QUARTER) != 0) - >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 29 20:49:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13397106566C; Thu, 29 Jan 2009 20:49: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 C66A5106566B for ; Thu, 29 Jan 2009 20:49:07 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AA1188FC1C for ; Thu, 29 Jan 2009 20:49:07 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0TKn7sw043551 for ; Thu, 29 Jan 2009 20:49:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0TKn7Zf043549 for perforce@freebsd.org; Thu, 29 Jan 2009 20:49:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 29 Jan 2009 20:49:07 GMT Message-Id: <200901292049.n0TKn7Zf043549@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156886 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 Jan 2009 20:49:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=156886 Change 156886 by rwatson@rwatson_freebsd_capabilities on 2009/01/29 20:48:59 In capability mode system call test: - Use pdfork(2) instead of fork(2) since we have it. - Expect fork(2) not to succeed - Expect getlogin(2) to succeed Affected files ... .. //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_syscalls.c#3 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_syscalls.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 Robert N. M. Watson + * Copyright (c) 2008-2009 Robert N. M. Watson * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -31,12 +31,14 @@ */ #include -__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_syscalls.c#2 $"); +__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_syscalls.c#3 $"); -#include +#include #include #include #include +#include +#include #include #include #include @@ -45,6 +47,7 @@ #include #include #include +#include #include #include "cap_test.h" @@ -53,17 +56,24 @@ test_syscalls(void) { struct statfs statfs; + struct pollfd pollfd; struct stat sb; ssize_t len; - int fd, fd_close, fd_dir, fd_file, fd_socket, fd2[2], ret; + int fd, fd_close, fd_dir, fd_file, fd_socket, fd2[2], pdfd, ret; pid_t pid, wpid; char ch; - pid = fork(); + pid = pdfork(&pdfd); if (pid < 0) err(-1, "test_syscalls:prep: fork"); if (pid) { - while (waitpid(pid, NULL, 0) != pid); + bzero(&pollfd, sizeof(pollfd)); + pollfd.fd = pdfd; + pollfd.events = 0; + pollfd.revents = 0; + if (poll(&pollfd, 1, INFTIM) < 0) + err(-1, "poll"); + close(pdfd); return; } @@ -180,12 +190,8 @@ * Not much to be done except print... */ exit(0); - if (errno == ENOSYS) - errx(-1, "test_syscalls:exit ENOSYS"); - else - errx(-1, "test_syscalls:exit %d", errno); - } - if (pid > 0) { + } else if (pid > 0) { + warnx("test_syscalls:fork succeeded"); wpid = waitpid(pid, NULL, 0); if (wpid < 0) { if (errno == ENOSYS) @@ -195,9 +201,7 @@ errno); } } - } else if (errno == ENOSYS) - warnx("test_syscalls:fork ENOSYS"); - else + } else if (errno != ENOSYS) warnx("test_syscalls:fork %d", errno); if (fstat(fd_file, &sb) < 0) { @@ -240,11 +244,8 @@ warnx("test_syscalls:getpeername ENOSYS"); } - if (getlogin() == NULL) { - if (errno != ENOSYS) - warnx("test_sycalls:getlogin ENOSYS"); - } else - warnx("test_syscalls:getlogin succeeded"); + if (getlogin() == NULL) + warn("test_sycalls:getlogin %d", errno); /* * getpid() can't return an error but check for it anyway. @@ -400,5 +401,6 @@ if (len < 0 && errno == ENOSYS) warnx("test_syscalls:write ENOSYS"); + close(pdfd); exit(0); } From owner-p4-projects@FreeBSD.ORG Thu Jan 29 21:11:31 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D26A210656BB; Thu, 29 Jan 2009 21:11: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 81BD31065695 for ; Thu, 29 Jan 2009 21:11:30 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6E2608FC1E for ; Thu, 29 Jan 2009 21:11:30 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0TLBUCf046184 for ; Thu, 29 Jan 2009 21:11:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0TLBUaa046182 for perforce@freebsd.org; Thu, 29 Jan 2009 21:11:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 29 Jan 2009 21:11:30 GMT Message-Id: <200901292111.n0TLBUaa046182@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156887 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 Jan 2009 21:11:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=156887 Change 156887 by rwatson@rwatson_freebsd_capabilities on 2009/01/29 21:10:55 Test pdfork, pdgetpid, pdkill in capability mode. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_syscalls.c#4 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_syscalls.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_syscalls.c#3 $"); +__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_syscalls.c#4 $"); #include #include @@ -186,9 +186,6 @@ pid = fork(); if (pid >= 0) { if (pid == 0) { - /* - * Not much to be done except print... - */ exit(0); } else if (pid > 0) { warnx("test_syscalls:fork succeeded"); @@ -324,6 +321,23 @@ close(fd); } + pid = pdfork(&fd); + if (pid < 0) + warn("test_syscalls:pdfork %d", errno); + else if (pid == 0) { + sleep(1); + exit(0); + } else { + if (pdgetpid(fd, &wpid) == 0) { + if (pid != wpid) + warnx("test_syscalls:pdgetpid wrong pid"); + } else + warn("test_syscalls:pdgetpid %d", errno); + if (pdkill(fd, 0) < 0) + warn("test_syscalls:pdkill %d", errno); + close(fd); + } + if (pipe(fd2) == 0) { close(fd2[0]); close(fd2[1]); From owner-p4-projects@FreeBSD.ORG Thu Jan 29 23:22:56 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B345106567A; Thu, 29 Jan 2009 23:22: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 DBDC0106566C for ; Thu, 29 Jan 2009 23:22:55 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C6E348FC16 for ; Thu, 29 Jan 2009 23:22:55 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0TNMtDC060732 for ; Thu, 29 Jan 2009 23:22:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0TNMtSZ060730 for perforce@freebsd.org; Thu, 29 Jan 2009 23:22:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 29 Jan 2009 23:22:55 GMT Message-Id: <200901292322.n0TNMtSZ060730@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156891 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 Jan 2009 23:22:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=156891 Change 156891 by rwatson@rwatson_freebsd_capabilities on 2009/01/29 23:22:21 Add cap_fextract_mmap() and fget_mmap(), which unlike the normal versions of these calls, returns a maximum set of mapping-related capability rights rather than just checking the passed set. This is merged with maxprot, retained in each mapping to use in validating requests to expand rights on a mapping using mprotect(). A new capability right, CAP_MAPEXEC, is added; the MAP prefix is to more clearly differentiate this from general execution rights on binaries represented by capabilities. None of this resolves i386's confusion between read and execute rights. With these change, mmap() tests in the capability regression suite are now passed. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_descrip.c#18 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#22 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#22 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/file.h#12 edit .. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_mmap.c#7 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_descrip.c#18 (text+ko) ==== @@ -2088,7 +2088,7 @@ #define FGET_GETCAP 0x00000002 static __inline int _fget(struct thread *td, int fd, struct file **fpp, int flags, - cap_rights_t rights, int fget_flags) + cap_rights_t rights, u_char *maxprotp, int fget_flags) { struct filedesc *fdp; struct file *fp; @@ -2122,7 +2122,10 @@ * capability and find the underlying object. From now on * 'fp' refers to the actual object of interest. */ - error = cap_fextract(fp, rights, &fp); + if (maxprotp != NULL) + error = cap_fextract_mmap(fp, rights, maxprotp, &fp); + else + error = cap_fextract(fp, rights, &fp); if (error) { FILEDESC_SUNLOCK(fdp); return (error); @@ -2154,21 +2157,29 @@ fget(struct thread *td, int fd, cap_rights_t rights, struct file **fpp) { - return(_fget(td, fd, fpp, 0, rights, FGET_HOLD)); + return(_fget(td, fd, fpp, 0, rights, NULL, FGET_HOLD)); +} + +int +fget_mmap(struct thread *td, int fd, cap_rights_t rights, u_char *maxprotp, + struct file **fpp) +{ + + return (_fget(td, fd, fpp, 0, rights, maxprotp, FGET_HOLD)); } int fget_read(struct thread *td, int fd, cap_rights_t rights, struct file **fpp) { - return(_fget(td, fd, fpp, FREAD, rights, FGET_HOLD)); + return(_fget(td, fd, fpp, FREAD, rights, NULL, FGET_HOLD)); } int fget_write(struct thread *td, int fd, cap_rights_t rights, struct file **fpp) { - return(_fget(td, fd, fpp, FWRITE, rights, FGET_HOLD)); + return(_fget(td, fd, fpp, FWRITE, rights, NULL, FGET_HOLD)); } /* @@ -2180,7 +2191,7 @@ fgetcap(struct thread *td, int fd, struct file **fpp) { - return (_fget(td, fd, fpp, 0, 0, FGET_GETCAP | FGET_HOLD)); + return (_fget(td, fd, fpp, 0, 0, NULL, FGET_GETCAP | FGET_HOLD)); } /* @@ -2198,7 +2209,7 @@ int error; *vpp = NULL; - if ((error = _fget(td, fd, &fp, flags, rights, 0)) != 0) + if ((error = _fget(td, fd, &fp, flags, rights, NULL, 0)) != 0) return (error); if (fp->f_vnode == NULL) { error = EINVAL; @@ -2256,7 +2267,7 @@ *spp = NULL; if (fflagp != NULL) *fflagp = 0; - if ((error = _fget(td, fd, &fp, 0, rights, 0)) != 0) + if ((error = _fget(td, fd, &fp, 0, rights, NULL, 0)) != 0) return (error); if (fp->f_type != DTYPE_SOCKET) { error = ENOTSOCK; ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#22 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 Robert N. M. Watson + * Copyright (c) 2008-2009 Robert N. M. Watson * All rights reserved. * * WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED @@ -50,7 +50,7 @@ #include "opt_capabilities.h" #include -__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#21 $"); +__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#22 $"); #include #include @@ -68,6 +68,7 @@ #include #include +#include #ifdef CAPABILITIES @@ -184,6 +185,40 @@ } /* + * Slightly different routine for memory mapping file descriptors: unwrap the + * capability and check CAP_MMAP, but also return a bitmask representing the + * maximum mapping rights the capability allows on the object. + */ +int +cap_fextract_mmap(struct file *fp_cap, cap_rights_t rights, u_char *maxprotp, + struct file **fpp) +{ + struct capability *c; + u_char maxprot; + int error; + + if (fp_cap->f_type != DTYPE_CAPABILITY) { + *fpp = fp_cap; + *maxprotp = VM_PROT_ALL; + return (0); + } + c = fp_cap->f_data; + error = cap_check(c, rights); + if (error) + return (error); + *fpp = c->cap_object; + maxprot = 0; + if (c->cap_rights & CAP_READ) + maxprot |= VM_PROT_READ; + if (c->cap_rights & CAP_WRITE) + maxprot |= VM_PROT_WRITE; + if (c->cap_rights & CAP_MAPEXEC) + maxprot |= VM_PROT_EXECUTE; + *maxprotp = maxprot; + return (0); +} + +/* * Extract rights from a capability for monitoring purposes -- not for use in * any other way, as we want to keep all capability permission evaluation in * this one file. @@ -446,6 +481,18 @@ } int +cap_fextract_mmap(struct file *fp_cap, u_char *maxprotp, struct file **fpp) +{ + + KASSERT(fp_cap->f_type != DTYPE_CAPABILITY, + ("cap_fextract_mmap: saw capability")); + + *fpp = fp_cap; + *maxprotp = VM_PROT_ALL; + return (0: +} + +int cap_enter(struct thread *td, struct cap_enter_args *uap) { ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#22 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#21 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#22 $ */ /* @@ -91,7 +91,8 @@ #define CAP_PDGETPID 0x0000100000000000ULL /* pdgetpid(2) */ #define CAP_PDWAIT 0x0000200000000000ULL /* pdwait(2) */ #define CAP_PDKILL 0x0000400000000000ULL /* pdkill(2) */ -#define CAP_MASK_VALID 0x00003fffffffffffULL +#define CAP_MAPEXEC 0x0000800000000000ULL /* mmap(2) as exec */ +#define CAP_MASK_VALID 0x0000ffffffffffffULL /* * Notes: @@ -142,6 +143,8 @@ */ int cap_fextract(struct file *fp_cap, cap_rights_t rights, struct file **fpp); +int cap_fextract_mmap(struct file *fp_cap, cap_rights_t rights, + u_char *maxprotp, struct file **fpp); /* * For the purposes of procstat(1) and similar tools, allow kern_descrip.c to ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/file.h#12 (text+ko) ==== @@ -180,6 +180,8 @@ extern volatile int openfiles; /* actual number of open files */ int fget(struct thread *td, int fd, cap_rights_t rights, struct file **fpp); +int fget_mmap(struct thread *td, int fd, cap_rights_t rights, + u_char *maxprotp, struct file **fpp); int fget_read(struct thread *td, int fd, cap_rights_t rights, struct file **fpp); int fget_write(struct thread *td, int fd, cap_rights_t rights, ==== //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_mmap.c#7 (text+ko) ==== @@ -216,12 +216,13 @@ struct vnode *vp; vm_offset_t addr; vm_size_t size, pageoff; - vm_prot_t prot, maxprot; + vm_prot_t cap_maxprot, prot, maxprot; void *handle; objtype_t handle_type; int flags, error; off_t pos; struct vmspace *vms = td->td_proc->p_vmspace; + cap_rights_t rights; addr = (vm_offset_t) uap->addr; size = uap->len; @@ -297,17 +298,25 @@ */ handle = NULL; handle_type = OBJT_DEFAULT; + cap_maxprot = VM_PROT_ALL; maxprot = VM_PROT_ALL; pos = 0; } else { /* - * Mapping file, get fp for validation and - * don't let the descriptor disappear on us if we block. - * - * XXXRW: should extract capability rights and incorporate - * them into maxprot, just file flags. + * Mapping file, get fp for validation and don't let the + * descriptor disappear on us if we block. Check capability + * rights, but also return the maximum rights to be combined + * with maxprot later. */ - if ((error = fget(td, uap->fd, CAP_MMAP, &fp)) != 0) + rights = CAP_MMAP; + if (prot & PROT_READ) + rights |= CAP_READ; + if (prot & PROT_WRITE) + rights |= CAP_WRITE; + if (prot & PROT_EXEC) + rights |= CAP_MAPEXEC; + if ((error = fget_mmap(td, uap->fd, rights, &cap_maxprot, + &fp)) != 0) goto done; if (fp->f_type == DTYPE_SHM) { handle = fp->f_data; @@ -374,6 +383,7 @@ } } else if (vp->v_type != VCHR || (fp->f_flag & FWRITE) != 0) { maxprot |= VM_PROT_WRITE; + cap_maxprot |= VM_PROT_WRITE; } handle = (void *)vp; handle_type = OBJT_VNODE; @@ -392,6 +402,7 @@ } td->td_fpop = fp; + maxprot &= cap_maxprot; error = vm_mmap(&vms->vm_map, &addr, size, prot, maxprot, flags, handle_type, handle, pos); td->td_fpop = NULL; From owner-p4-projects@FreeBSD.ORG Thu Jan 29 23:22:57 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A6B9F10657E0; Thu, 29 Jan 2009 23:22: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 083691065670 for ; Thu, 29 Jan 2009 23:22:56 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E8BDB8FC17 for ; Thu, 29 Jan 2009 23:22:55 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0TNMtfp060737 for ; Thu, 29 Jan 2009 23:22:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0TNMtgL060735 for perforce@freebsd.org; Thu, 29 Jan 2009 23:22:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 29 Jan 2009 23:22:55 GMT Message-Id: <200901292322.n0TNMtgL060735@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156892 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 Jan 2009 23:22:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=156892 Change 156892 by rwatson@rwatson_freebsd_capabilities on 2009/01/29 23:22:42 Update TODO. Affected files ... .. //depot/projects/trustedbsd/capabilities/TODO#11 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/TODO#11 (text+ko) ==== @@ -19,6 +19,10 @@ context. Consider carefully the implications on creating binaries, ELF, etc. +- Implement libcapability, a lightweight framework for starting code in a + capability mode sandbox using fexecve(2), etc, and providing a simple + local procedure call interface to compartmentalized services. + - ... bigger and better things ... Low-level TODO list: @@ -41,7 +45,6 @@ - Refine access control on sysctl infrastructure sysctls, such as name lookup, etc. -- mmap(2) needs to look at capability masks, not just file flags to determine - maxprot. +- MAC control of capability facility. -- MAC control of capability facility. +- Implement pdwait4(). From owner-p4-projects@FreeBSD.ORG Thu Jan 29 23:30:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B71841065675; Thu, 29 Jan 2009 23:30:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 590F81065673 for ; Thu, 29 Jan 2009 23:30:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 44CCB8FC22 for ; Thu, 29 Jan 2009 23:30:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0TNU3Qj061314 for ; Thu, 29 Jan 2009 23:30:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0TNU3bZ061312 for perforce@freebsd.org; Thu, 29 Jan 2009 23:30:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 29 Jan 2009 23:30:03 GMT Message-Id: <200901292330.n0TNU3bZ061312@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156893 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 Jan 2009 23:30:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=156893 Change 156893 by rwatson@rwatson_freebsd_capabilities on 2009/01/29 23:30:00 Test CAP_MAPEXEC with PROT_EXEC in mmap/capability regression test. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_capabilities.c#3 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_capabilities.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 Robert N. M. Watson + * Copyright (c) 2008-2009 Robert N. M. Watson * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,9 +30,9 @@ */ #include -__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_capabilities.c#2 $"); +__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_capabilities.c#3 $"); -#include +#include #include #include #include @@ -181,6 +181,20 @@ } } + p = mmap(NULL, getpagesize(), PROT_EXEC, MAP_SHARED, fd_cap, 0); + if ((rights & (CAP_MMAP | CAP_MAPEXEC)) == (CAP_MMAP | CAP_MAPEXEC)) { + if (p == MAP_FAILED) + warnx("rights 0x%llx mmap mapexec failed error %d", + rights, errno); + else + (void)munmap(p, getpagesize()); + } else { + if (p != MAP_FAILED) { + warnx("rights 0x%llx mmap mapexec succeeded", rights); + (void)munmap(p, getpagesize()); + } + } + p = mmap(NULL, getpagesize(), PROT_READ | PROT_WRITE, MAP_SHARED, fd_cap, 0); if ((rights & (CAP_MMAP | CAP_READ | CAP_WRITE)) == (CAP_MMAP | @@ -198,6 +212,57 @@ } } + p = mmap(NULL, getpagesize(), PROT_READ | PROT_EXEC, MAP_SHARED, + fd_cap, 0); + if ((rights & (CAP_MMAP | CAP_READ | CAP_MAPEXEC)) == (CAP_MMAP | + CAP_READ | CAP_MAPEXEC)) { + if (p == MAP_FAILED) + warnx("rights 0x%llx mmap read|mapexec failed error %d", + rights, errno); + else + (void)munmap(p, getpagesize()); + } else { + if (p != MAP_FAILED) { + warnx("rights 0x%llx mmap read|mapexec succeeded", + rights); + (void)munmap(p, getpagesize()); + } + } + + p = mmap(NULL, getpagesize(), PROT_EXEC | PROT_WRITE, MAP_SHARED, + fd_cap, 0); + if ((rights & (CAP_MMAP | CAP_MAPEXEC | CAP_WRITE)) == (CAP_MMAP | + CAP_MAPEXEC | CAP_WRITE)) { + if (p == MAP_FAILED) + warnx("rights 0x%llx mmap mapexec|write failed " + "error %d", rights, errno); + else + (void)munmap(p, getpagesize()); + } else { + if (p != MAP_FAILED) { + warnx("rights 0x%llx mmap mapexec|write succeeded", + rights); + (void)munmap(p, getpagesize()); + } + } + + p = mmap(NULL, getpagesize(), PROT_READ | PROT_WRITE | PROT_EXEC, + MAP_SHARED, fd_cap, 0); + if ((rights & (CAP_MMAP | CAP_READ | CAP_WRITE | CAP_MAPEXEC)) == + (CAP_MMAP | CAP_READ | CAP_WRITE | CAP_MAPEXEC)) { + if (p == MAP_FAILED) + warnx("rights 0x%llx mmap read|write|mapexec failed " + "error %d", rights, errno); + else + (void)munmap(p, getpagesize()); + } else { + if (p != MAP_FAILED) { + warnx("rights 0x%llx mmap read|write|mapexec " + "succeeded", rights); + (void)munmap(p, getpagesize()); + } + } + /* XXX fcntl */ /* XXX select / poll / kqueue */ @@ -316,7 +381,11 @@ try_file_ops(fd, CAP_MMAP); try_file_ops(fd, CAP_MMAP | CAP_READ); try_file_ops(fd, CAP_MMAP | CAP_WRITE); + try_file_ops(fd, CAP_MMAP | CAP_MAPEXEC); try_file_ops(fd, CAP_MMAP | CAP_READ | CAP_WRITE); + try_file_ops(fd, CAP_MMAP | CAP_READ | CAP_MAPEXEC); + try_file_ops(fd, CAP_MMAP | CAP_MAPEXEC | CAP_WRITE); + try_file_ops(fd, CAP_MMAP | CAP_READ | CAP_WRITE | CAP_MAPEXEC); try_file_ops(fd, CAP_FCNTL); try_file_ops(fd, CAP_EVENT); try_file_ops(fd, CAP_FSYNC); From owner-p4-projects@FreeBSD.ORG Thu Jan 29 23:34:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07E931065674; Thu, 29 Jan 2009 23:34: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 B18DC1065672 for ; Thu, 29 Jan 2009 23:34:07 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 835898FC17 for ; Thu, 29 Jan 2009 23:34:07 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0TNY76d061680 for ; Thu, 29 Jan 2009 23:34:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0TNY7KS061678 for perforce@freebsd.org; Thu, 29 Jan 2009 23:34:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 29 Jan 2009 23:34:07 GMT Message-Id: <200901292334.n0TNY7KS061678@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156894 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 Jan 2009 23:34:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=156894 Change 156894 by rwatson@rwatson_freebsd_capabilities on 2009/01/29 23:33:34 Build capability kernel with DTrace by default, too useful for debugging to exclude. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/i386/conf/CAPABILITIES#3 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/i386/conf/CAPABILITIES#3 (text+ko) ==== @@ -1,3 +1,4 @@ include GENERIC options CAPABILITIES options PROCDESC +options KDTRACE_HOOKS From owner-p4-projects@FreeBSD.ORG Thu Jan 29 23:35:09 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 26CDB1065673; Thu, 29 Jan 2009 23:35: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 DA8BF106564A for ; Thu, 29 Jan 2009 23:35:08 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AC7C28FC08 for ; Thu, 29 Jan 2009 23:35:08 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0TNZ8tX061780 for ; Thu, 29 Jan 2009 23:35:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0TNZ8t4061778 for perforce@freebsd.org; Thu, 29 Jan 2009 23:35:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 29 Jan 2009 23:35:08 GMT Message-Id: <200901292335.n0TNZ8t4061778@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156895 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 Jan 2009 23:35:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=156895 Change 156895 by rwatson@rwatson_freebsd_capabilities on 2009/01/29 23:34:38 Checkpoint chicken scratchings. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcap_consumer.c#1 add .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.h#3 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.h#3 (text+ko) ==== @@ -30,10 +30,71 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.h#2 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.h#3 $ */ #ifndef _LIBCAPABILITY_H_ #define _LIBCAPABILITY_H_ +/* + * libcapability operation types are negative; positive request types are + * reserved for application use. + */ +#define LIBCAP_REQ_SHUTDOWN -1 + +struct lc_consumer { + void *lc_private; /* Private data. */ +}; + +struct lc_producer { + void *lp_private; /* Private data. */ +}; + +/* + * Version of the header seen on the wire. + */ +struct lc_wire_message { + uint32_t lwm_magic; /* Magic number. */ + uint32_t lwm_hdrlen; /* Length of this header. */ + uint64_t lwm_opseqnum; /* Unique ID of request. */ + int64_t lwm_optype; /* Operation type to perform. */ + uint64_t lwm_flags; /* Flags. */ + uint64_t lwm_immlen; /* Immediates length. */ + uint64_t lwm_datalen; /* Data length. */ +}; + +/* + * Version of the header exposed to applications. + */ +struct lc_message { + uint64_t lm_opseqnum; /* Unique ID of request. */ + int64_t lm_optype; /* Operation type to perform. */ + uint64_t lm_flags; /* Flags. */ + uint64_t lm_immlen; /* Immediates length. */ + uint64_t lm_datalen; /* Data length. */ + u_char *lm_immp; /* Immediates pointer. */ + u_char *l_datap; /* Data pointer. */ +}; + +/* + * Allow a libcapability "consumer" to initialize its consumer state. + */ +void lc_consumer_destroy(struct lc_consumer *lccp); +struct lc_consumer *lc_consumer_new(const char *service_name, + const char *library_name); +int lc_consumer_start(struct lc_consumer *lccp); + +/* + * Allow a libcapability "producer" to initialize its producer state. A + * service name is passed, and will be validated. + */ +struct lc_producer *lc_producer_register(const char *service_name); +void lc_producer_destroy(struct lc_producer *lcpp); + +struct lc_message *lc_producer_recvmessage(struct lc_producer *lcpp); +struct lc_message *lc_producer_allocmessage(struct lc_producer *lcpp); +void lc_producer_freemessage(struct lc_producer *lcpp, + struct lc_message *lmp); +int lc_producer_sendmessage(struct lc_producer *lcpp); + #endif /* !_LIBCAPABILITY_H_ */ From owner-p4-projects@FreeBSD.ORG Thu Jan 29 23:48:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D8A29106566C; Thu, 29 Jan 2009 23:48: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 96185106564A for ; Thu, 29 Jan 2009 23:48:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 680358FC12 for ; Thu, 29 Jan 2009 23:48:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0TNmMrS062762 for ; Thu, 29 Jan 2009 23:48:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0TNmM5b062760 for perforce@freebsd.org; Thu, 29 Jan 2009 23:48:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 29 Jan 2009 23:48:22 GMT Message-Id: <200901292348.n0TNmM5b062760@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156897 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 Jan 2009 23:48:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=156897 Change 156897 by rwatson@rwatson_freebsd_capabilities on 2009/01/29 23:47:52 More TODO. Affected files ... .. //depot/projects/trustedbsd/capabilities/TODO#12 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/TODO#12 (text+ko) ==== @@ -48,3 +48,6 @@ - MAC control of capability facility. - Implement pdwait4(). + +- Enable capability mode system calls in compat32. Add compat system call + parts for new system calls. From owner-p4-projects@FreeBSD.ORG Fri Jan 30 10:24:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60BA61065676; Fri, 30 Jan 2009 10:24: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 1EC8B1065670 for ; Fri, 30 Jan 2009 10:24:17 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 09D598FC0C for ; Fri, 30 Jan 2009 10:24:17 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0UAOHbU054529 for ; Fri, 30 Jan 2009 10:24:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0UAOFeN054527 for perforce@freebsd.org; Fri, 30 Jan 2009 10:24:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 30 Jan 2009 10:24:15 GMT Message-Id: <200901301024.n0UAOFeN054527@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156904 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Jan 2009 10:24:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=156904 Change 156904 by rwatson@rwatson_freebsd_capabilities on 2009/01/30 10:24:04 Integrate TrustedBSD Capabilities branch. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/Makefile.inc1#6 integrate .. //depot/projects/trustedbsd/capabilities/src/ObsoleteFiles.inc#6 integrate .. //depot/projects/trustedbsd/capabilities/src/UPDATING#6 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/chmod/chmod.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/dd/dd.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/README#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/g_Qfmt.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/g__fmt.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/g_ddfmt.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/g_dfmt.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/g_ffmt.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/g_xLfmt.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/g_xfmt.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/gdtoa.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/gdtoa.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/gdtoa_fltrnds.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/gdtoaimp.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/gethex.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/smisc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/strtod.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/strtodg.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/strtof.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/strtopQ.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/strtopd.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/strtopdd.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/strtopf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/strtopx.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/strtopxL.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/README#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/getround.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/obad/strtodt.out#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/obad/xL.out#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/xsum0.out#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/xsum0.out#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/smbfs/mount_smbfs/mount_smbfs.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/smbfs/mount_smbfs/mount_smbfs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/ChangeLog#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/base64.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/ctrl_iface.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/ctrl_iface_dbus.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/ctrl_iface_unix.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/dbus_dict_helpers.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/doc/docbook/wpa_background.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/driver_ndis.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/eap.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/eap_aka.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/eap_gpsk.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/eap_gpsk_common.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/eap_ttls.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/eloop.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/eloop.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/eloop_none.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/mlme.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/os_unix.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/preauth_test.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/radius.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/sha1.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/tls_openssl.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/version.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/wpa.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/wpa.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/wpa_cli.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.cpp#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/wpa_i.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa_supplicant/wpa_supplicant.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/defaults/rc.conf#6 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/devd.conf#5 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/devd/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/jail#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/ntpd#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.shutdown#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/regdomain.xml#3 integrate .. //depot/projects/trustedbsd/capabilities/src/include/paths.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_write_disk.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/Makefile#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_write_disk_failures.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_write_disk_secure.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_write_disk_sparse.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/sysctl.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/mbstowcs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/wcsftime.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/wcstombs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/ferror.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/fputws.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/printf.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/printfcommon.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/vfprintf.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/vfscanf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/vfwprintf.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/vfwscanf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/vswscanf.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/string/strlen.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/libpmc.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/comsat/comsat.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/dumpfs/dumpfs.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/dumpfs/dumpfs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/fdisk/fdisk.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/fsck_ffs/fsck.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/fsck_ffs/fsck_ffs.8#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/fsck_ffs/fsutil.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/fsck_ffs/main.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ifconfig/ifconfig.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ifconfig/ifieee80211.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ipfw/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ipfw/dummynet.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sbin/ipfw/ipfw2.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ipfw/ipfw2.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sbin/ipfw/ipv6.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sbin/ipfw/main.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sbin/ipfw/nat.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sbin/mount_nfs/mount_nfs.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mount_ntfs/mount_ntfs.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/recoverdisk/recoverdisk.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/restore/interactive.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/route/route.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/Makefile#7 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/bce.4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/bge.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/gem.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/hme.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/iic.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/man4.powerpc/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/man4.powerpc/snd_ai2s.4#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/man4.powerpc/snd_davbus.4#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/nge.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/sdhci.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/sk.4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/urtw.4#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/man/man5/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man5/portindex.5#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/man/man5/rc.conf.5#6 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man7/build.7#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man7/ports.7#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man7/tuning.7#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/kthread.9#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/asia#5 integrate .. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/backward#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/europe#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/leapseconds#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/northamerica#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/zone.tab#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/cpu_switch.S#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/exception.S#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/fpu.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/identcpu.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/local_apic.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/msi.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/apicvar.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/fpu.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/intr_machdep.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/at91/at91.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/at91/at91_mci.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/at91/at91_twi.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/at91/at91_twireg.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/at91/at91var.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/at91/uart_bus_at91usart.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/at91/uart_dev_at91usart.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/xscale/i8134x/i81342_mcu.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_periph.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_stats.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_types.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/NOTES#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/files.amd64#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/files.i386#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/files.pc98#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/files.powerpc#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/kern.pre.mk#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/kmod.mk#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/newvers.sh#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/options#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/altq/altq/altq_subr.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/pf/net/pf_ioctl.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/adb/adb_mouse.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/agp/agp_via.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ah.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ah.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ah_internal.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ah_regdomain.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5210/ar5210.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5211/ar5211.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5212/ar2316.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5212/ar2317.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5212/ar2413.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5212/ar2425.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5212/ar5111.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5212/ar5112.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5212/ar5212.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5212/ar5413.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5312/ar5312.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5416/ar2133.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/if_athvar.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/bce/if_bce.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/digi/con.CX-IBM.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/digi/con.CX.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/digi/con.EPCX.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/digi/con.MBank.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/hwpmc/hwpmc_core.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/hwpmc/hwpmc_intel.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/hwpmc/pmc_events.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/iicbus/iic.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/iicbus/iic.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/iicbus/iicbus.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/mmc/mmc.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/msk/if_msk.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/msk/if_mskreg.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ofw/ofw_iicbus.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/pci/pci.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppbus/if_plip.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppbus/immio.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppbus/lpbb.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppbus/lpt.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppbus/pcfclock.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppbus/ppb_1284.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppbus/ppb_base.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppbus/ppb_msq.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppbus/ppbconf.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppbus/ppbconf.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppbus/ppi.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppbus/pps.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppbus/vpo.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppbus/vpoio.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppc/ppc.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppc/ppc_acpi.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppc/ppc_isa.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppc/ppc_pci.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppc/ppc_puc.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppc/ppcreg.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppc/ppcvar.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/puc/pucdata.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/re/if_re.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sdhci/sdhci.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/aoa.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/aoa.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/davbus.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/davbusreg.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/i2s.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/snapper.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/tumbler.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/speaker/spkr.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/sequences#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/teken.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/teken.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/teken_demo.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/teken_scs.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/teken_subr.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/teken_subr_compat.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/ehci.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/if_urtw.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/if_urtwreg.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/if_urtwvar.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/u3g.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/uftdi.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usbdi.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/bluetooth/ng_ubt2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/bluetooth/ng_ubt2_var.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/uhci2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/controller/usb2_controller.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/core/usb2_hub.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_aue2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_auereg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_axe2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_axereg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_cdce2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_cdcereg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_cue2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_cuereg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_kue2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_kuereg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_rue2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_ruereg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_udav2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/ethernet/if_udavreg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/image/uscanner2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/include/usb2_devid.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/include/usb2_devtable.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/include/usb2_ioctl.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/input/uhid2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/input/ukbd2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/input/ums2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/quirk/usb2_quirk.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/u3g2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/uark2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/ubsa2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/ubser2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/uchcom2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/ucycom2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/ufoma2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/uftdi2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/ugensa2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/uipaq2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/ulpt2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/umct2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/umoscom2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/uplcom2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/uvisor2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/serial/uvscom2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/storage/umass2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/wlan/if_rum2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/wlan/if_rumvar.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/wlan/if_ural2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/wlan/if_uralvar.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/wlan/if_zyd2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb2/wlan/if_zydreg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/xen/blkback/blkback.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/cd9660/cd9660_lookup.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/cd9660/cd9660_node.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/cd9660/cd9660_node.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/cd9660/cd9660_rrip.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/cd9660/cd9660_vfsops.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/cd9660/cd9660_vnops.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/devfs/devfs_devs.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/fifofs/fifo_vnops.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/geom/geom_dev.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/gnu/fs/ext2fs/ext2_fs.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/gnu/fs/ext2fs/ext2_fs_sb.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/gnu/fs/ext2fs/ext2_inode.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/cpufreq/smist.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/io_apic.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/local_apic.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/mp_machdep.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/msi.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/apicvar.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/intr_machdep.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/imgact_elf.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_clock.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_jail.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_malloc.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_mib.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_proc.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_synch.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_sysctl.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_timeout.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sched_4bsd.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sched_ule.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_pcpu.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_smp.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_witness.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_generic.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sysv_sem.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/tty.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/tty_info.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/tty_pty.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_mbuf.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_aio.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_cache.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vnode_if.src#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/mips/idt/idtpci.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/mips/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/mips/malta/gt_pci.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/mips/mips/busdma_machdep.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/mips/mips/cpu.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/mips/mips/machdep.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/mips/mips/nexus.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/mips/mips/pmap.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/Makefile#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/agp/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/sound/driver/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/sound/driver/ai2s/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/modules/sound/driver/davbus/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/modules/urtw/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/modules/usb2/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/rtsock.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/_ieee80211.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_crypto.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_ddb.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_ht.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_ioctl.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_ioctl.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_node.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_node.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_regdomain.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_regdomain.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_tdma.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_var.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netgraph/ng_deflate.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netgraph/ng_iface.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netgraph/ng_iface.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netgraph/ng_mppc.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netgraph/ng_ppp.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netgraph/ng_pred1.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/in.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/in_pcb.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/libalias/alias_ftp.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/libalias/alias_irc.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/libalias/alias_nbt.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_timer.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_var.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/vinet.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/in6_ifattach.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/raw_ip6.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netipsec/ipsec_mbuf.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/nfs4client/nfs4_subs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/nfsclient/nfs_vfsops.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/nfsclient/nfs_vnops.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/nfsserver/nfs_srvsubs.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/opencrypto/cryptosoft.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/pci/if_rlreg.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/conf/GENERIC#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/conf/NOTES#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/powermac/ata_macio.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/powermac/kiic.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/powerpc/intr_machdep.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/security/mac/mac_audit.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/security/mac/mac_framework.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/security/mac/mac_priv.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sun4v/include/pcpu.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/_null.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/conf.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/jail.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/ktr.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/lock.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/param.h#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/pcpu.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/pmc.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/sched.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/sysctl.h#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/types.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/vnode.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ufs/ffs/ffs_alloc.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ufs/ffs/ffs_balloc.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ufs/ffs/ffs_extern.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ufs/ffs/ffs_inode.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ufs/ffs/ffs_vfsops.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ufs/ffs/ffs_vnops.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ufs/ufs/ufs_dirhash.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ufs/ufs/ufs_lookup.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ufs/ufs/ufs_vnops.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/vm/uma.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/vm/uma_core.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/vm/uma_dbg.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/vm/uma_int.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_meter.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_mmap.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/tools/regression/fstest/tests/conf#3 integrate .. //depot/projects/trustedbsd/capabilities/src/tools/regression/fstest/tests/misc.sh#3 integrate .. //depot/projects/trustedbsd/capabilities/src/tools/regression/usr.bin/jot/regress.sh#2 integrate .. //depot/projects/trustedbsd/capabilities/src/tools/regression/usr.bin/jot/regress.wX.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/tools/regression/usr.bin/jot/regress.wX1.out#1 branch .. //depot/projects/trustedbsd/capabilities/src/tools/sched/schedgraph.py#5 integrate .. //depot/projects/trustedbsd/capabilities/src/tools/tools/ath/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/tools/tools/ath/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/capabilities/src/tools/tools/ath/athrd/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/tools/tools/ath/athrd/athrd.1#1 branch .. //depot/projects/trustedbsd/capabilities/src/tools/tools/ath/athrd/athrd.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/tools/tools/ath/athrd/run.sh#1 branch .. //depot/projects/trustedbsd/capabilities/src/tools/tools/ath/athstats/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/tools/tools/net80211/scripts/setup.tdma-master#1 branch .. //depot/projects/trustedbsd/capabilities/src/tools/tools/net80211/scripts/setup.tdma-slave#1 branch .. //depot/projects/trustedbsd/capabilities/src/tools/tools/sysbuild/README#1 branch .. //depot/projects/trustedbsd/capabilities/src/tools/tools/sysbuild/sysbuild.sh#1 branch .. //depot/projects/trustedbsd/capabilities/src/usr.bin/fetch/fetch.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/mail/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/mail/aux.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/usr.bin/mail/util.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/usr.bin/make/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/make/buf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/make/suff.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/split/split.1#3 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/truss/truss.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/Makefile#7 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/config/config.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/i2c/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/i2c/i2c.8#1 branch .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/i2c/i2c.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/jail/jail.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/sysinstall/devices.c#5 integrate Differences ... ==== //depot/projects/trustedbsd/capabilities/src/Makefile.inc1#6 (text+ko) ==== @@ -1,10 +1,11 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.614 2008/11/12 04:43:55 obrien Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.616 2009/01/23 18:23:16 imp Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir # -DNO_CLEAN do not clean at all # -DNO_SHARE do not go into share subdir +# -DKERNFAST define NO_KERNELCONFIG, NO_KERNELCLEAN and NO_KERNELCONFIG # -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel # -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel # -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel @@ -697,6 +698,15 @@ # be set to cross-build, we have to make sure TARGET is set # properly. +.if defined(KERNFAST) +NO_KERNELCLEAN= t +NO_KERNELCONFIG= t +NO_KERNELDEPEND= t +# Shortcut for KERNCONF=Blah -DKERNFAST is now KERNFAST=Blah +.if !defined(KERNCONF) && ${KERNFAST} != "1" +KERNCONF=${KERNFAST} +.endif +.endif .if !defined(KERNCONF) && defined(KERNEL) KERNCONF= ${KERNEL} KERNWARN= ==== //depot/projects/trustedbsd/capabilities/src/ObsoleteFiles.inc#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.166 2009/01/03 11:25:50 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.167 2009/01/25 19:03:30 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090122: tzdata2009a import +OLD_FILES+=usr/share/zoneinfo/Asia/Katmandu +# 20090102: file 4.26 import +OLD_FILES+=usr/share/misc/magic.mime +OLD_FILES+=usr/share/misc/magic.mime.mgc # 20081223: bind 9.4.3 import, nsupdate.8 moved to nsupdate.1 OLD_FILES+=usr/share/man/man8/nsupdate.8.gz # 20081223: ipprotosw.h removed ==== //depot/projects/trustedbsd/capabilities/src/UPDATING#6 (text+ko) ==== @@ -22,6 +22,20 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090119: + NTFS has been removed from GENERIC kernel on amd64 to match + GENERIC on i386. Should not cause any issues since mount_ntfs(8) + will load ntfs.ko module automatically when NTFS support is + actually needed, unless ntfs.ko is not installed or security + level prohibits loading kernel modules. If either is the case, + "options NTFS" has to be added into kernel config. + +20090115: + TCP Appropriate Byte Counting (RFC 3465) support added to kernel. + New field in struct tcpcb breaks ABI, so bump __FreeBSD_version to + 800061. User space tools that rely on the size of struct tcpcb in + tcp_var.h (e.g. sockstat) need to be recompiled. + 20081225: ng_tty(4) module updated to match the new TTY subsystem. Due to API change, user-level applications must be updated. @@ -1201,4 +1215,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.557 2008/12/25 10:05:00 mav Exp $ +$FreeBSD: src/UPDATING,v 1.559 2009/01/19 17:00:42 sobomax Exp $ ==== //depot/projects/trustedbsd/capabilities/src/bin/chmod/chmod.1#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)chmod.1 8.4 (Berkeley) 3/31/94 -.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.40 2006/12/22 07:28:38 ru Exp $ +.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.42 2009/01/26 18:14:21 trhodes Exp $ .\" -.Dd December 22, 2006 +.Dd January 26, 2009 .Dt CHMOD 1 .Os .Sh NAME @@ -281,6 +281,10 @@ ``o'' by itself), in combination with the .Ar perm symbols ``s'' or ``t'', are ignored. +.Pp +The ``w'' permission on directories will permit file creation, relocation, +and copy into that directory. +Files created within the directory itself will inherit its group ID. .Sh EXAMPLES .Bl -tag -width "u=rwx,go=u-w" -compact .It Li 644 @@ -343,4 +347,4 @@ .Sh BUGS There is no .Ar perm -option for the naughty bits. +option for the naughty bits of a horse. ==== //depot/projects/trustedbsd/capabilities/src/bin/dd/dd.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 -.\" $FreeBSD: src/bin/dd/dd.1,v 1.31 2005/07/28 18:28:11 keramida Exp $ +.\" $FreeBSD: src/bin/dd/dd.1,v 1.32 2009/01/23 03:46:44 keramida Exp $ .\" .Dd August 15, 2004 .Dt DD 1 @@ -392,6 +392,11 @@ Check for (even) parity errors on a file: .Pp .Dl "dd if=file conv=pareven | cmp -x - file" +.Pp +To create an image of a Mode-1 CD-ROM, which is a commonly used format +for data CD-ROM disks, use a block size of 2048 bytes: +.Pp +.Dl "dd if=/dev/acd0 of=filename.iso bs=2048" .Sh SEE ALSO .Xr cp 1 , .Xr mt 1 , ==== //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#3 (text+ko) ==== @@ -1739,15 +1739,11 @@ * Arches which are 32-bit only just use the normal * library path. */ -#if defined(__i386__) - int use_32 = 1; /* use /usr/lib/... -sson */ -#else int use_32 = 0; #endif -#endif (void) snprintf(drti, sizeof (drti), "/usr/lib%s/dtrace/drti.o", - use_32 ? "":"32"); + use_32 ? "32":""); len = snprintf(&tmp, 1, fmt, dtp->dt_ld_path, file, tfile, drti) + 1; ==== //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/README#3 (text+ko) ==== @@ -56,7 +56,9 @@ whose sum is the desired value For decimal -> binary conversions, there are three families of -helper routines: one for round-nearest: +helper routines: one for round-nearest (or the current rounding +mode on IEEE-arithmetic systems that provide the C99 fegetround() +function, if compiled with -DHonor_FLT_ROUNDS): strtof strtod @@ -191,6 +193,9 @@ conversion are easily done with the help of gdtoa(), such as %e or %f style and conversions with direction of rounding specified (so that, if desired, the decimal value is either >= or <= the binary value). +On IEEE-arithmetic systems that provide the C99 fegetround() function, +if compiled with -DHonor_FLT_ROUNDS, these routines honor the current +rounding mode. For an example of more general conversions based on dtoa(), see netlib's "printf.c from ampl/solvers". @@ -342,5 +347,11 @@ current rounding mode is obtained from fegetround() rather than from FLT_ROUNDS, unless Trust_FLT_ROUNDS is also #defined. +Compile with -DUSE_LOCALE to use the current locale; otherwise +decimal points are assumed to be '.'. With -DUSE_LOCALE, unless +you also compile with -DNO_LOCALE_CACHE, the details about the +current "decimal point" character string are cached and assumed not +to change during the program's execution. + Please send comments to David M. Gay (dmg at acm dot org, with " at " changed at "@" and " dot " changed to "."). ==== //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/g_Qfmt.c#2 (text+ko) ==== @@ -51,15 +51,20 @@ char* #ifdef KR_headers -g_Qfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; unsigned bufsize; +g_Qfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; size_t bufsize; #else -g_Qfmt(char *buf, void *V, int ndig, unsigned bufsize) +g_Qfmt(char *buf, void *V, int ndig, size_t bufsize) #endif { - static FPI fpi = { 113, 1-16383-113+1, 32766 - 16383 - 113 + 1, 1, 0 }; + static FPI fpi0 = { 113, 1-16383-113+1, 32766 - 16383 - 113 + 1, 1, 0 }; char *b, *s, *se; ULong bits[4], *L, sign; int decpt, ex, i, mode; +#ifdef Honor_FLT_ROUNDS +#include "gdtoa_fltrnds.h" +#else +#define fpi &fpi0 +#endif if (ndig < 0) ndig = 0; @@ -109,6 +114,6 @@ return 0; mode = 0; } - s = gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se); - return g__fmt(buf, s, se, decpt, sign); + s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); + return g__fmt(buf, s, se, decpt, sign, bufsize); } ==== //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/g__fmt.c#2 (text+ko) ==== @@ -37,24 +37,51 @@ char * #ifdef KR_headers -g__fmt(b, s, se, decpt, sign) char *b; char *s; char *se; int decpt; ULong sign; +g__fmt(b, s, se, decpt, sign, blen) char *b; char *s; char *se; int decpt; ULong sign; size_t blen; #else -g__fmt(char *b, char *s, char *se, int decpt, ULong sign) +g__fmt(char *b, char *s, char *se, int decpt, ULong sign, size_t blen) #endif { int i, j, k; - char *s0 = s; + char *be, *s0; + size_t len; #ifdef USE_LOCALE - char decimalpoint = *localeconv()->decimal_point; +#ifdef NO_LOCALE_CACHE + char *decimalpoint = localeconv()->decimal_point; + size_t dlen = strlen(decimalpoint); +#else + char *decimalpoint; + static char *decimalpoint_cache; + static size_t dlen; + if (!(s0 = decimalpoint_cache)) { + s0 = localeconv()->decimal_point; + dlen = strlen(s0); + if ((decimalpoint_cache = (char*)malloc(strlen(s0) + 1))) { + strcpy(decimalpoint_cache, s0); + s0 = decimalpoint_cache; + } + } + decimalpoint = s0; +#endif #else -#define decimalpoint '.' +#define dlen 0 #endif + s0 = s; + len = (se-s) + dlen + 6; /* 6 = sign + e+dd + trailing null */ + if (blen < len) + goto ret0; + be = b + blen - 1; if (sign) *b++ = '-'; if (decpt <= -4 || decpt > se - s + 5) { *b++ = *s++; if (*s) { - *b++ = decimalpoint; +#ifdef USE_LOCALE + while((*b = *decimalpoint++)) + ++b; +#else + *b++ = '.'; +#endif while((*b = *s++) !=0) b++; } @@ -69,6 +96,8 @@ for(j = 2, k = 10; 10*k <= decpt; j++, k *= 10){} for(;;) { i = decpt / k; + if (b >= be) + goto ret0; *b++ = i + '0'; if (--j <= 0) break; @@ -78,22 +107,41 @@ *b = 0; } else if (decpt <= 0) { - *b++ = decimalpoint; +#ifdef USE_LOCALE + while((*b = *decimalpoint++)) + ++b; +#else + *b++ = '.'; +#endif + if (be < b - decpt + (se - s)) + goto ret0; for(; decpt < 0; decpt++) *b++ = '0'; - while((*b = *s++) !=0) + while((*b = *s++) != 0) b++; } else { - while((*b = *s++) !=0) { + while((*b = *s++) != 0) { b++; - if (--decpt == 0 && *s) - *b++ = decimalpoint; + if (--decpt == 0 && *s) { +#ifdef USE_LOCALE + while(*b = *decimalpoint++) + ++b; +#else + *b++ = '.'; +#endif + } + } + if (b + decpt > be) { + ret0: + b = 0; + goto ret; } for(; decpt > 0; decpt--) *b++ = '0'; *b = 0; } + ret: freedtoa(s0); return b; } ==== //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/g_ddfmt.c#2 (text+ko) ==== @@ -33,9 +33,9 @@ char * #ifdef KR_headers -g_ddfmt(buf, dd, ndig, bufsize) char *buf; double *dd; int ndig; unsigned bufsize; +g_ddfmt(buf, dd, ndig, bufsize) char *buf; double *dd; int ndig; size_t bufsize; #else -g_ddfmt(char *buf, double *dd, int ndig, unsigned bufsize) +g_ddfmt(char *buf, double *dd, int ndig, size_t bufsize) #endif { FPI fpi; @@ -44,6 +44,21 @@ int bx, by, decpt, ex, ey, i, j, mode; Bigint *x, *y, *z; double ddx[2]; +#ifdef Honor_FLT_ROUNDS /*{{*/ + int Rounding; +#ifdef Trust_FLT_ROUNDS /*{{ only define this if FLT_ROUNDS really works! */ + Rounding = Flt_Rounds; +#else /*}{*/ + Rounding = 1; + switch(fegetround()) { + case FE_TOWARDZERO: Rounding = 0; break; + case FE_UPWARD: Rounding = 2; break; + case FE_DOWNWARD: Rounding = 3; + } +#endif /*}}*/ +#else /*}{*/ +#define Rounding FPI_Round_near +#endif /*}}*/ if (bufsize < 10 || bufsize < ndig + 8) return 0; @@ -144,11 +159,11 @@ } fpi.emin = 1-1023-53+1; fpi.emax = 2046-1023-106+1; - fpi.rounding = FPI_Round_near; + fpi.rounding = Rounding; fpi.sudden_underflow = 0; i = STRTOG_Normal; s = gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se); - b = g__fmt(buf, s, se, decpt, z->sign); + b = g__fmt(buf, s, se, decpt, z->sign, bufsize); Bfree(z); return b; } ==== //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/g_dfmt.c#2 (text+ko) ==== @@ -33,15 +33,20 @@ char* #ifdef KR_headers -g_dfmt(buf, d, ndig, bufsize) char *buf; double *d; int ndig; unsigned bufsize; +g_dfmt(buf, d, ndig, bufsize) char *buf; double *d; int ndig; size_t bufsize; #else -g_dfmt(char *buf, double *d, int ndig, unsigned bufsize) +g_dfmt(char *buf, double *d, int ndig, size_t bufsize) #endif { - static FPI fpi = { 53, 1-1023-53+1, 2046-1023-53+1, 1, 0 }; + static FPI fpi0 = { 53, 1-1023-53+1, 2046-1023-53+1, 1, 0 }; char *b, *s, *se; ULong bits[2], *L, sign; int decpt, ex, i, mode; +#ifdef Honor_FLT_ROUNDS +#include "gdtoa_fltrnds.h" +#else +#define fpi &fpi0 +#endif if (ndig < 0) ndig = 0; @@ -52,6 +57,8 @@ sign = L[_0] & 0x80000000L; if ((L[_0] & 0x7ff00000) == 0x7ff00000) { /* Infinity or NaN */ + if (bufsize < 10) + return 0; if (L[_0] & 0xfffff || L[_1]) { return strcp(buf, "NaN"); } @@ -78,12 +85,9 @@ ex = 1; ex -= 0x3ff + 52; mode = 2; - if (ndig <= 0) { - if (bufsize < 25) - return 0; + if (ndig <= 0) mode = 0; - } i = STRTOG_Normal; - s = gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se); - return g__fmt(buf, s, se, decpt, sign); + s = gdtoa(fpi, ex, bits, &i, mode, ndig, &decpt, &se); + return g__fmt(buf, s, se, decpt, sign, bufsize); } ==== //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/g_ffmt.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 30 12:09:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 295581065748; Fri, 30 Jan 2009 12:09: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 796581065757 for ; Fri, 30 Jan 2009 12:09:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5F0DA8FC1C for ; Fri, 30 Jan 2009 12:09:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0UC93la065716 for ; Fri, 30 Jan 2009 12:09:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0UC93tZ065714 for perforce@freebsd.org; Fri, 30 Jan 2009 12:09:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 30 Jan 2009 12:09:03 GMT Message-Id: <200901301209.n0UC93tZ065714@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156906 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Jan 2009 12:09:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=156906 Change 156906 by rwatson@rwatson_freebsd_capabilities on 2009/01/30 12:08:22 Consistently use CURDIR for all relative paths. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#6 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # $FreeBSD$ -# $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#5 $ +# $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#6 $ WITHOUT_SSP= @@ -52,7 +52,7 @@ -chflags noschg ${DESTDIR}/usr/libexec/${PROG} .endif -.PATH: ../rtld-elf +.PATH: ${.CURDIR}/../rtld-elf .PATH: ${.CURDIR}/../rtld-elf/${MACHINE_ARCH} From owner-p4-projects@FreeBSD.ORG Fri Jan 30 13:56:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 999BB1065679; Fri, 30 Jan 2009 13:56: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 569831065674 for ; Fri, 30 Jan 2009 13:56:53 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4265F8FC1D for ; Fri, 30 Jan 2009 13:56:53 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0UDurUK084329 for ; Fri, 30 Jan 2009 13:56:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0UDuruI084327 for perforce@freebsd.org; Fri, 30 Jan 2009 13:56:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 30 Jan 2009 13:56:53 GMT Message-Id: <200901301356.n0UDuruI084327@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156909 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Jan 2009 13:56:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=156909 Change 156909 by rwatson@rwatson_freebsd_capabilities on 2009/01/30 13:56:02 Add a stub man page for rtld-elf-cap -- turns out that our make system doesn't like a target with a .1 name if there isn't a man page, so NO_MAN didn't work. Also, use ${.CURDIR} for the linker script path. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#7 edit .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld-elf-cap.1#1 add Differences ... ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # $FreeBSD$ -# $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#6 $ +# $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#7 $ WITHOUT_SSP= @@ -9,11 +9,11 @@ SRCS= rtld_start.S \ reloc.c rtld.c rtld_lock.c map_object.c \ malloc.c xmalloc.c debug.c libmap.c -NO_MAN= +MAN= rtld-elf-cap.1 CSTD?= gnu99 CFLAGS+= -Wall -DFREEBSD_ELF -DIN_RTLD -DIN_RTLD_CAP -g CFLAGS+= -I${.CURDIR}/../rtld-elf/${MACHINE_ARCH} -I${.CURDIR}/../rtld-elf -LDFLAGS+= -nostdlib -Wl,-e,_rtld_start -Wl,-T,rtld-elf-cap.xs +LDFLAGS+= -nostdlib -Wl,-e,_rtld_start -Wl,-T,${.CURDIR}/rtld-elf-cap.xs INSTALLFLAGS= -C -b PRECIOUSPROG= BINDIR= /libexec From owner-p4-projects@FreeBSD.ORG Fri Jan 30 23:26:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF33010656D1; Fri, 30 Jan 2009 23:26: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 97ECC10656E3 for ; Fri, 30 Jan 2009 23:26:35 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 359198FC1C for ; Fri, 30 Jan 2009 23:26:34 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0UNQYCq062252 for ; Fri, 30 Jan 2009 23:26:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0UNQYKv062250 for perforce@freebsd.org; Fri, 30 Jan 2009 23:26:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 30 Jan 2009 23:26:34 GMT Message-Id: <200901302326.n0UNQYKv062250@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156938 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Jan 2009 23:26:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=156938 Change 156938 by rwatson@rwatson_freebsd_capabilities on 2009/01/30 23:25:43 Fix cross-referencs for wait4(2). Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/pdfork.2#3 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/pdfork.2#3 (text+ko) ==== @@ -77,7 +77,7 @@ .Fn pdwait is currently unimplemented, but in the future will be functionally identical to -.Xr wait4 , +.Xr wait4 2 , except that it accepts a process descriptor rather than a PID. .Pp The following system calls also have effects specific to proces descriptors: @@ -105,7 +105,7 @@ .Xr fstat 2 , .Xr kill 2 , .Xr poll 2 , -.Xr wait4 +.Xr wait4 2 .Sh HISTORY Support for process descriptors mode was developed as part of the .Tn TrustedBSD From owner-p4-projects@FreeBSD.ORG Sat Jan 31 04:25:38 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E0BF51065673; Sat, 31 Jan 2009 04:25: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 96403106566C for ; Sat, 31 Jan 2009 04:25:37 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8381A8FC17 for ; Sat, 31 Jan 2009 04:25:37 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0V4Pbg5099267 for ; Sat, 31 Jan 2009 04:25:37 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0V4Pbsb099265 for perforce@freebsd.org; Sat, 31 Jan 2009 04:25:37 GMT (envelope-from andrew@freebsd.org) Date: Sat, 31 Jan 2009 04:25:37 GMT Message-Id: <200901310425.n0V4Pbsb099265@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 156942 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Jan 2009 04:25:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=156942 Change 156942 by andrew@andrew_bender on 2009/01/31 04:24:57 Get the S3c24x0 uart driver working on real hardware Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0reg.h#2 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/uart_bus_s3c2410.c#3 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/uart_dev_s3c2410.c#7 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0reg.h#2 (text+ko) ==== @@ -103,9 +103,9 @@ #define UTRSTAT_TXEMPTY (1<<1) /* TX fifo or buffer empty */ #define UTRSTAT_RXREADY (1<<0) /* RX fifo or buffer is not empty */ #define SSCOM_UERSTAT 0x14 /* Error status register */ -#define UERSTAT_BREAK (1<<3) /* Break signal */ +#define UERSTAT_BREAK (1<<3) /* Break signal, not 2410 */ #define UERSTAT_FRAME (1<<2) /* Frame error */ -#define UERSTAT_PARITY (1<<1) /* Parity error */ +#define UERSTAT_PARITY (1<<1) /* Parity error, not 2410 */ #define UERSTAT_OVERRUN (1<<0) /* Overrun */ #define UERSTAT_ALL_ERRORS (UERSTAT_OVERRUN|UERSTAT_BREAK|UERSTAT_FRAME|UERSTAT_PARITY) #define SSCOM_UFSTAT 0x18 /* Fifo status register */ @@ -115,6 +115,13 @@ #define UFSTAT_TXCOUNT (0x0f< #include -#include - #include #include #include ==== //depot/projects/arm/src/sys/arm/s3c2xx0/uart_dev_s3c2410.c#7 (text+ko) ==== @@ -46,6 +46,9 @@ #define DEFAULT_RCLK 3686400 +static int sscomspeed(long, long); +static int s3c24x0_uart_param(struct uart_bas *, int, int, int, int); + /* * Low-level UART interface. */ @@ -58,22 +61,7 @@ extern SLIST_HEAD(uart_devinfo_list, uart_devinfo) uart_sysdevs; -struct uart_ops uart_s3c2410_ops = { - .probe = s3c2410_probe, - .init = s3c2410_init, - .term = s3c2410_term, - .putc = s3c2410_putc, - .rxready = s3c2410_rxready, - .getc = s3c2410_getc, -}; - static int -s3c2410_probe(struct uart_bas *bas) -{ - return (0); -} - -static int sscomspeed(long speed, long frequency) { #define divrnd(n, q) (((n)*2/(q)+1)/2) /* divide and round off */ @@ -92,22 +80,88 @@ #undef divrnd } + +static int +s3c24x0_uart_param(struct uart_bas *bas, int baudrate, int databits, + int stopbits, int parity) +{ + int brd, ulcon; + + ulcon = 0; + + switch(databits) { + case 5: + ulcon |= ULCON_LENGTH_5; + break; + case 6: + ulcon |= ULCON_LENGTH_6; + break; + case 7: + ulcon |= ULCON_LENGTH_7; + break; + case 8: + ulcon |= ULCON_LENGTH_8; + break; + default: + return (EINVAL); + } + + switch (parity) { + case UART_PARITY_NONE: + ulcon |= ULCON_PARITY_NONE; + break; + case UART_PARITY_ODD: + ulcon |= ULCON_PARITY_ODD; + break; + case UART_PARITY_EVEN: + ulcon |= ULCON_PARITY_EVEN; + break; + case UART_PARITY_MARK: + case UART_PARITY_SPACE: + default: + return (EINVAL); + } + + if (stopbits == 2) + ulcon |= ULCON_STOP; + + uart_setreg(bas, SSCOM_ULCON, ulcon); + + brd = sscomspeed(baudrate, bas->rclk); + uart_setreg(bas, SSCOM_UBRDIV, brd); + + return (0); +} + +struct uart_ops uart_s3c2410_ops = { + .probe = s3c2410_probe, + .init = s3c2410_init, + .term = s3c2410_term, + .putc = s3c2410_putc, + .rxready = s3c2410_rxready, + .getc = s3c2410_getc, +}; + +static int +s3c2410_probe(struct uart_bas *bas) +{ + return (0); +} + static void s3c2410_init(struct uart_bas *bas, int baudrate, int databits, int stopbits, int parity) { - int brd; - if (bas->rclk == 0) bas->rclk = DEFAULT_RCLK; - uart_setreg(bas, SSCOM_ULCON, 0x23); + uart_setreg(bas, SSCOM_UCON, 0); uart_setreg(bas, SSCOM_UFCON, UFCON_TXTRIGGER_8 | UFCON_RXTRIGGER_8 | UFCON_TXFIFO_RESET | UFCON_RXFIFO_RESET | UFCON_FIFO_ENABLE); - brd = sscomspeed(baudrate, bas->rclk); - uart_setreg(bas, SSCOM_UBRDIV, brd); + s3c24x0_uart_param(bas, baudrate, databits, stopbits, parity); + /* Enable UART. */ uart_setreg(bas, SSCOM_UCON, UCON_TXMODE_INT|UCON_RXMODE_INT|UCON_TOINT); uart_setreg(bas, SSCOM_UMCON, UMCON_RTS); @@ -122,9 +176,9 @@ static void s3c2410_putc(struct uart_bas *bas, int c) { -#if 0 - while (uart_getreg(bas, SSCOM_UFSTAT) & UFSTAT_TXFULL); -#endif + while (!(uart_getreg(bas, SSCOM_UTRSTAT) & UTRSTAT_TXEMPTY)) + continue; + uart_setreg(bas, SSCOM_UTXH, c); } @@ -138,11 +192,10 @@ static int s3c2410_getc(struct uart_bas *bas, struct mtx *mtx) { - int c; + while (!sscom_rxrdy(bas->bst, bas->bsh)) + continue; - while (!sscom_rxrdy(bas->bst, bas->bsh)); return sscom_getc(bas->bst, bas->bsh); - return (c); } static int s3c2410_bus_probe(struct uart_softc *sc); @@ -180,29 +233,39 @@ static int s3c2410_bus_attach(struct uart_softc *sc) { - bcopy(&sc->sc_sysdev->bas, &sc->sc_bas, sizeof(sc->sc_bas)); + bcopy(&sc->sc_sysdev->bas, &sc->sc_bas, sizeof(sc->sc_bas)); - sc->sc_txfifosz = 3; - sc->sc_rxfifosz = 1; - sc->sc_hwiflow = 0; + /* + * TODO: The S3C2410 has a 16 byte fifo, the s3c2440 has a + * 64 byte fifo. figure out which CPU we are on to set this + */ + sc->sc_txfifosz = 16; + sc->sc_rxfifosz = 16; + sc->sc_hwiflow = 0; + sc->sc_hwoflow = 0; return (0); } + static int s3c2410_bus_transmit(struct uart_softc *sc) { - sc->sc_txbusy = 1; + uart_lock(sc->sc_hwmtx); for (int i = 0; i < sc->sc_txdatasz; i++) { s3c2410_putc(&sc->sc_bas, sc->sc_txbuf[i]); uart_barrier(&sc->sc_bas); } + sc->sc_txbusy = 1; + uart_unlock(sc->sc_hwmtx); return (0); } + static int s3c2410_bus_setsig(struct uart_softc *sc, int sig) { return (0); } + static int s3c2410_bus_receive(struct uart_softc *sc) { @@ -210,30 +273,41 @@ uart_rx_put(sc, uart_getreg(&sc->sc_bas, SSCOM_URXH)); return (0); } + static int s3c2410_bus_param(struct uart_softc *sc, int baudrate, int databits, int stopbits, int parity) { - - return (0); + int error; + + uart_lock(sc->sc_hwmtx); + error = s3c24x0_uart_param(&sc->sc_bas, baudrate, databits, stopbits, + parity); + uart_unlock(sc->sc_hwmtx); + + return (error); } + static int s3c2410_bus_ipend(struct uart_softc *sc) { + uint32_t utrstat; int ipend = 0; - int sr; - sr = uart_getreg(&sc->sc_bas, SSCOM_UFSTAT); + uart_lock(sc->sc_hwmtx); + utrstat = uart_getreg(&sc->sc_bas, SSCOM_UTRSTAT); + uart_unlock(sc->sc_hwmtx); - if ((sr & UFSTAT_TXCOUNT) == 0 && sc->sc_txbusy) { + if ((utrstat & UTRSTAT_TXEMPTY) == UTRSTAT_TXEMPTY) { ipend |= SER_INT_TXIDLE; } - if ((sr & UFSTAT_RXCOUNT) != 0) { + if ((utrstat & UTRSTAT_RXREADY) == UTRSTAT_RXREADY) { ipend |= SER_INT_RXREADY; } return (ipend); } + static int s3c2410_bus_flush(struct uart_softc *sc, int what) { @@ -257,5 +331,5 @@ 1, .uc_ops = &uart_s3c2410_ops, .uc_range = 8, - .uc_rclk = 3686400 + .uc_rclk = DEFAULT_RCLK }; From owner-p4-projects@FreeBSD.ORG Sat Jan 31 10:57:16 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 095201065674; Sat, 31 Jan 2009 10:57: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 BCFEC1065672 for ; Sat, 31 Jan 2009 10:57:15 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A9E5F8FC0A for ; Sat, 31 Jan 2009 10:57:15 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0VAvFSR054160 for ; Sat, 31 Jan 2009 10:57:15 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0VAvFbO054158 for perforce@freebsd.org; Sat, 31 Jan 2009 10:57:15 GMT (envelope-from rene@FreeBSD.org) Date: Sat, 31 Jan 2009 10:57:15 GMT Message-Id: <200901311057.n0VAvFbO054158@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 156955 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Jan 2009 10:57:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=156955 Change 156955 by rene@rene_self on 2009/01/31 10:56:55 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#14 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#14 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#11 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#21 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#13 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#17 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#17 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#17 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#11 integrate .. //depot/projects/docproj_nl/share/pgpkeys/beat.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/jamie.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-core.sgml#2 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#11 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#11 integrate .. //depot/projects/docproj_nl/share/sgml/mirrors.xml#6 integrate .. //depot/projects/docproj_nl/www/en/developers.sgml#11 integrate .. //depot/projects/docproj_nl/www/en/news/status/Makefile#4 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2008-10-2008-12.xml#1 branch .. //depot/projects/docproj_nl/www/en/news/status/status.sgml#6 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#27 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#14 (text+ko) ==== @@ -1,4 +1,4 @@ - + + @@ -173,7 +173,7 @@ of freebsd-update exists, it must be disabled before the following operation is started. - + The Configuration File Some users may wish to tweak the configuration file, @@ -263,7 +263,7 @@ list. - + Security Patches Security patches are stored on a remote machine and @@ -564,7 +564,7 @@ is complete. - + System State Comparison The freebsd-update utility may be used @@ -1584,7 +1584,7 @@ the procedure described here should be used instead. - + The Canonical Way to Update Your System To update your system, you should check @@ -1612,7 +1612,8 @@ (i.e. using boot -s from the loader prompt). Then run: - &prompt.root; mount -a -t ufs + &prompt.root; adjkerntz -i +&prompt.root; mount -a -t ufs &prompt.root; mergemaster -p &prompt.root; cd /usr/src &prompt.root; make installworld @@ -1629,7 +1630,7 @@ - + Read <filename>/usr/src/UPDATING</filename> Before you do anything else, read @@ -1648,7 +1649,7 @@ - + Check <filename>/etc/make.conf</filename> make.conf @@ -1675,7 +1676,7 @@ on) and decide if they are relevant to you. - + Update the Files in <filename>/etc</filename> The /etc directory contains a large part @@ -1778,7 +1779,7 @@ - + Remove <filename>/usr/obj</filename> As parts of the system are rebuilt they are placed in @@ -1960,7 +1961,7 @@ - + Compile and Install a New Kernel kernel @@ -2009,7 +2010,7 @@ about the various file flags. - + Reboot into Single User Mode single-user mode @@ -2053,7 +2054,7 @@ - + Update Files Not Updated by <command>make installworld</command> Remaking the world will not update certain directories (in @@ -2330,7 +2331,7 @@ &prompt.root; make all install - + Questions @@ -2671,7 +2672,7 @@ if it is going to build their kernels. - + The Base System Now that all that is done, you are ready to build @@ -2695,7 +2696,7 @@ the build set. - + Ports The same ideas can be used for the ports tree. The first ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#21 (text+ko) ==== @@ -1,7 +1,7 @@ 8.0-CURRENT after TCP Appropriate Byte Counting. 800061 + + 8.0-CURRENT after removal of minor(), minor2unit(), unit2minor(), etc. + 800062 + ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#13 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.467 2008/11/24 06:38:24 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.469 2009/01/30 22:09:36 jamie Exp $ --> aaron@FreeBSD.org"> @@ -110,6 +110,8 @@ bean@FreeBSD.org"> +beat@FreeBSD.org"> + beech@FreeBSD.org"> ben@FreeBSD.org"> @@ -446,6 +448,8 @@ jake@FreeBSD.org"> +jamie@FreeBSD.org"> + jasone@FreeBSD.org"> jayanth@FreeBSD.org"> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#17 (text+ko) ==== @@ -1,7 +1,7 @@ - + &a.wilko; &pgpkey.wilko; - + &a.brooks; &pgpkey.brooks; - + &a.keramida; &pgpkey.keramida; - - &a.imp; - &pgpkey.imp; - - - + &a.gnn; &pgpkey.gnn; - - &a.wes; - &pgpkey.wes; - - - + &a.hrs; &pgpkey.hrs; - + &a.murray; &pgpkey.murray; + + + &a.kris; + &pgpkey.kris; + ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#11 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -376,6 +376,11 @@ &pgpkey.billf; + + &a.beat; + &pgpkey.beat; + + &a.danger; &pgpkey.danger; @@ -406,6 +411,11 @@ &pgpkey.grehan; + + &a.jamie; + &pgpkey.jamie; + + &a.jmg; &pgpkey.jmg; ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#11 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -24,6 +24,7 @@ + @@ -112,6 +113,7 @@ + ==== //depot/projects/docproj_nl/share/sgml/mirrors.xml#6 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: doc/share/sgml/mirrors.xml,v 1.76 2008/09/22 19:27:39 manolis Exp $ + $FreeBSD: doc/share/sgml/mirrors.xml,v 1.77 2009/01/29 14:20:25 pav Exp $ @@ -506,6 +506,12 @@ + + ftp2.cz.FreeBSD.org + ftp://ftp2.cz.FreeBSD.org/pub/FreeBSD/ + http://ftp2.cz.FreeBSD.org/pub/FreeBSD/ + + cvsup.cz.FreeBSD.org ==== //depot/projects/docproj_nl/www/en/developers.sgml#11 (text+ko) ==== @@ -6,7 +6,7 @@ us to update author names, or the representation of those names (such as adding email addresses), by just editing a single file. -$FreeBSD: www/en/developers.sgml,v 1.209 2008/11/04 22:17:30 blackend Exp $ +$FreeBSD: www/en/developers.sgml,v 1.211 2009/01/30 22:09:36 jamie Exp $ --> @@ -58,6 +58,7 @@ + @@ -224,6 +225,7 @@ + ==== //depot/projects/docproj_nl/www/en/news/status/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/news/status/Makefile,v 1.44 2008/11/11 03:52:54 brd Exp $ +# $FreeBSD: www/en/news/status/Makefile,v 1.45 2009/01/29 06:50:26 brd Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -42,6 +42,7 @@ XMLDOCS+= report-2008-01-2008-03 XMLDOCS+= report-2008-04-2008-06 XMLDOCS+= report-2008-07-2008-09 +XMLDOCS+= report-2008-10-2008-12 XSLT.DEFAULT= report.xsl ==== //depot/projects/docproj_nl/www/en/news/status/status.sgml#6 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -8,7 +8,7 @@ &header; -

    Next submissions due: January 14, 2009

    +

    Next submissions due: April 14, 2009

    Use the xml generator or download and edit the @@ -42,6 +42,8 @@

    2008

      +
    • October, 2008 - + December, 2008
    • July, 2008 - September, 2008
    • April, 2008 - ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#27 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.220 2009/01/17 09:06:01 murray Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.223 2009/01/30 22:09:36 jamie Exp $ @@ -36,6 +36,27 @@ 1 + 28 + + + October - December, 2008 Status Reports + +

      The October - December, 2008 Status Reports are now + available with 19 entries.

      + + + +

      New committer: Beat Gätzi + (ports)

      +       + +

      New committer: Jamie + Gritton (src)

      +       + + + 17 From owner-p4-projects@FreeBSD.ORG Sat Jan 31 17:37:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8FE91065688; Sat, 31 Jan 2009 17:37: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 6A418106567E for ; Sat, 31 Jan 2009 17:37:10 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 567038FC2A for ; Sat, 31 Jan 2009 17:37:10 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0VHbAsd011555 for ; Sat, 31 Jan 2009 17:37:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0VHbAk0011553 for perforce@freebsd.org; Sat, 31 Jan 2009 17:37:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 31 Jan 2009 17:37:10 GMT Message-Id: <200901311737.n0VHbAk0011553@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156964 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Jan 2009 17:37:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=156964 Change 156964 by rwatson@rwatson_freebsd_capabilities on 2009/01/31 17:37:08 Fix typo. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/pdfork.2#4 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/pdfork.2#4 (text+ko) ==== @@ -80,7 +80,7 @@ .Xr wait4 2 , except that it accepts a process descriptor rather than a PID. .Pp -The following system calls also have effects specific to proces descriptors: +The following system calls also have effects specific to process descriptors: .Pp .Xr fstat 2 queries status of a process descriptor; currently only the From owner-p4-projects@FreeBSD.ORG Sat Jan 31 22:22:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97137106570A; Sat, 31 Jan 2009 22:22: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 3DF8E1065706 for ; Sat, 31 Jan 2009 22:22:01 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2C8818FC08 for ; Sat, 31 Jan 2009 22:22:01 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0VMM1Ee055080 for ; Sat, 31 Jan 2009 22:22:01 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0VMM05D055078 for perforce@freebsd.org; Sat, 31 Jan 2009 22:22:00 GMT (envelope-from rene@FreeBSD.org) Date: Sat, 31 Jan 2009 22:22:00 GMT Message-Id: <200901312222.n0VMM05D055078@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 156971 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Jan 2009 22:22:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=156971 Change 156971 by rene@rene_self on 2009/01/31 22:21:18 MFen handbook/cutting-edge 1.237 -> 1.239 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#18 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#18 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.47 2006/01/07 11:27:42 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml - %SRCID% 1.237 + %SRCID% 1.239 --> @@ -205,7 +205,7 @@ het uitgeschakeld worden voordat aan de volgende operatie wordt begonnen. - + Het configuratiebestand Sommige gebruikers willen het configuratiebestand @@ -296,7 +296,7 @@ werken dat op de lijst Components staat. - + Beveiligingspatches Beveiligingspatches staan op een verre machine en kunnen met @@ -618,7 +618,7 @@ proces is voltooid. - + Het vergelijken van systeemtoestanden Het gereedschap freebsd-update kan @@ -1719,7 +1719,7 @@ gebruikt te worden. - + De universele wijze om een systeem bij te werken Een systeem bijwerken kan met de volgende procedure, nadat @@ -1748,7 +1748,8 @@ (met boot -s vanaf de loaderprompt). Draai dan: - &prompt.root; mount -a -t ufs + &prompt.root; adjkerntz -i +&prompt.root; mount -a -t ufs &prompt.root; mergemaster -p &prompt.root; cd /usr/src &prompt.root; make installworld @@ -1765,7 +1766,7 @@ - + <filename>/usr/src/UPDATING</filename> lezen Lees voor verder te gaan @@ -1785,7 +1786,7 @@ - + <filename>/etc/make.conf</filename> controleren make.conf @@ -1813,7 +1814,7 @@ relevant zijn. - + <filename>/etc</filename> bijwerken De map /etc bevat een groot deel van @@ -1922,7 +1923,7 @@ - + <filename>/usr/obj</filename> verwijderen Als delen van een systeem opnieuw gebouwd worden, worden ze @@ -2125,7 +2126,7 @@ - + Nieuwe kernel compileren en installeren @@ -2179,7 +2180,7 @@ informatie over diverse bestandsopties. - + Opnieuw opstarten in single-user modus single-user modus @@ -2189,7 +2190,7 @@ testen of de nieuwe kernel werkt. - + Nieuwe binaire systeembestanden installeren Na het draaien van make buildworld kan @@ -2526,7 +2527,7 @@ &prompt.root; make all install - + Vragen @@ -2900,7 +2901,7 @@ gaat bouwen. - + Basissysteem Nu kan één systeem alles bouwen. Bouw de @@ -2925,7 +2926,7 @@ elke machine te installeren in de bouwgroep. - + Ports Dezelfde ideeën kunnen gebruikt worden voor de ports.