From owner-p4-projects@FreeBSD.ORG Sun Sep 13 10:41:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C49BF1065672; Sun, 13 Sep 2009 10:41: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 895ED106566C for ; Sun, 13 Sep 2009 10:41:39 +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 783A18FC1B for ; Sun, 13 Sep 2009 10:41:39 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8DAfdMT097506 for ; Sun, 13 Sep 2009 10:41:39 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8DAfdiw097504 for perforce@freebsd.org; Sun, 13 Sep 2009 10:41:39 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 13 Sep 2009 10:41:39 GMT Message-Id: <200909131041.n8DAfdiw097504@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 168490 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Sep 2009 10:41:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=168490 Change 168490 by hselasky@hselasky_laptop001 on 2009/09/13 10:40:44 USB storage: - remove quirk. I think this quirk is now in the CAM layer. - reported by Ulrich Spörlein PR: usb/127980 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#32 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/storage/umass.c#32 (text+ko) ==== @@ -750,10 +750,6 @@ UMASS_PROTO_SCSI | UMASS_PROTO_BBB, IGNORE_RESIDUE | NO_START_STOP }, - {USB_VENDOR_SAMSUNG, USB_PRODUCT_SAMSUNG_YP_U2, RID_WILDCARD, - UMASS_PROTO_SCSI | UMASS_PROTO_BBB, - SHUTTLE_INIT | NO_GETMAXLUN - }, {USB_VENDOR_SAMSUNG_TECHWIN, USB_PRODUCT_SAMSUNG_TECHWIN_DIGIMAX_410, RID_WILDCARD, UMASS_PROTO_SCSI | UMASS_PROTO_BBB, NO_INQUIRY From owner-p4-projects@FreeBSD.ORG Sun Sep 13 11:49:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A7B7D1065672; Sun, 13 Sep 2009 11:49: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 6C7CE1065670 for ; Sun, 13 Sep 2009 11:49:54 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5B9608FC15 for ; Sun, 13 Sep 2009 11:49:54 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8DBns9x003745 for ; Sun, 13 Sep 2009 11:49:54 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8DBnsdS003743 for perforce@freebsd.org; Sun, 13 Sep 2009 11:49:54 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 13 Sep 2009 11:49:54 GMT Message-Id: <200909131149.n8DBnsdS003743@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 168495 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Sep 2009 11:49:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=168495 Change 168495 by hselasky@hselasky_laptop001 on 2009/09/13 11:49:05 usbconfig IFC @ 168493 Affected files ... .. //depot/projects/usb/src/usr.sbin/usbconfig/Makefile#6 integrate .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#13 integrate .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.h#8 integrate .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.8#6 integrate .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#16 integrate Differences ... ==== //depot/projects/usb/src/usr.sbin/usbconfig/Makefile#6 (text+ko) ==== ==== //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#13 (text+ko) ==== ==== //depot/projects/usb/src/usr.sbin/usbconfig/dump.h#8 (text+ko) ==== ==== //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.8#6 (text+ko) ==== ==== //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#16 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Sep 13 12:06:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E0F2D10656CB; Sun, 13 Sep 2009 12:06:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A551110656C7 for ; Sun, 13 Sep 2009 12:06:12 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7BF968FC17 for ; Sun, 13 Sep 2009 12:06:12 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8DC6COE005976 for ; Sun, 13 Sep 2009 12:06:12 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8DC6C3u005974 for perforce@freebsd.org; Sun, 13 Sep 2009 12:06:12 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 13 Sep 2009 12:06:12 GMT Message-Id: <200909131206.n8DC6C3u005974@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 168496 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Sep 2009 12:06:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=168496 Change 168496 by hselasky@hselasky_laptop001 on 2009/09/13 12:05:14 usbconfig: - add more verbose output when dumping the configuration descriptor. Affected files ... .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#14 edit Differences ... ==== //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#14 (text+ko) ==== @@ -100,21 +100,66 @@ printf("%s%s = 0x%04x ", plevel, field, value); - if ((field[0] != 'i') || (field[1] == 'd')) { - printf("\n"); - return; + if (strlen(plevel) == 8) { + /* Endpoint Descriptor */ + + if (strcmp(field, "bEndpointAddress") == 0) { + if (value & 0x80) + printf("\n"); + else + printf("\n"); + return; + } + + if (strcmp(field, "bmAttributes") == 0) { + switch (value & 0x03) { + case 0: + printf("\n"); + break; + case 1: + switch (value & 0x0C) { + case 0x00: + printf("\n"); + break; + case 0x04: + printf("\n"); + break; + case 0x08: + printf("\n"); + break; + default: + printf("\n"); + break; + } + break; + case 2: + printf("\n"); + break; + default: + printf("\n"); + break; + } + return; + } } - if (value == 0) { - printf(" \n"); + + if ((field[0] == 'i') && (field[1] != 'd')) { + /* Indirect String Descriptor */ + if (value == 0) { + printf(" \n"); + return; + } + if (libusb20_dev_req_string_simple_sync(pdev, value, + temp_string, sizeof(temp_string))) { + printf(" \n"); + return; + } + printf(" <%s>\n", temp_string); return; } - if (libusb20_dev_req_string_simple_sync(pdev, value, - temp_string, sizeof(temp_string))) { - printf(" \n"); - return; - } - printf(" <%s>\n", temp_string); - return; + + /* No additional information */ + printf("\n"); } static void From owner-p4-projects@FreeBSD.ORG Sun Sep 13 12:16:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 261051065743; Sun, 13 Sep 2009 12:16: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 DEB9C1065740 for ; Sun, 13 Sep 2009 12:16: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 CE0A18FC19 for ; Sun, 13 Sep 2009 12:16:23 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8DCGNI3006790 for ; Sun, 13 Sep 2009 12:16:23 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8DCGNlA006788 for perforce@freebsd.org; Sun, 13 Sep 2009 12:16:23 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 13 Sep 2009 12:16:23 GMT Message-Id: <200909131216.n8DCGNlA006788@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 168498 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Sep 2009 12:16:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=168498 Change 168498 by hselasky@hselasky_laptop001 on 2009/09/13 12:15:33 Style nit. Affected files ... .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#15 edit Differences ... ==== //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#15 (text+ko) ==== @@ -105,38 +105,38 @@ if (strcmp(field, "bEndpointAddress") == 0) { if (value & 0x80) - printf("\n"); + printf(" \n"); else - printf("\n"); + printf(" \n"); return; } if (strcmp(field, "bmAttributes") == 0) { switch (value & 0x03) { case 0: - printf("\n"); + printf(" \n"); break; case 1: switch (value & 0x0C) { case 0x00: - printf("\n"); + printf(" \n"); break; case 0x04: - printf("\n"); + printf(" \n"); break; case 0x08: - printf("\n"); + printf(" \n"); break; default: - printf("\n"); + printf(" \n"); break; } break; case 2: - printf("\n"); + printf(" \n"); break; default: - printf("\n"); + printf(" \n"); break; } return; From owner-p4-projects@FreeBSD.ORG Sun Sep 13 17:29:06 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84FC7106568D; Sun, 13 Sep 2009 17:29:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 491DF106568B for ; Sun, 13 Sep 2009 17:29:06 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 37BA68FC14 for ; Sun, 13 Sep 2009 17:29:06 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8DHT6rl055481 for ; Sun, 13 Sep 2009 17:29:06 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8DHT689055479 for perforce@freebsd.org; Sun, 13 Sep 2009 17:29:06 GMT (envelope-from mav@freebsd.org) Date: Sun, 13 Sep 2009 17:29:06 GMT Message-Id: <200909131729.n8DHT689055479@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Cc: Subject: PERFORCE change 168509 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Sep 2009 17:29:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=168509 Change 168509 by mav@mav_mavtest on 2009/09/13 17:28:22 Fill request->parent before calling ata_modify_if_48bit(). Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#19 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#19 (text+ko) ==== @@ -59,19 +59,18 @@ /* Prepare paramers required by low-level code. */ request->unit = atadev->unit; + if (!(request->parent = device_get_parent(request->dev))) { + request->result = ENXIO; + if (request->callback) + (request->callback)(request); + return; + } if ((atadev->param.config & ATA_PROTO_MASK) == ATA_PROTO_ATAPI_16) request->flags |= ATA_R_ATAPI16; if ((atadev->param.config & ATA_DRQ_MASK) == ATA_DRQ_INTR) request->flags |= ATA_R_ATAPI_INTR; if ((request->flags & ATA_R_ATAPI) == 0) ata_modify_if_48bit(request); - /* check that the device is still valid */ - if (!(request->parent = device_get_parent(request->dev))) { - request->result = ENXIO; - if (request->callback) - (request->callback)(request); - return; - } ch = device_get_softc(request->parent); callout_init_mtx(&request->callout, &ch->state_mtx, CALLOUT_RETURNUNLOCKED); if (!request->callback && !(request->flags & ATA_R_REQUEUE)) From owner-p4-projects@FreeBSD.ORG Sun Sep 13 21:04:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4684C106568B; Sun, 13 Sep 2009 21:04: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 095CC106566C for ; Sun, 13 Sep 2009 21:04:10 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EA5358FC17 for ; Sun, 13 Sep 2009 21:04:09 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8DL496Z085379 for ; Sun, 13 Sep 2009 21:04:09 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8DL41WZ085369 for perforce@freebsd.org; Sun, 13 Sep 2009 21:04:01 GMT (envelope-from truncs@FreeBSD.org) Date: Sun, 13 Sep 2009 21:04:01 GMT Message-Id: <200909132104.n8DL41WZ085369@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to truncs@FreeBSD.org using -f From: Aditya Sarawgi To: Perforce Change Reviews Cc: Subject: PERFORCE change 168515 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Sep 2009 21:04:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=168515 Change 168515 by truncs@aditya on 2009/09/13 21:03:14 IFC. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/initcpu.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/msi.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/conf/XENHVM#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/_align.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/apicvar.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/param.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/smp.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/arm/minidump_machdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/arm/undefined.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/CAMBRIA#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/SHEEVAPLUG#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/include/_align.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/include/param.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/mv/common.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/mv/discovery/db78xxx.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/mv/kirkwood/db88f6xxx.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/mv/kirkwood/files.db88f6xxx#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/mv/kirkwood/files.kirkwood#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/mv/kirkwood/files.sheevaplug#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/mv/kirkwood/sheevaplug.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/mv/kirkwood/std.db88f6xxx#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/mv/kirkwood/std.kirkwood#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/mv/kirkwood/std.sheevaplug#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/mv/mv_machdep.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/mv/mvreg.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/mv/mvvar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/mv/orion/db88f5xxx.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/xscale/ixp425/ixdp425_pci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/ata/ata_all.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/ata/ata_all.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/ata/ata_da.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/ata/ata_xpt.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/cam_xpt_internal.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/scsi/scsi_target.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/sys/mutex.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/sys/proc.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/sys/taskq.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/sys/vnode.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#3 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_socket.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/svr4/svr4_proto.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/svr4/svr4_sockio.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/NOTES#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files.amd64#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files.i386#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files.ia64#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files.powerpc#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files.sparc64#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/newvers.sh#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/options#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/options.amd64#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/options.arm#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/options.i386#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/options.pc98#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/altq/altq/altq_subr.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/acpica_prep.sh#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/changes.txt#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/common/dmrestag.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/common/dmtable.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/common/dmtbdump.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/common/dmtbinfo.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/asldefine.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslfiles.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslglobal.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslload.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/asllookup.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslmain.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslmap.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslstubs.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/asltypes.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/dispatcher/dsfield.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/dispatcher/dswload.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/events/evgpe.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/events/evrgnini.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exfield.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exfldio.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exstorob.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exutils.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/hardware/hwregs.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/hardware/hwtimer.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/hardware/hwxface.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acconfig.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acdebug.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acglobal.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/achware.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acinterp.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/aclocal.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acmacros.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acobject.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acparser.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acpixf.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acpredef.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/actbl.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/actbl1.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/actbl2.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/actypes.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acutils.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/amlcode.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nsload.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nsrepair.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nsxfname.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/parser/psloop.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/parser/psxface.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/tables/tbutils.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/utilities/uteval.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/utilities/utglobal.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/utilities/utids.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/utilities/utinit.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/utilities/utxface.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/pf/net/pf_if.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/pf/net/pf_ioctl.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/pf/net/pf_subr.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/pf/net/pfvar.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/rdma/rdma_cma.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/x86emu/x86emu.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/x86emu/x86emu.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/x86emu/x86emu_regs.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/x86emu/x86emu_util.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/ddb/db_sym.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aac/aac.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpi_battery.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpi_dock.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpi_thermal.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/adb/adb_bus.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ae/if_ae.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/agp/agp_i810.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ahci/ahci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ahci/ahci.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/alc/if_alc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/amdtemp/amdtemp.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/amr/amr.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/asmc/asmc.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-acerlabs.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-marvell.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ah_osdep.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ath_hal/ah.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ath_hal/ah_regdomain.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bktr/bktr_os.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/dpms/dpms.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/drm_bufs.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/drm_drv.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/drm_fops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/drm_pciids.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/drm_sysctl.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/r600_blit.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/r600_cp.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/radeon_cp.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/radeon_cs.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/radeon_drv.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/if_em.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/if_igb.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ep/if_ep.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ep/if_epreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fb/s3_pci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fb/vesa.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fb/vesa.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fb/vga.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/firewire/fwcrom.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/firewire/fwdev.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/hwpmc/hwpmc_core.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/hwpmc/pmc_events.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/iir/iir.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ips/ips_pci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/iscsi/initiator/isc_cam.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/isp.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/isp_freebsd.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/isp_ioctl.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/isp_library.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/isp_stds.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/isp_target.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/ispmbox.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/ispreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ispfw/asm_2300.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ispfw/asm_2400.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ispfw/asm_2500.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ixgbe/ixgbe.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mfi/mfi.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mfi/mfi_ioctl.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mfi/mfireg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mge/if_mge.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mii/e1000phy.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mlx/mlx.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mmc/mmc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mwl/if_mwl.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/null/null.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/pci/pcivar.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ppbus/vpo.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/pst/pst-iop.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/pty/pty.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/re/if_re.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/rp/rp.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/rp/rp_pci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/siis/siis.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/snp/snp.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pci/hda/hdac_private.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pci/hda/hdac_reg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/daemon/daemon_saver.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/scterm-teken.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/scvesactl.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/scvgarndr.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/teken/Makefile#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/teken/gensequences#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/teken/sequences#3 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/teken/teken.c#4 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/teken/teken.h#3 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/teken/teken_demo.c#3 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/teken/teken_scs.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/teken/teken_stress.c#3 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/teken/teken_subr.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/teken/teken_subr_compat.h#3 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/teken/teken_wcwidth.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/twe/twe.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/txp/if_txp.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/at91dci.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/atmegadci.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/avr32dci.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/ehci.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/ehci_pci.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/musb_otg.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/ohci.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/ohci_pci.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/uhci.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/uhci_pci.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/usb_controller.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/uss820dci.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/input/ukbd.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/input/ums.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/misc/ufm.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_aue.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_cdce.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/usb_ethernet.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/u3g.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uipaq.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/ulpt.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uvisor.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/storage/umass.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/storage/urio.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_busdma.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_compat_linux.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_compat_linux.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_controller.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_dev.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_dev.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_device.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_device.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_handle_request.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_hid.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_hub.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_parse.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_process.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_process.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_request.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_transfer.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usbdi.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_rum.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_rumreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_upgt.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_urtw.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_zyd.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/wi/if_wi.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/xen/blkback/blkback.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/xen/blkfront/blkfront.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/xen/console/console.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/xen/netback/netback.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/nfsport.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfs_clnode.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfs_clport.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfs_clsubs.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfs_clvnops.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/pseudofs/pseudofs_vncache.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/geom_dev.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/geom_disk.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/geom_io.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/geom_vfs.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/multipath/g_multipath.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/acpica/acpi_machdep.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/bios/smapi.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/bios/smbios.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/bios/vpd.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/conf/NOTES#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/cpufreq/hwpstate.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/elf_machdep.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/msi.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/trap.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/ibcs2/ibcs2_proto.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/_align.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/apicvar.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/cpufunc.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/md_var.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/param.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/pc/vesa.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/pcpu.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/pmap.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/pmc_mdep.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/sf_buf.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/smp.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/xen/xen-os.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/isa/dpms.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/isa/vesa.c#3 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/xen/locore.s#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/xen/mp_machdep.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/ia64/ia64/genassym.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/ia64/ia64/machdep.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/ia64/ia64/mp_machdep.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/ia64/include/_align.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/ia64/include/param.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/ia64/include/smp.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/isa/isahint.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_conf.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_cons.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_event.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_exec.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_exit.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_fork.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_jail.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_kthread.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_linker.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_lock.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_poll.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_proc.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_sig.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_subr.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_sx.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_sysctl.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_thr.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_thread.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_uuid.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_vimage.c#4 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/subr_bus.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/subr_kdb.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/subr_pcpu.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/subr_sglist.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/subr_smp.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/subr_witness.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/sys_generic.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/sys_socket.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/tty.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/tty_pts.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/tty_pty.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/tty_ttydisc.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/uipc_mqueue.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_aio.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_cache.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/mips/include/_align.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/mips/include/param.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/mips/include/smp.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/mips/mips/mp_machdep.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/Makefile#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/acpi/acpi/Makefile#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/dpms/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/drm/radeon/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/dtrace/lockstat/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/ispfw/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/ispfw/isp_2400_multi/Makefile#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/ispfw/isp_2500/Makefile#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/ispfw/isp_2500_multi/Makefile#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/pty/Makefile#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/vesa/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/x86emu/Makefile#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/zfs/Makefile#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/bpf.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/bpf_buffer.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/bpf_zerocopy.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/bpfdesc.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/bridgestp.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/flowtable.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/flowtable.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_arp.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_bridge.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_clone.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_ef.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_enc.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_epair.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_faith.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_gif.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_gre.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_llatbl.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_llatbl.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_loop.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_mib.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_spppsubr.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_stf.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_tun.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_var.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_vlan.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/netisr.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/raw_cb.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/raw_usrreq.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/route.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/route.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/rtsock.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/vnet.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/vnet.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_action.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_ddb.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_dfs.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_freebsd.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_input.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_proto.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_scan_sta.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_sta.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netatalk/at_control.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netgraph/atm/ng_atm.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netgraph/ng_bridge.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netgraph/ng_eiface.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netgraph/ng_ether.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netgraph/ng_gif.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netgraph/ng_iface.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netgraph/ng_pipe.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netgraph/ng_source.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/icmp6.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/icmp_var.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/if_ether.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/if_ether.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/igmp.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/in.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/in.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/in_gif.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/in_mcast.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/in_proto.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/in_rmx.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/ip_carp.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/ip_divert.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/ip_fastfwd.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/ip_fw.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/ip_input.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/ip_ipsec.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/ip_options.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/ip_output.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/ip_var.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/ipfw/ip_fw2.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/ipfw/ip_fw_nat.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/ipfw/ip_fw_pfil.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_os_bsd.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_timer.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctputil.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctputil.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_hostcache.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_offload.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_reass.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_syncache.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_timewait.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_var.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/udp_var.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/dest6.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/frag6.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/icmp6.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/in6.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/in6_gif.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/in6_mcast.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/in6_pcb.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/in6_proto.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/in6_rmx.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/ip6_forward.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/ip6_ipsec.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/ip6_mroute.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/ip6_output.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/mld6.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/nd6.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/nd6.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/nd6_nbr.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/nd6_rtr.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/raw_ip6.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/route6.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/scope6.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netipsec/ipsec.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netipsec/ipsec.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netipsec/ipsec_input.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netipsec/ipsec_mbuf.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netipsec/ipsec_output.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netipsec/key.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netipsec/keysock.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netipsec/xform_ah.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netipsec/xform_esp.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netipsec/xform_ipcomp.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netipsec/xform_ipip.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netipsec/xform_tcp.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netsmb/smb_dev.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/nfsclient/bootp_subr.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/nfsclient/nfs_diskless.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/nfsclient/nfs_node.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/nfsclient/nfs_subs.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/nfsserver/nfs_serv.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/opencrypto/cryptodev.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/pc98/cbus/fdc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/pc98/include/_align.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/pc98/include/pc/vesa.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/pci/intpm.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/pci/intpmreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/powerpc/include/_align.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/powerpc/include/param.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/powerpc/include/smp.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/powerpc/powerpc/mp_machdep.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/rpc/clnt_dg.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/rpc/clnt_rc.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/rpc/clnt_vc.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/rpc/rpc_generic.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/rpc/svc_dg.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/rpc/svc_generic.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/rpc/svc_vc.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/security/audit/audit.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/security/audit/audit_arg.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/security/audit/audit_bsm_token.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/security/audit/audit_private.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sparc64/include/_align.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/sparc64/include/param.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sparc64/include/smp.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sparc64/pci/ofw_pci.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sparc64/pci/psycho.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sparc64/pci/schizo.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sparc64/sparc64/jbusppm.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sun4v/include/_align.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/sun4v/include/param.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sun4v/include/smp.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/_sockaddr_storage.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/bus.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/conf.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/cons.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/imgact_aout.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/imgact_elf.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/ioctl_compat.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/jail.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/lock.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/param.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/pcpu.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/priv.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/proc.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/sglist.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/smp.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/socket.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/syscallsubr.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/sysctl.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/sysproto.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/systm.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/taskqueue.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/tty.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/ttycom.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/ttydisc.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/types.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/vimage.h#4 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/Makefile#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/gensequences#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/sequences#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/teken.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/teken.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/teken_demo.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/teken_scs.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/teken_stress.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/teken_subr.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/teken_subr_compat.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/teken_wcwidth.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/ufs/ufs/ufs_acl.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/vm/device_pager.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/vm/sg_pager.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/vm/vm.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/vm/vm_extern.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/vm/vm_glue.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/xdr/xdr_mbuf.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/xen/xenbus/xenbus_probe.c#2 integrate Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/elf_machdep.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.30 2009/04/05 09:27:19 dchagin Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.32 2009/08/30 14:38:17 bz Exp $"); #include #include @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -108,6 +109,22 @@ (sysinit_cfunc_t) elf64_insert_brand_entry, &freebsd_brand_oinfo); +static Elf64_Brandinfo kfreebsd_brand_info = { + .brand = ELFOSABI_FREEBSD, + .machine = EM_X86_64, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/lib/ld-kfreebsd-x86-64.so.1", + .sysvec = &elf64_freebsd_sysvec, + .interp_newpath = NULL, + .brand_note = &elf64_kfreebsd_brandnote, + .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE_MANDATORY +}; + +SYSINIT(kelf64, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf64_insert_brand_entry, + &kfreebsd_brand_info); + void elf64_dump_thread(struct thread *td __unused, void *dst __unused, ==== //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/identcpu.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.174 2009/06/30 11:16:32 avg Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.175 2009/09/10 17:27:36 jkim Exp $"); #include "opt_cpu.h" @@ -371,21 +371,21 @@ switch (cpu_vendor_id) { case CPU_VENDOR_AMD: if ((amd_pminfo & AMDPM_TSC_INVARIANT) || - AMD64_CPU_FAMILY(cpu_id) >= 0x10 || + CPUID_TO_FAMILY(cpu_id) >= 0x10 || cpu_id == 0x60fb2) tsc_is_invariant = 1; break; case CPU_VENDOR_INTEL: if ((amd_pminfo & AMDPM_TSC_INVARIANT) || - (AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xe) || - (AMD64_CPU_FAMILY(cpu_id) == 0xf && - AMD64_CPU_MODEL(cpu_id) >= 0x3)) + (CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xe) || + (CPUID_TO_FAMILY(cpu_id) == 0xf && + CPUID_TO_MODEL(cpu_id) >= 0x3)) tsc_is_invariant = 1; break; case CPU_VENDOR_CENTAUR: - if (AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xf && + if (CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xf && (rdmsr(0x1203) & 0x100000000ULL) == 0) tsc_is_invariant = 1; break; ==== //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/initcpu.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.54 2009/07/22 14:32:38 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.55 2009/09/10 17:27:36 jkim Exp $"); #include "opt_cpu.h" @@ -154,8 +154,8 @@ pg_nx = PG_NX; } if (cpu_vendor_id == CPU_VENDOR_CENTAUR && - AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xf) + CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xf) init_via(); /* ==== //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/local_apic.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.58 2009/07/01 17:20:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.61 2009/09/02 00:39:59 jhb Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -123,7 +123,7 @@ { 1, 1, 0, 1, APIC_LVT_DM_NMI, 0 }, /* LINT1: NMI */ { 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_TIMER_INT }, /* Timer */ { 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_ERROR_INT }, /* Error */ - { 1, 1, 0, 1, APIC_LVT_DM_NMI, 0 }, /* PMC */ + { 1, 1, 1, 1, APIC_LVT_DM_NMI, 0 }, /* PMC */ { 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_THERMAL_INT }, /* Thermal */ }; @@ -305,11 +305,9 @@ lapic->lvt_lint0 = lvt_mode(la, LVT_LINT0, lapic->lvt_lint0); lapic->lvt_lint1 = lvt_mode(la, LVT_LINT1, lapic->lvt_lint1); -#ifdef HWPMC_HOOKS /* Program the PMC LVT entry if present. */ if (maxlvt >= LVT_PMC) lapic->lvt_pcint = lvt_mode(la, LVT_PMC, lapic->lvt_pcint); -#endif /* Program timer LVT and setup handler. */ lapic->lvt_timer = lvt_mode(la, LVT_TIMER, lapic->lvt_timer); @@ -332,6 +330,88 @@ intr_restore(eflags); } +void +lapic_reenable_pmc(void) +{ +#ifdef HWPMC_HOOKS + uint32_t value; + + value = lapic->lvt_pcint; + value &= ~APIC_LVT_M; + lapic->lvt_pcint = value; +#endif +} + +#ifdef HWPMC_HOOKS +static void +lapic_update_pmc(void *dummy) +{ + struct lapic *la; + + la = &lapics[lapic_id()]; + lapic->lvt_pcint = lvt_mode(la, LVT_PMC, lapic->lvt_pcint); +} +#endif + +int +lapic_enable_pmc(void) +{ +#ifdef HWPMC_HOOKS + u_int32_t maxlvt; + + /* Fail if the local APIC is not present. */ + if (lapic == NULL) + return (0); + + /* Fail if the PMC LVT is not present. */ + maxlvt = (lapic->version & APIC_VER_MAXLVT) >> MAXLVTSHIFT; + if (maxlvt < LVT_PMC) + return (0); + + lvts[LVT_PMC].lvt_masked = 0; + +#ifdef SMP + /* + * If hwpmc was loaded at boot time then the APs may not be + * started yet. In that case, don't forward the request to + * them as they will program the lvt when they start. + */ + if (smp_started) + smp_rendezvous(NULL, lapic_update_pmc, NULL, NULL); + else +#endif + lapic_update_pmc(NULL); + return (1); +#else + return (0); +#endif +} + +void +lapic_disable_pmc(void) +{ +#ifdef HWPMC_HOOKS + u_int32_t maxlvt; + + /* Fail if the local APIC is not present. */ + if (lapic == NULL) + return; + + /* Fail if the PMC LVT is not present. */ + maxlvt = (lapic->version & APIC_VER_MAXLVT) >> MAXLVTSHIFT; + if (maxlvt < LVT_PMC) + return; + + lvts[LVT_PMC].lvt_masked = 1; + +#ifdef SMP + /* The APs should always be started when hwpmc is unloaded. */ + KASSERT(mp_ncpus == 1 || smp_started, ("hwpmc unloaded too early")); +#endif + smp_rendezvous(NULL, lapic_update_pmc, NULL, NULL); +#endif +} + /* * Called by cpu_initclocks() on the BSP to setup the local APIC timer so >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Sep 13 21:40:51 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07BEC1065676; Sun, 13 Sep 2009 21:40:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A77B5106566C for ; Sun, 13 Sep 2009 21:40:50 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 94A4B8FC0C for ; Sun, 13 Sep 2009 21:40:50 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8DLeoAp088181 for ; Sun, 13 Sep 2009 21:40:50 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8DLeotf088179 for perforce@freebsd.org; Sun, 13 Sep 2009 21:40:50 GMT (envelope-from zec@fer.hr) Date: Sun, 13 Sep 2009 21:40:50 GMT Message-Id: <200909132140.n8DLeotf088179@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 168517 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Sep 2009 21:40:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=168517 Change 168517 by zec@zec_tpx32 on 2009/09/13 21:39:54 IFC @ 168505 (primarily in order to merge in the recent mcast fixes) Affected files ... .. //depot/projects/vimage/src/share/man/man4/inet6.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/syscons.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/textdump.4#4 integrate .. //depot/projects/vimage/src/share/man/man5/device.hints.5#2 integrate .. //depot/projects/vimage/src/share/man/man5/rc.conf.5#10 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#18 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/initcpu.c#6 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/msi.c#12 integrate .. //depot/projects/vimage/src/sys/amd64/include/specialreg.h#16 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_proto.h#10 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/pxe.c#4 integrate .. //depot/projects/vimage/src/sys/boot/pc98/Makefile.inc#4 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_target.c#9 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#8 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#16 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#8 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_proto.h#3 integrate .. //depot/projects/vimage/src/sys/conf/files#79 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acpica_prep.sh#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/changes.txt#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/common/dmrestag.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/common/dmtable.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/common/dmtbdump.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/common/dmtbinfo.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/asldefine.h#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslfiles.c#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslglobal.h#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslload.c#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/asllookup.c#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslmain.c#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslmap.c#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslstubs.c#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/asltypes.h#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dispatcher/dsfield.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dispatcher/dswload.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/events/evgpe.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/events/evrgnini.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/executer/exfield.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/executer/exfldio.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/executer/exstorob.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/executer/exutils.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/hardware/hwregs.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/hardware/hwtimer.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/hardware/hwxface.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acconfig.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acdebug.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acglobal.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/achware.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acinterp.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/aclocal.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acmacros.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acobject.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acparser.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acpixf.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acpredef.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/actbl.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/actbl1.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/actbl2.h#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/actypes.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acutils.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/amlcode.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nsload.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nsrepair.c#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nsxfname.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/parser/psloop.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/parser/psxface.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/tables/tbutils.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utilities/uteval.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utilities/utglobal.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utilities/utids.c#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utilities/utinit.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utilities/utxface.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi.c#25 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_cpu.c#15 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_pcib_acpi.c#10 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpivar.h#11 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_i810.c#9 integrate .. //depot/projects/vimage/src/sys/dev/amdtemp/amdtemp.c#4 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_pciids.h#11 integrate .. //depot/projects/vimage/src/sys/dev/drm/r600_blit.c#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/if_em.c#17 integrate .. //depot/projects/vimage/src/sys/dev/e1000/if_igb.c#14 integrate .. //depot/projects/vimage/src/sys/dev/ichwd/ichwd.c#11 integrate .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe.c#12 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci_user.c#7 integrate .. //depot/projects/vimage/src/sys/dev/pci/pcireg.h#16 integrate .. //depot/projects/vimage/src/sys/dev/pci/pcivar.h#9 integrate .. //depot/projects/vimage/src/sys/dev/syscons/daemon/daemon_saver.c#10 integrate .. //depot/projects/vimage/src/sys/dev/syscons/scterm-teken.c#8 integrate .. //depot/projects/vimage/src/sys/dev/syscons/syscons.c#17 integrate .. //depot/projects/vimage/src/sys/dev/syscons/syscons.h#8 integrate .. //depot/projects/vimage/src/sys/fs/fifofs/fifo_vnops.c#16 integrate .. //depot/projects/vimage/src/sys/i386/acpica/acpi_machdep.c#13 integrate .. //depot/projects/vimage/src/sys/i386/cpufreq/hwpstate.c#4 integrate .. //depot/projects/vimage/src/sys/i386/i386/identcpu.c#19 integrate .. //depot/projects/vimage/src/sys/i386/i386/msi.c#12 integrate .. //depot/projects/vimage/src/sys/i386/i386/pmap.c#33 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_proto.h#3 integrate .. //depot/projects/vimage/src/sys/i386/include/specialreg.h#16 integrate .. //depot/projects/vimage/src/sys/i386/include/xen/xen-os.h#4 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_proto.h#10 integrate .. //depot/projects/vimage/src/sys/i386/xen/locore.s#5 integrate .. //depot/projects/vimage/src/sys/i386/xen/pmap.c#13 integrate .. //depot/projects/vimage/src/sys/kern/kern_event.c#13 integrate .. //depot/projects/vimage/src/sys/kern/kern_shutdown.c#16 integrate .. //depot/projects/vimage/src/sys/kern/kern_sig.c#22 integrate .. //depot/projects/vimage/src/sys/kern/kern_timeout.c#19 integrate .. //depot/projects/vimage/src/sys/kern/subr_bus.c#24 integrate .. //depot/projects/vimage/src/sys/kern/sys_pipe.c#14 integrate .. //depot/projects/vimage/src/sys/kern/tty.c#42 integrate .. //depot/projects/vimage/src/sys/kern/tty_pts.c#21 integrate .. //depot/projects/vimage/src/sys/kern/uipc_mqueue.c#15 integrate .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#44 integrate .. //depot/projects/vimage/src/sys/kern/vfs_aio.c#12 integrate .. //depot/projects/vimage/src/sys/kern/vfs_subr.c#34 integrate .. //depot/projects/vimage/src/sys/modules/acpi/acpi/Makefile#8 integrate .. //depot/projects/vimage/src/sys/modules/dtrace/lockstat/Makefile#2 integrate .. //depot/projects/vimage/src/sys/net/bpf.c#43 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#34 integrate .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#28 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.c#46 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#47 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#47 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#63 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.c#59 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.h#20 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#40 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#41 integrate .. //depot/projects/vimage/src/sys/netsmb/smb_dev.c#7 integrate .. //depot/projects/vimage/src/sys/pci/intpm.c#10 integrate .. //depot/projects/vimage/src/sys/pci/intpmreg.h#3 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC#27 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/ofw_pci.h#6 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/psycho.c#16 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/schizo.c#6 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/jbusppm.c#3 integrate .. //depot/projects/vimage/src/sys/sys/bus.h#10 integrate .. //depot/projects/vimage/src/sys/teken/teken.c#2 integrate .. //depot/projects/vimage/src/sys/teken/teken.h#2 integrate .. //depot/projects/vimage/src/sys/teken/teken_demo.c#2 integrate .. //depot/projects/vimage/src/sys/teken/teken_subr.h#2 integrate .. //depot/projects/vimage/src/sys/teken/teken_subr_compat.h#2 integrate Differences ... ==== //depot/projects/vimage/src/share/man/man4/inet6.4#2 (text+ko) ==== @@ -27,9 +27,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/inet6.4,v 1.20 2005/08/25 13:47:41 glebius Exp $ +.\" $FreeBSD: src/share/man/man4/inet6.4,v 1.21 2009/09/12 22:08:20 hrs Exp $ .\" -.Dd January 29, 1999 +.Dd September 2, 2009 .Dt INET6 4 .Os .Sh NAME @@ -307,7 +307,8 @@ The flag is provided basically for avoiding possible DoS attacks. .It Dv IPV6CTL_ACCEPT_RTADV .Pq ip6.accept_rtadv -Boolean: enable/disable receiving of +Boolean: the default value of a per-interface flag to +enable/disable receiving of .Tn ICMPv6 router advertisement packets, and autoconfiguration of address prefixes and default routers. @@ -315,6 +316,11 @@ (not a router) for the option to be meaningful. Defaults to off. +.It Dv IPV6CTL_AUTO_LINKLOCAL +.Pq ip6.auto_linklocal +Boolean: the default value of a per-interface flag to +enable/disable performing automatic link-local address configuration. +Defaults to on. .It Dv IPV6CTL_KEEPFAITH .Pq ip6.keepfaith Boolean: enable/disable ==== //depot/projects/vimage/src/share/man/man4/syscons.4#2 (text+ko) ==== @@ -24,9 +24,9 @@ .\" (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/share/man/man4/syscons.4,v 1.45 2006/12/14 16:40:57 mpp Exp $ +.\" $FreeBSD: src/share/man/man4/syscons.4,v 1.47 2009/09/12 00:12:47 delphij Exp $ .\" -.Dd October 22, 2006 +.Dd September 11, 2009 .Dt SYSCONS 4 .Os .Sh NAME @@ -61,6 +61,7 @@ In .Pa /boot/device.hints : .Cd hint.sc.0.at="isa" +.Cd hint.sc.0.vesa_mode=0x103 .Sh DESCRIPTION The .Nm @@ -325,7 +326,7 @@ most other systems, and it adds substantial amount of code to syscons. If this option is NOT defined, you can reduce the kernel size a lot. See the -.Dv VESA800X600 +.Dv VESAMODE flag below. .It Dv SC_TWOBUTTON_MOUSE If you have a two button mouse, you may want to add this option @@ -426,15 +427,18 @@ .\".It bit 6 (QUIET_BELL) .\"This option suppresses the bell, whether audible or visual, .\"if it is rung in a background virtual terminal. -.It 0x0080 (VESA800X600) -This option puts the video card in the VESA 800x600 pixel, 16 color -mode. -It may be useful for laptop computers for which the 800x600 mode -is otherwise unsupported by the X server. +.It 0x0080 (VESAMODE) +This option puts the video card in the VESA mode specified by +.Pa /boot/device.hints +variable +.Va vesa_mode +during kernel initialization. Note that in order for this flag to work, the kernel must be compiled with the .Dv SC_PIXEL_MODE option explained above. +A list of the available mode can be obtained via +.Xr vidcontrol 1 . .\"Note also that the ``copy-and-paste'' function is not currently supported .\"in this mode and the mouse pointer will not be displayed. .It 0x0100 (AUTODETECT_KBD) ==== //depot/projects/vimage/src/share/man/man4/textdump.4#4 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/textdump.4,v 1.7 2009/04/11 22:39:38 kientzle Exp $ +.\" $FreeBSD: src/share/man/man4/textdump.4,v 1.8 2009/09/12 01:37:22 des Exp $ .\" .Dd December 24, 2008 .Dt textdump 4 @@ -138,7 +138,7 @@ reboot: .Bd -literal -offset indent script kdb.enter.panic=textdump set; capture on; show allpcpu; bt; - ps; alltrace; show alllock; call doadump; reset + ps; alltrace; show alllocks; call doadump; reset .Ed .Pp In the following example, the script ==== //depot/projects/vimage/src/share/man/man5/device.hints.5#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" (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/share/man/man5/device.hints.5,v 1.10 2003/09/19 22:27:54 jb Exp $ +.\" $FreeBSD: src/share/man/man5/device.hints.5,v 1.11 2009/09/12 00:28:05 delphij Exp $ .\" -.Dd October 7, 2001 +.Dd September 11, 2009 .Dt DEVICE.HINTS 5 .Os .Sh NAME @@ -112,7 +112,8 @@ .El .Pp A device driver may require one or more hint lines with these keywords, -and may accept other keywords not listed here. +and may accept other keywords not listed here, through +.Xr resource_int_value 9 . Consult individual device drivers' manual pages for available keywords and their possible values. .\" .Sh CONTROL VARIABLES @@ -160,7 +161,8 @@ .Sh SEE ALSO .Xr kenv 1 , .Xr loader.conf 5 , -.Xr loader 8 +.Xr loader 8, +.Xr resource_int_value 9 . .Sh HISTORY The .Nm ==== //depot/projects/vimage/src/share/man/man5/rc.conf.5#10 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.361 2009/08/25 19:07:26 delphij Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.362 2009/09/12 22:22:31 hrs Exp $ .\" -.Dd August 25, 2009 +.Dd September 2, 2009 .Dt RC.CONF 5 .Os .Sh NAME @@ -344,11 +344,6 @@ .Xr dhclient 8 is used to set the hostname via DHCP, this variable should be set to an empty string. -.It Va ipv6_enable -.Pq Vt bool -Enable support for IPv6 networking. -Note that this requires that the kernel has been compiled with -.Cd "options INET6" . .It Va nisdomainname .Pq Vt str The NIS domain name of this host, or @@ -1251,28 +1246,45 @@ Instead of setting the ifconfig variables as .Va ifconfig_ Ns Aq Ar interface they should be set as -.Va ipv6_ifconfig_ Ns Aq Ar interface . +.Va ifconfig_ Ns Ao Ar interface Ac Ns _ipv6. Aliases should be set as -.Va ipv6_ifconfig_ Ns Ao Ar interface Ac Ns Va _alias Ns Aq Ar n . +.Va ifconfig_ Ns Ao Ar interface Ac Ns Va _alias Ns Aq Ar n . .Va ipv6_prefix_ Ns Aq Ar interface does something. -Interfaces that do not have a -.Va ipv6_ifconfig_ Ns Aq Ar interface -setting will be auto configured by +Interfaces that have a +.Fl accept_rtadv +flag in +.Va ifconfig_ Ns Ao Ar interface Ac Ns _ipv6 +setting will be automatically configured by .Xr rtsol 8 if the .Va ipv6_gateway_enable is set to .Dq Li NO . -Note that the IPv6 networking code does not support the -.Pa /etc/start_if. Ns Aq Ar interface -files. .It Va ipv6_default_interface .Pq Vt str If not set to .Dq Li NO , this is the default output interface for scoped addresses. Now this works only for IPv6 link local multicast addresses. +.It Va ip6addrctl_enable +.Pq Vt bool +If set to +.Dq Li YES , +install default address selection policy table +.Pq RFC 3484 . +If a file +.Pa /etc/ip6addrctl.conf +is found the +.Xr ip6addrctl 8 +reads and installs it. +If not, a pre-defined policy table will be installed. +There are two pre-defined ones; IPv4-preferred and IPv6-preferred. +If set +.Va ipv6_prefer +variable to +.Dq Li YES +the IPv6-preferred one is used. Default is IPv4-preferred. .It Va cloned_interfaces .Pq Vt str Set to the list of clonable network interfaces to create on this host. @@ -2300,48 +2312,48 @@ .Pq Vt bool The IPv6 equivalent of .Va gateway_enable . -.It Va router_enable +.It Va routed_enable .Pq Vt bool If set to .Dq Li YES , run a routing daemon of some sort, based on the settings of -.Va router +.Va routed_program and -.Va router_flags . -.It Va ipv6_router_enable +.Va routed_flags . +.It Va route6d_enable .Pq Vt bool The IPv6 equivalent of -.Va router_enable . +.Va routed_enable . If set to .Dq Li YES , run a routing daemon of some sort, based on the settings of -.Va ipv6_router +.Va route6d_program and -.Va ipv6_router_flags . -.It Va router +.Va route6d_flags . +.It Va routed_program .Pq Vt str If -.Va router_enable +.Va routed_enable is set to .Dq Li YES , this is the name of the routing daemon to use. -.It Va ipv6_router +.It Va route6d_program .Pq Vt str The IPv6 equivalent of -.Va router . -.It Va router_flags +.Va routed_program . +.It Va routed_flags .Pq Vt str If -.Va router_enable +.Va routed_enable is set to .Dq Li YES , these are the flags to pass to the routing daemon. -.It Va ipv6_router_flags +.It Va route6d_flags .Pq Vt str The IPv6 equivalent of -.Va router_flags . +.Va routed_flags . .It Va mrouted_enable .Pq Vt bool If set to ==== //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#18 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.174 2009/06/30 11:16:32 avg Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.175 2009/09/10 17:27:36 jkim Exp $"); #include "opt_cpu.h" @@ -371,21 +371,21 @@ switch (cpu_vendor_id) { case CPU_VENDOR_AMD: if ((amd_pminfo & AMDPM_TSC_INVARIANT) || - AMD64_CPU_FAMILY(cpu_id) >= 0x10 || + CPUID_TO_FAMILY(cpu_id) >= 0x10 || cpu_id == 0x60fb2) tsc_is_invariant = 1; break; case CPU_VENDOR_INTEL: if ((amd_pminfo & AMDPM_TSC_INVARIANT) || - (AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xe) || - (AMD64_CPU_FAMILY(cpu_id) == 0xf && - AMD64_CPU_MODEL(cpu_id) >= 0x3)) + (CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xe) || + (CPUID_TO_FAMILY(cpu_id) == 0xf && + CPUID_TO_MODEL(cpu_id) >= 0x3)) tsc_is_invariant = 1; break; case CPU_VENDOR_CENTAUR: - if (AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xf && + if (CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xf && (rdmsr(0x1203) & 0x100000000ULL) == 0) tsc_is_invariant = 1; break; ==== //depot/projects/vimage/src/sys/amd64/amd64/initcpu.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.54 2009/07/22 14:32:38 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.55 2009/09/10 17:27:36 jkim Exp $"); #include "opt_cpu.h" @@ -154,8 +154,8 @@ pg_nx = PG_NX; } if (cpu_vendor_id == CPU_VENDOR_CENTAUR && - AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xf) + CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xf) init_via(); /* ==== //depot/projects/vimage/src/sys/amd64/amd64/msi.c#12 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.14 2009/07/06 18:23:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.15 2009/09/10 17:27:36 jkim Exp $"); #include #include @@ -275,8 +275,8 @@ case CPU_VENDOR_AMD: break; case CPU_VENDOR_CENTAUR: - if (AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xf) + if (CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xf) break; /* FALLTHROUGH */ default: ==== //depot/projects/vimage/src/sys/amd64/include/specialreg.h#16 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.55 2009/05/13 17:53:04 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.56 2009/09/10 17:27:36 jkim Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -168,10 +168,10 @@ #define CPUID_FAMILY 0x00000f00 #define CPUID_EXT_MODEL 0x000f0000 #define CPUID_EXT_FAMILY 0x0ff00000 -#define AMD64_CPU_MODEL(id) \ +#define CPUID_TO_MODEL(id) \ ((((id) & CPUID_MODEL) >> 4) | \ (((id) & CPUID_EXT_MODEL) >> 12)) -#define AMD64_CPU_FAMILY(id) \ +#define CPUID_TO_FAMILY(id) \ ((((id) & CPUID_FAMILY) >> 8) + \ (((id) & CPUID_EXT_FAMILY) >> 20)) ==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_proto.h#10 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.39 2008/11/29 14:57:58 kib Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.40 2009/09/10 13:20:27 des Exp $ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib */ @@ -1257,6 +1257,13 @@ #endif /* COMPAT_FREEBSD6 */ + +#ifdef COMPAT_FREEBSD7 + +#define nosys linux_nosys + +#endif /* COMPAT_FREEBSD7 */ + #define LINUX_SYS_AUE_linux_fork AUE_FORK #define LINUX_SYS_AUE_linux_open AUE_OPEN_RWTC #define LINUX_SYS_AUE_linux_waitpid AUE_WAIT4 ==== //depot/projects/vimage/src/sys/boot/i386/libi386/pxe.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/pxe.c,v 1.23 2007/10/12 17:09:43 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/pxe.c,v 1.24 2009/09/10 22:05:43 emaste Exp $"); #include #include @@ -282,7 +282,7 @@ bootp(pxe_sock, BOOTP_PXE); if (rootip.s_addr == 0) rootip.s_addr = bootplayer.sip; - if (!rootpath[1]) + if (!rootpath[0]) strcpy(rootpath, PXENFSROOTPATH); for (i = 0; rootpath[i] != '\0' && i < FNAME_SIZE; i++) ==== //depot/projects/vimage/src/sys/boot/pc98/Makefile.inc#4 (text+ko) ==== @@ -1,10 +1,10 @@ # Common defines for all of /sys/boot/pc98/ # -# $FreeBSD: src/sys/boot/pc98/Makefile.inc,v 1.8 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/pc98/Makefile.inc,v 1.9 2009/09/13 11:20:17 nyan Exp $ BINDIR?= /boot -LOADER_ADDRESS?=0x100000 +LOADER_ADDRESS?=0x200000 CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 \ -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \ -Os ==== //depot/projects/vimage/src/sys/cam/scsi/scsi_target.c#9 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.78 2009/06/25 18:46:30 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.79 2009/09/12 20:03:45 rwatson Exp $"); #include @@ -103,8 +103,11 @@ static d_kqfilter_t targkqfilter; static void targreadfiltdetach(struct knote *kn); static int targreadfilt(struct knote *kn, long hint); -static struct filterops targread_filtops = - { 1, NULL, targreadfiltdetach, targreadfilt }; +static struct filterops targread_filtops = { + .f_isfd = 1, + .f_detach = targreadfiltdetach, + .f_event = targreadfilt, +}; static struct cdevsw targ_cdevsw = { .d_version = D_VERSION, ==== //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 (text+ko) ==== @@ -231,8 +231,27 @@ /* * Convert between znode pointers and vnode pointers */ +#ifdef DEBUG +static __inline vnode_t * +ZTOV(znode_t *zp) +{ + vnode_t *vp = zp->z_vnode; + + ASSERT(vp == NULL || vp->v_data == NULL || vp->v_data == zp); + return (vp); +} +static __inline znode_t * +VTOZ(vnode_t *vp) +{ + znode_t *zp = (znode_t *)vp->v_data; + + ASSERT(zp == NULL || zp->z_vnode == NULL || zp->z_vnode == vp); + return (zp); +} +#else #define ZTOV(ZP) ((ZP)->z_vnode) #define VTOZ(VP) ((znode_t *)(VP)->v_data) +#endif /* * ZFS_ENTER() is called on entry to each ZFS vnode and vfs operation. ==== //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 (text+ko) ==== @@ -181,10 +181,11 @@ return (0); } -static void +static int mze_insert(zap_t *zap, int chunkid, uint64_t hash, mzap_ent_phys_t *mzep) { mzap_ent_t *mze; + avl_index_t idx; ASSERT(zap->zap_ismicro); ASSERT(RW_WRITE_HELD(&zap->zap_rwlock)); @@ -194,7 +195,12 @@ mze->mze_chunkid = chunkid; mze->mze_hash = hash; mze->mze_phys = *mzep; - avl_add(&zap->zap_m.zap_avl, mze); + if (avl_find(&zap->zap_m.zap_avl, mze, &idx) != NULL) { + kmem_free(mze, sizeof (mzap_ent_t)); + return (EEXIST); + } + avl_insert(&zap->zap_m.zap_avl, mze, idx); + return (0); } static mzap_ent_t * @@ -329,10 +335,15 @@ if (mze->mze_name[0]) { zap_name_t *zn; - zap->zap_m.zap_num_entries++; zn = zap_name_alloc(zap, mze->mze_name, MT_EXACT); - mze_insert(zap, i, zn->zn_hash, mze); + if (mze_insert(zap, i, zn->zn_hash, mze) == 0) + zap->zap_m.zap_num_entries++; + else { + printf("ZFS WARNING: Duplicated ZAP " + "entry detected (%s).", + mze->mze_name); + } zap_name_free(zn); } } @@ -771,7 +782,7 @@ if (zap->zap_m.zap_alloc_next == zap->zap_m.zap_num_chunks) zap->zap_m.zap_alloc_next = 0; - mze_insert(zap, i, zn->zn_hash, mze); + VERIFY(0 == mze_insert(zap, i, zn->zn_hash, mze)); return; } } ==== //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#8 (text+ko) ==== @@ -947,6 +947,18 @@ zfsvfs->z_unmounted = B_TRUE; rrw_exit(&zfsvfs->z_teardown_lock, FTAG); rw_exit(&zfsvfs->z_teardown_inactive_lock); + +#ifdef __FreeBSD__ + /* + * Some znodes might not be fully reclaimed, wait for them. + */ + mutex_enter(&zfsvfs->z_znodes_lock); + while (list_head(&zfsvfs->z_all_znodes) != NULL) { + msleep(zfsvfs, &zfsvfs->z_znodes_lock, 0, + "zteardown", 0); + } + mutex_exit(&zfsvfs->z_znodes_lock); +#endif } /* @@ -1137,6 +1149,8 @@ credanonp, numsecflavors, secflavors)); } +CTASSERT(SHORT_FID_LEN <= sizeof(struct fid)); +CTASSERT(LONG_FID_LEN <= sizeof(struct fid)); static int zfs_fhtovp(vfs_t *vfsp, fid_t *fidp, vnode_t **vpp) ==== //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#16 (text+ko) ==== @@ -1185,8 +1185,6 @@ } } - ZFS_EXIT(zfsvfs); - /* Translate errors and add SAVENAME when needed. */ if (cnp->cn_flags & ISLASTCN) { switch (nameiop) { @@ -1217,6 +1215,7 @@ if (error != 0) { VN_RELE(*vpp); *vpp = NULL; + ZFS_EXIT(zfsvfs); return (error); } } @@ -1238,6 +1237,8 @@ } #endif + ZFS_EXIT(zfsvfs); + return (error); } @@ -4343,11 +4344,20 @@ znode_t *zp = arg; zfsvfs_t *zfsvfs = zp->z_zfsvfs; - ZFS_LOG(1, "zp=%p", zp); - ZFS_OBJ_HOLD_ENTER(zfsvfs, zp->z_id); - zfs_znode_dmu_fini(zp); - ZFS_OBJ_HOLD_EXIT(zfsvfs, zp->z_id); + rw_enter(&zfsvfs->z_teardown_inactive_lock, RW_READER); + if (zp->z_dbuf != NULL) { + ZFS_OBJ_HOLD_ENTER(zfsvfs, zp->z_id); + zfs_znode_dmu_fini(zp); + ZFS_OBJ_HOLD_EXIT(zfsvfs, zp->z_id); + } zfs_znode_free(zp); + rw_exit(&zfsvfs->z_teardown_inactive_lock); + /* + * If the file system is being unmounted, there is a process waiting + * for us, wake it up. + */ + if (zfsvfs->z_unmounted) + wakeup_one(zfsvfs); } static int @@ -4359,6 +4369,9 @@ { vnode_t *vp = ap->a_vp; znode_t *zp = VTOZ(vp); + zfsvfs_t *zfsvfs = zp->z_zfsvfs; + + rw_enter(&zfsvfs->z_teardown_inactive_lock, RW_READER); ASSERT(zp != NULL); @@ -4369,7 +4382,7 @@ mutex_enter(&zp->z_lock); ASSERT(zp->z_phys != NULL); - ZTOV(zp) = NULL; + zp->z_vnode = NULL; mutex_exit(&zp->z_lock); if (zp->z_unlinked) @@ -4377,7 +4390,6 @@ else if (zp->z_dbuf == NULL) zfs_znode_free(zp); else /* if (!zp->z_unlinked && zp->z_dbuf != NULL) */ { - zfsvfs_t *zfsvfs = zp->z_zfsvfs; int locked; locked = MUTEX_HELD(ZFS_OBJ_MUTEX(zfsvfs, zp->z_id)) ? 2 : @@ -4400,6 +4412,7 @@ vp->v_data = NULL; ASSERT(vp->v_holdcnt >= 1); VI_UNLOCK(vp); + rw_exit(&zfsvfs->z_teardown_inactive_lock); return (0); } ==== //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#8 (text+ko) ==== @@ -110,7 +110,7 @@ mutex_exit(&zp->z_lock); zfs_znode_free(zp); } else if (vp->v_count == 0) { - ZTOV(zp) = NULL; + zp->z_vnode = NULL; vhold(vp); mutex_exit(&zp->z_lock); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread); @@ -890,8 +890,16 @@ if (zp->z_unlinked) { err = ENOENT; } else { - if (ZTOV(zp) != NULL) - VN_HOLD(ZTOV(zp)); + if ((vp = ZTOV(zp)) != NULL) { + VI_LOCK(vp); + if ((vp->v_iflag & VI_DOOMED) != 0) { + VI_UNLOCK(vp); + vp = NULL; + } else + VI_UNLOCK(vp); + } + if (vp != NULL) + VN_HOLD(vp); else { if (first) { ZFS_LOG(1, "dying znode detected (zp=%p)", zp); @@ -1525,7 +1533,7 @@ ZTOV(rootzp)->v_data = NULL; ZTOV(rootzp)->v_count = 0; ZTOV(rootzp)->v_holdcnt = 0; - ZTOV(rootzp) = NULL; + rootzp->z_vnode = NULL; VOP_UNLOCK(vp, 0); vdestroy(vp); dmu_buf_rele(rootzp->z_dbuf, NULL); ==== //depot/projects/vimage/src/sys/compat/svr4/svr4_proto.h#3 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.29 2009/05/08 20:16:04 ed Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.30 2009/09/10 13:20:27 des Exp $ * created from FreeBSD: head/sys/compat/svr4/syscalls.master 160798 2006-07-28 19:05:28Z jhb */ @@ -503,6 +503,12 @@ #endif /* COMPAT_FREEBSD6 */ + +#ifdef COMPAT_FREEBSD7 + + +#endif /* COMPAT_FREEBSD7 */ + #define SVR4_SYS_AUE_svr4_sys_open AUE_NULL #define SVR4_SYS_AUE_svr4_sys_wait AUE_NULL #define SVR4_SYS_AUE_svr4_sys_creat AUE_NULL ==== //depot/projects/vimage/src/sys/conf/files#79 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1463 2009/09/09 05:53:26 delphij Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1464 2009/09/11 22:49:34 jkim Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -220,6 +220,7 @@ contrib/dev/acpica/namespace/nsobject.c optional acpi contrib/dev/acpica/namespace/nsparse.c optional acpi contrib/dev/acpica/namespace/nspredef.c optional acpi +contrib/dev/acpica/namespace/nsrepair.c optional acpi contrib/dev/acpica/namespace/nssearch.c optional acpi contrib/dev/acpica/namespace/nsutils.c optional acpi contrib/dev/acpica/namespace/nswalk.c optional acpi @@ -260,6 +261,7 @@ contrib/dev/acpica/utilities/utdelete.c optional acpi contrib/dev/acpica/utilities/uteval.c optional acpi contrib/dev/acpica/utilities/utglobal.c optional acpi +contrib/dev/acpica/utilities/utids.c optional acpi contrib/dev/acpica/utilities/utinit.c optional acpi contrib/dev/acpica/utilities/utlock.c optional acpi contrib/dev/acpica/utilities/utmath.c optional acpi ==== //depot/projects/vimage/src/sys/contrib/dev/acpica/acpica_prep.sh#4 (text+ko) ==== @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: src/sys/contrib/dev/acpica/acpica_prep.sh,v 1.11 2009/06/05 18:43:13 jkim Exp $ +# $FreeBSD: src/sys/contrib/dev/acpica/acpica_prep.sh,v 1.12 2009/09/11 22:48:53 jkim Exp $ # # Unpack an ACPI CA drop and restructure it to fit the FreeBSD layout # @@ -21,7 +21,7 @@ # files to remove stripdirs="acpisrc acpixtract examples generate os_specific" stripfiles="Makefile README acintel.h aclinux.h acmsvc.h acnetbsd.h \ - acos2.h accygwin.h acefi.h actbl2.h acwin.h acwin64.h aeexec.c \ + acos2.h accygwin.h acefi.h acwin.h acwin64.h aeexec.c \ aehandlers.c aemain.c aetables.c osunixdir.c readme.txt \ utclib.c" @@ -31,8 +31,8 @@ aclocal.h acmacros.h acnames.h acnamesp.h acobject.h acopcode.h \ acoutput.h acparser.h acpi.h acpiosxf.h acpixf.h acpredef.h \ acresrc.h acrestyp.h acstruct.h actables.h actbl.h actbl1.h \ - actypes.h acutils.h amlcode.h amlresrc.h platform/acenv.h \ - platform/acfreebsd.h platform/acgcc.h" + actbl2.h actypes.h acutils.h amlcode.h amlresrc.h \ + platform/acenv.h platform/acfreebsd.h platform/acgcc.h" comp_headers="aslcompiler.h asldefine.h aslglobal.h asltypes.h" platform_headers="acfreebsd.h acgcc.h" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Sep 13 21:56:07 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8A9F1065679; Sun, 13 Sep 2009 21:56: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 8C58A106566C for ; Sun, 13 Sep 2009 21:56:07 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7A00C8FC3E for ; Sun, 13 Sep 2009 21:56:07 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8DLu7Gk089389 for ; Sun, 13 Sep 2009 21:56:07 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8DLu7fa089387 for perforce@freebsd.org; Sun, 13 Sep 2009 21:56:07 GMT (envelope-from zec@fer.hr) Date: Sun, 13 Sep 2009 21:56:07 GMT Message-Id: <200909132156.n8DLu7fa089387@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 168519 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Sep 2009 21:56:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=168519 Change 168519 by zec@zec_tpx32 on 2009/09/13 21:55:18 IFC @ 168505 gone bad... Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/identcpu.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/initcpu.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/msi.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/specialreg.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_proto.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/pxe.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/boot/pc98/Makefile.inc#3 integrate .. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_target.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_proto.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#51 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acpica_prep.sh#3 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/changes.txt#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/common/dmrestag.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/common/dmtable.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/common/dmtbdump.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/common/dmtbinfo.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#3 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#3 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/asldefine.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslfiles.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslglobal.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslload.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/asllookup.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslmain.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslmap.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslstubs.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/asltypes.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/actbl2.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/namespace/nsrepair.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utilities/utids.c#1 branch Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/identcpu.c#11 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.174 2009/06/30 11:16:32 avg Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.175 2009/09/10 17:27:36 jkim Exp $"); #include "opt_cpu.h" @@ -371,21 +371,21 @@ switch (cpu_vendor_id) { case CPU_VENDOR_AMD: if ((amd_pminfo & AMDPM_TSC_INVARIANT) || - AMD64_CPU_FAMILY(cpu_id) >= 0x10 || + CPUID_TO_FAMILY(cpu_id) >= 0x10 || cpu_id == 0x60fb2) tsc_is_invariant = 1; break; case CPU_VENDOR_INTEL: if ((amd_pminfo & AMDPM_TSC_INVARIANT) || - (AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xe) || - (AMD64_CPU_FAMILY(cpu_id) == 0xf && - AMD64_CPU_MODEL(cpu_id) >= 0x3)) + (CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xe) || + (CPUID_TO_FAMILY(cpu_id) == 0xf && + CPUID_TO_MODEL(cpu_id) >= 0x3)) tsc_is_invariant = 1; break; case CPU_VENDOR_CENTAUR: - if (AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xf && + if (CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xf && (rdmsr(0x1203) & 0x100000000ULL) == 0) tsc_is_invariant = 1; break; ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/initcpu.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.54 2009/07/22 14:32:38 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.55 2009/09/10 17:27:36 jkim Exp $"); #include "opt_cpu.h" @@ -154,8 +154,8 @@ pg_nx = PG_NX; } if (cpu_vendor_id == CPU_VENDOR_CENTAUR && - AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xf) + CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xf) init_via(); /* ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/msi.c#7 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.14 2009/07/06 18:23:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.15 2009/09/10 17:27:36 jkim Exp $"); #include #include @@ -275,8 +275,8 @@ case CPU_VENDOR_AMD: break; case CPU_VENDOR_CENTAUR: - if (AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xf) + if (CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xf) break; /* FALLTHROUGH */ default: ==== //depot/projects/vimage-commit2/src/sys/amd64/include/specialreg.h#9 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.55 2009/05/13 17:53:04 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.56 2009/09/10 17:27:36 jkim Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -168,10 +168,10 @@ #define CPUID_FAMILY 0x00000f00 #define CPUID_EXT_MODEL 0x000f0000 #define CPUID_EXT_FAMILY 0x0ff00000 -#define AMD64_CPU_MODEL(id) \ +#define CPUID_TO_MODEL(id) \ ((((id) & CPUID_MODEL) >> 4) | \ (((id) & CPUID_EXT_MODEL) >> 12)) -#define AMD64_CPU_FAMILY(id) \ +#define CPUID_TO_FAMILY(id) \ ((((id) & CPUID_FAMILY) >> 8) + \ (((id) & CPUID_EXT_FAMILY) >> 20)) ==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_proto.h#4 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.39 2008/11/29 14:57:58 kib Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.40 2009/09/10 13:20:27 des Exp $ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib */ @@ -1257,6 +1257,13 @@ #endif /* COMPAT_FREEBSD6 */ + +#ifdef COMPAT_FREEBSD7 + +#define nosys linux_nosys + +#endif /* COMPAT_FREEBSD7 */ + #define LINUX_SYS_AUE_linux_fork AUE_FORK #define LINUX_SYS_AUE_linux_open AUE_OPEN_RWTC #define LINUX_SYS_AUE_linux_waitpid AUE_WAIT4 ==== //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/pxe.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/pxe.c,v 1.23 2007/10/12 17:09:43 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/pxe.c,v 1.24 2009/09/10 22:05:43 emaste Exp $"); #include #include @@ -282,7 +282,7 @@ bootp(pxe_sock, BOOTP_PXE); if (rootip.s_addr == 0) rootip.s_addr = bootplayer.sip; - if (!rootpath[1]) + if (!rootpath[0]) strcpy(rootpath, PXENFSROOTPATH); for (i = 0; rootpath[i] != '\0' && i < FNAME_SIZE; i++) ==== //depot/projects/vimage-commit2/src/sys/boot/pc98/Makefile.inc#3 (text+ko) ==== @@ -1,10 +1,10 @@ # Common defines for all of /sys/boot/pc98/ # -# $FreeBSD: src/sys/boot/pc98/Makefile.inc,v 1.8 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/pc98/Makefile.inc,v 1.9 2009/09/13 11:20:17 nyan Exp $ BINDIR?= /boot -LOADER_ADDRESS?=0x100000 +LOADER_ADDRESS?=0x200000 CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 \ -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \ -Os ==== //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_target.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.78 2009/06/25 18:46:30 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.79 2009/09/12 20:03:45 rwatson Exp $"); #include @@ -103,8 +103,11 @@ static d_kqfilter_t targkqfilter; static void targreadfiltdetach(struct knote *kn); static int targreadfilt(struct knote *kn, long hint); -static struct filterops targread_filtops = - { 1, NULL, targreadfiltdetach, targreadfilt }; +static struct filterops targread_filtops = { + .f_isfd = 1, + .f_detach = targreadfiltdetach, + .f_event = targreadfilt, +}; static struct cdevsw targ_cdevsw = { .d_version = D_VERSION, ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 (text+ko) ==== @@ -231,8 +231,27 @@ /* * Convert between znode pointers and vnode pointers */ +#ifdef DEBUG +static __inline vnode_t * +ZTOV(znode_t *zp) +{ + vnode_t *vp = zp->z_vnode; + + ASSERT(vp == NULL || vp->v_data == NULL || vp->v_data == zp); + return (vp); +} +static __inline znode_t * +VTOZ(vnode_t *vp) +{ + znode_t *zp = (znode_t *)vp->v_data; + + ASSERT(zp == NULL || zp->z_vnode == NULL || zp->z_vnode == vp); + return (zp); +} +#else #define ZTOV(ZP) ((ZP)->z_vnode) #define VTOZ(VP) ((znode_t *)(VP)->v_data) +#endif /* * ZFS_ENTER() is called on entry to each ZFS vnode and vfs operation. ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 (text+ko) ==== @@ -181,10 +181,11 @@ return (0); } -static void +static int mze_insert(zap_t *zap, int chunkid, uint64_t hash, mzap_ent_phys_t *mzep) { mzap_ent_t *mze; + avl_index_t idx; ASSERT(zap->zap_ismicro); ASSERT(RW_WRITE_HELD(&zap->zap_rwlock)); @@ -194,7 +195,12 @@ mze->mze_chunkid = chunkid; mze->mze_hash = hash; mze->mze_phys = *mzep; - avl_add(&zap->zap_m.zap_avl, mze); + if (avl_find(&zap->zap_m.zap_avl, mze, &idx) != NULL) { + kmem_free(mze, sizeof (mzap_ent_t)); + return (EEXIST); + } + avl_insert(&zap->zap_m.zap_avl, mze, idx); + return (0); } static mzap_ent_t * @@ -329,10 +335,15 @@ if (mze->mze_name[0]) { zap_name_t *zn; - zap->zap_m.zap_num_entries++; zn = zap_name_alloc(zap, mze->mze_name, MT_EXACT); - mze_insert(zap, i, zn->zn_hash, mze); + if (mze_insert(zap, i, zn->zn_hash, mze) == 0) + zap->zap_m.zap_num_entries++; + else { + printf("ZFS WARNING: Duplicated ZAP " + "entry detected (%s).", + mze->mze_name); + } zap_name_free(zn); } } @@ -771,7 +782,7 @@ if (zap->zap_m.zap_alloc_next == zap->zap_m.zap_num_chunks) zap->zap_m.zap_alloc_next = 0; - mze_insert(zap, i, zn->zn_hash, mze); + VERIFY(0 == mze_insert(zap, i, zn->zn_hash, mze)); return; } } ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#8 (text+ko) ==== @@ -947,6 +947,18 @@ zfsvfs->z_unmounted = B_TRUE; rrw_exit(&zfsvfs->z_teardown_lock, FTAG); rw_exit(&zfsvfs->z_teardown_inactive_lock); + +#ifdef __FreeBSD__ + /* + * Some znodes might not be fully reclaimed, wait for them. + */ + mutex_enter(&zfsvfs->z_znodes_lock); + while (list_head(&zfsvfs->z_all_znodes) != NULL) { + msleep(zfsvfs, &zfsvfs->z_znodes_lock, 0, + "zteardown", 0); + } + mutex_exit(&zfsvfs->z_znodes_lock); +#endif } /* @@ -1137,6 +1149,8 @@ credanonp, numsecflavors, secflavors)); } +CTASSERT(SHORT_FID_LEN <= sizeof(struct fid)); +CTASSERT(LONG_FID_LEN <= sizeof(struct fid)); static int zfs_fhtovp(vfs_t *vfsp, fid_t *fidp, vnode_t **vpp) ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#17 (text+ko) ==== @@ -1185,8 +1185,6 @@ } } - ZFS_EXIT(zfsvfs); - /* Translate errors and add SAVENAME when needed. */ if (cnp->cn_flags & ISLASTCN) { switch (nameiop) { @@ -1217,6 +1215,7 @@ if (error != 0) { VN_RELE(*vpp); *vpp = NULL; + ZFS_EXIT(zfsvfs); return (error); } } @@ -1238,6 +1237,8 @@ } #endif + ZFS_EXIT(zfsvfs); + return (error); } @@ -4343,11 +4344,20 @@ znode_t *zp = arg; zfsvfs_t *zfsvfs = zp->z_zfsvfs; - ZFS_LOG(1, "zp=%p", zp); - ZFS_OBJ_HOLD_ENTER(zfsvfs, zp->z_id); - zfs_znode_dmu_fini(zp); - ZFS_OBJ_HOLD_EXIT(zfsvfs, zp->z_id); + rw_enter(&zfsvfs->z_teardown_inactive_lock, RW_READER); + if (zp->z_dbuf != NULL) { + ZFS_OBJ_HOLD_ENTER(zfsvfs, zp->z_id); + zfs_znode_dmu_fini(zp); + ZFS_OBJ_HOLD_EXIT(zfsvfs, zp->z_id); + } zfs_znode_free(zp); + rw_exit(&zfsvfs->z_teardown_inactive_lock); + /* + * If the file system is being unmounted, there is a process waiting + * for us, wake it up. + */ + if (zfsvfs->z_unmounted) + wakeup_one(zfsvfs); } static int @@ -4359,6 +4369,9 @@ { vnode_t *vp = ap->a_vp; znode_t *zp = VTOZ(vp); + zfsvfs_t *zfsvfs = zp->z_zfsvfs; + + rw_enter(&zfsvfs->z_teardown_inactive_lock, RW_READER); ASSERT(zp != NULL); @@ -4369,7 +4382,7 @@ mutex_enter(&zp->z_lock); ASSERT(zp->z_phys != NULL); - ZTOV(zp) = NULL; + zp->z_vnode = NULL; mutex_exit(&zp->z_lock); if (zp->z_unlinked) @@ -4377,7 +4390,6 @@ else if (zp->z_dbuf == NULL) zfs_znode_free(zp); else /* if (!zp->z_unlinked && zp->z_dbuf != NULL) */ { - zfsvfs_t *zfsvfs = zp->z_zfsvfs; int locked; locked = MUTEX_HELD(ZFS_OBJ_MUTEX(zfsvfs, zp->z_id)) ? 2 : @@ -4400,6 +4412,7 @@ vp->v_data = NULL; ASSERT(vp->v_holdcnt >= 1); VI_UNLOCK(vp); + rw_exit(&zfsvfs->z_teardown_inactive_lock); return (0); } ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#8 (text+ko) ==== @@ -110,7 +110,7 @@ mutex_exit(&zp->z_lock); zfs_znode_free(zp); } else if (vp->v_count == 0) { - ZTOV(zp) = NULL; + zp->z_vnode = NULL; vhold(vp); mutex_exit(&zp->z_lock); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread); @@ -890,8 +890,16 @@ if (zp->z_unlinked) { err = ENOENT; } else { - if (ZTOV(zp) != NULL) - VN_HOLD(ZTOV(zp)); + if ((vp = ZTOV(zp)) != NULL) { + VI_LOCK(vp); + if ((vp->v_iflag & VI_DOOMED) != 0) { + VI_UNLOCK(vp); + vp = NULL; + } else + VI_UNLOCK(vp); + } + if (vp != NULL) + VN_HOLD(vp); else { if (first) { ZFS_LOG(1, "dying znode detected (zp=%p)", zp); @@ -1525,7 +1533,7 @@ ZTOV(rootzp)->v_data = NULL; ZTOV(rootzp)->v_count = 0; ZTOV(rootzp)->v_holdcnt = 0; - ZTOV(rootzp) = NULL; + rootzp->z_vnode = NULL; VOP_UNLOCK(vp, 0); vdestroy(vp); dmu_buf_rele(rootzp->z_dbuf, NULL); ==== //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_proto.h#3 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.29 2009/05/08 20:16:04 ed Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.30 2009/09/10 13:20:27 des Exp $ * created from FreeBSD: head/sys/compat/svr4/syscalls.master 160798 2006-07-28 19:05:28Z jhb */ @@ -503,6 +503,12 @@ #endif /* COMPAT_FREEBSD6 */ + +#ifdef COMPAT_FREEBSD7 + + +#endif /* COMPAT_FREEBSD7 */ + #define SVR4_SYS_AUE_svr4_sys_open AUE_NULL #define SVR4_SYS_AUE_svr4_sys_wait AUE_NULL #define SVR4_SYS_AUE_svr4_sys_creat AUE_NULL ==== //depot/projects/vimage-commit2/src/sys/conf/files#51 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1463 2009/09/09 05:53:26 delphij Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1464 2009/09/11 22:49:34 jkim Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -220,6 +220,7 @@ contrib/dev/acpica/namespace/nsobject.c optional acpi contrib/dev/acpica/namespace/nsparse.c optional acpi contrib/dev/acpica/namespace/nspredef.c optional acpi +contrib/dev/acpica/namespace/nsrepair.c optional acpi contrib/dev/acpica/namespace/nssearch.c optional acpi contrib/dev/acpica/namespace/nsutils.c optional acpi contrib/dev/acpica/namespace/nswalk.c optional acpi @@ -260,6 +261,7 @@ contrib/dev/acpica/utilities/utdelete.c optional acpi contrib/dev/acpica/utilities/uteval.c optional acpi contrib/dev/acpica/utilities/utglobal.c optional acpi +contrib/dev/acpica/utilities/utids.c optional acpi contrib/dev/acpica/utilities/utinit.c optional acpi contrib/dev/acpica/utilities/utlock.c optional acpi contrib/dev/acpica/utilities/utmath.c optional acpi ==== //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acpica_prep.sh#3 (text+ko) ==== @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: src/sys/contrib/dev/acpica/acpica_prep.sh,v 1.11 2009/06/05 18:43:13 jkim Exp $ +# $FreeBSD: src/sys/contrib/dev/acpica/acpica_prep.sh,v 1.12 2009/09/11 22:48:53 jkim Exp $ # # Unpack an ACPI CA drop and restructure it to fit the FreeBSD layout # @@ -21,7 +21,7 @@ # files to remove stripdirs="acpisrc acpixtract examples generate os_specific" stripfiles="Makefile README acintel.h aclinux.h acmsvc.h acnetbsd.h \ - acos2.h accygwin.h acefi.h actbl2.h acwin.h acwin64.h aeexec.c \ + acos2.h accygwin.h acefi.h acwin.h acwin64.h aeexec.c \ aehandlers.c aemain.c aetables.c osunixdir.c readme.txt \ utclib.c" @@ -31,8 +31,8 @@ aclocal.h acmacros.h acnames.h acnamesp.h acobject.h acopcode.h \ acoutput.h acparser.h acpi.h acpiosxf.h acpixf.h acpredef.h \ acresrc.h acrestyp.h acstruct.h actables.h actbl.h actbl1.h \ - actypes.h acutils.h amlcode.h amlresrc.h platform/acenv.h \ - platform/acfreebsd.h platform/acgcc.h" + actbl2.h actypes.h acutils.h amlcode.h amlresrc.h \ + platform/acenv.h platform/acfreebsd.h platform/acgcc.h" comp_headers="aslcompiler.h asldefine.h aslglobal.h asltypes.h" platform_headers="acfreebsd.h acgcc.h" ==== //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/changes.txt#2 (text+ko) ==== @@ -1,4 +1,227 @@ ---------------------------------------- +03 September 2009. Summary of changes for version 20090903: + +This release is available at www.acpica.org/downloads + +1) ACPI CA Core Subsystem: + +For Windows Vista compatibility, added the automatic execution of an _INI +method located at the namespace root (\_INI). This method is executed at +table load time. This support is in addition to the automatic execution of +\_SB._INI. Lin Ming. + +Fixed a possible memory leak in the interpreter for AML package objects if +the package initializer list is longer than the defined size of the package. +This apparently can only happen if the BIOS changes the package size on the +fly (seen in a _PSS object), as ASL compilers do not allow this. The +interpreter will truncate the package to the defined size (and issue an error +message), but previously could leave the extra objects undeleted if they were +pre-created during the argument processing (such is the case if the package +consists of a number of sub-packages as in the _PSS.) ACPICA BZ 805. + +Fixed a problem seen when a Buffer or String is stored to itself via ASL. +This has been reported in the field. Previously, ACPICA would zero out the +buffer/string. Now, the operation is treated as a noop. Provides Windows +compatibility. ACPICA BZ 803. Lin Ming. + +Removed an extraneous error message for ASL constructs of the form +Store(LocalX,LocalX) when LocalX is uninitialized. These curious statements +are seen in many BIOSs and are once again treated as NOOPs and no error is +emitted when they are encountered. ACPICA BZ 785. + +Fixed an extraneous warning message if a _DSM reserved method returns a +Package object. _DSM can return any type of object, so validation on the +return type cannot be performed. ACPICA BZ 802. + +Example Code and Data Size: These are the sizes for the OS-independent +acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The +debug version of the code includes the debug output trace mechanism and has a +much larger code and data size. + + Previous Release: + Non-Debug Version: 85.5K Code, 18.0K Data, 103.5K Total + Debug Version: 161.6K Code, 50.9K Data, 212.5K Total + Current Release: + Non-Debug Version: 85.6K Code, 18.0K Data, 103.6K Total + Debug Version: 161.7K Code, 50.9K Data, 212.6K Total + +2) iASL Compiler/Disassembler and Tools: + +iASL: Fixed a problem with the use of the Alias operator and Resource +Templates. The correct alias is now constructed and no error is emitted. +ACPICA BZ 738. + +iASL: Implemented the -I option to specify additional search directories for +include files. Allows multiple additional search paths for include files. +Directories are searched in the order specified on the command line (after +the local directory is searched.) ACPICA BZ 800. + +iASL: Fixed a problem where the full pathname for include files was not +emitted for warnings/errors. This caused the IDE support to not work +properly. ACPICA BZ 765. + +iASL: Implemented the -@ option to specify a Windows-style response file +containing additional command line options. ACPICA BZ 801. + +AcpiExec: Added support to load multiple AML files simultaneously (such as a +DSDT and multiple SSDTs). Also added support for wildcards within the AML +pathname. These features allow all machine tables to be easily loaded and +debugged together. ACPICA BZ 804. + +Disassembler: Added missing support for disassembly of HEST table Error Bank +subtables. + +---------------------------------------- +30 July 2009. Summary of changes for version 20090730: + +This release is available at www.acpica.org/downloads + +The ACPI 4.0 implementation for ACPICA is complete with this release. + +1) ACPI CA Core Subsystem: + +ACPI 4.0: Added header file support for all new and changed ACPI tables. +Completely new tables are: IBFT, IVRS, MSCT, and WAET. Tables that are new +for ACPI 4.0, but have previously been supported in ACPICA are: CPEP, BERT, +EINJ, ERST, and HEST. Other newly supported tables are: UEFI and WDAT. There +have been some ACPI 4.0 changes to other existing tables. Split the large +actbl1.h header into the existing actbl2.h header. ACPICA BZ 774. + +ACPI 4.0: Implemented predefined name validation for all new names. There are +31 new names in ACPI 4.0. The predefined validation module was split into two +files. The new file is namespace/nsrepair.c. ACPICA BZ 770. + +Implemented support for so-called "module-level executable code". This is +executable AML code that exists outside of any control method and is intended +to be executed at table load time. Although illegal since ACPI 2.0, this type +of code still exists and is apparently still being created. Blocks of this +code are now detected and executed as intended. Currently, the code blocks +must exist under either an If, Else, or While construct; these are the +typical cases seen in the field. ACPICA BZ 762. Lin Ming. + +Implemented an automatic dynamic repair for predefined names that return +nested Package objects. This applies to predefined names that are defined to +return a variable-length Package of sub-packages. If the number of sub- +packages is one, BIOS code is occasionally seen that creates a simple single +package with no sub-packages. This code attempts to fix the problem by +wrapping a new package object around the existing package. These methods can +be repaired: _ALR, _CSD, _HPX, _MLS, _PRT, _PSS, _TRT, and _TSS. ACPICA BZ +790. + +Fixed a regression introduced in 20090625 for the AcpiGetDevices interface. +The _HID/_CID matching was broken and no longer matched IDs correctly. ACPICA +BZ 793. + +Fixed a problem with AcpiReset where the reset would silently fail if the +register was one of the protected I/O ports. AcpiReset now bypasses the port +validation mechanism. This may eventually be driven into the AcpiRead/Write +interfaces. + +Fixed a regression related to the recent update of the AcpiRead/Write +interfaces. A sleep/suspend could fail if the optional PM2 Control register +does not exist during an attempt to write the Bus Master Arbitration bit. +(However, some hosts already delete the code that writes this bit, and the +code may in fact be obsolete at this date.) ACPICA BZ 799. + +Fixed a problem where AcpiTerminate could fault if inadvertently called twice +in succession. ACPICA BZ 795. + +Example Code and Data Size: These are the sizes for the OS-independent +acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The +debug version of the code includes the debug output trace mechanism and has a +much larger code and data size. + + Previous Release: + Non-Debug Version: 84.7K Code, 17.8K Data, 102.5K Total + Debug Version: 160.5K Code, 50.6K Data, 211.1K Total + Current Release: + Non-Debug Version: 85.5K Code, 18.0K Data, 103.5K Total + Debug Version: 161.6K Code, 50.9K Data, 212.5K Total + +2) iASL Compiler/Disassembler and Tools: + +ACPI 4.0: Implemented disassembler support for all new ACPI tables and +changes to existing tables. ACPICA BZ 775. + +---------------------------------------- +25 June 2009. Summary of changes for version 20090625: + +This release is available at www.acpica.org/downloads + +The ACPI 4.0 Specification was released on June 16 and is available at +www.acpi.info. ACPICA implementation of ACPI 4.0 is underway and will +continue for the next few releases. + +1) ACPI CA Core Subsystem: + +ACPI 4.0: Implemented interpreter support for the IPMI operation region +address space. Includes support for bi-directional data buffers and an IPMI +address space handler (to be installed by an IPMI device driver.) ACPICA BZ +773. Lin Ming. + +ACPI 4.0: Added changes for existing ACPI tables - FACS and SRAT. Includes +support in both the header files and the disassembler. + +Completed a major update for the AcpiGetObjectInfo external interface. +Changes include: + - Support for variable, unlimited length HID, UID, and CID strings. + - Support Processor objects the same as Devices (HID,UID,CID,ADR,STA, etc.) + - Call the _SxW power methods on behalf of a device object. + - Determine if a device is a PCI root bridge. + - Change the ACPI_BUFFER parameter to ACPI_DEVICE_INFO. +These changes will require an update to all callers of this interface. See +the updated ACPICA Programmer Reference for details. One new source file has +been added - utilities/utids.c. ACPICA BZ 368, 780. + +Updated the AcpiRead and AcpiWrite external interfaces to support 64-bit +transfers. The Value parameter has been extended from 32 bits to 64 bits in +order to support new ACPI 4.0 tables. These changes will require an update to +all callers of these interfaces. See the ACPICA Programmer Reference for +details. ACPICA BZ 768. + +Fixed several problems with AcpiAttachData. The handler was not invoked when +the host node was deleted. The data sub-object was not automatically deleted +when the host node was deleted. The interface to the handler had an unused +parameter, this was removed. ACPICA BZ 778. + +Enhanced the function that dumps ACPI table headers. All non-printable +characters in the string fields are now replaced with '?' (Signature, OemId, +OemTableId, and CompilerId.) ACPI tables with non-printable characters in +these fields are occasionally seen in the field. ACPICA BZ 788. + +Fixed a problem with predefined method repair code where the code that +attempts to repair/convert an object of incorrect type is only executed on +the first time the predefined method is called. The mechanism that disables +warnings on subsequent calls was interfering with the repair mechanism. +ACPICA BZ 781. + +Fixed a possible memory leak in the predefined validation/repair code when a +buffer is automatically converted to an expected string object. + +Removed obsolete 16-bit files from the distribution and from the current git +tree head. ACPICA BZ 776. + +Example Code and Data Size: These are the sizes for the OS-independent +acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The +debug version of the code includes the debug output trace mechanism and has a +much larger code and data size. + + Previous Release: + Non-Debug Version: 83.4K Code, 17.5K Data, 100.9K Total + Debug Version: 158.9K Code, 50.0K Data, 208.9K Total + Current Release: + Non-Debug Version: 84.7K Code, 17.8K Data, 102.5K Total + Debug Version: 160.5K Code, 50.6K Data, 211.1K Total + +2) iASL Compiler/Disassembler and Tools: + +ACPI 4.0: iASL and Disassembler - implemented support for the new IPMI +operation region keyword. ACPICA BZ 771, 772. Lin Ming. + +ACPI 4.0: iASL - implemented compile-time validation support for all new +predefined names and control methods (31 total). ACPICA BZ 769. + +---------------------------------------- 21 May 2009. Summary of changes for version 20090521: This release is available at www.acpica.org/downloads ==== //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/common/dmrestag.c#3 (text+ko) ==== @@ -387,7 +387,7 @@ static UINT32 AcpiGbl_NextResourceId = 0; static UINT8 AcpiGbl_NextPrefix = 0; -static UINT8 AcpiGbl_Prefix[ACPI_NUM_RES_PREFIX] = +static char AcpiGbl_Prefix[ACPI_NUM_RES_PREFIX] = {'Y','Z','J','K','X'}; ==== //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/common/dmtable.c#3 (text+ko) ==== @@ -132,6 +132,7 @@ static void AcpiDmCheckAscii ( UINT8 *Target, + char *RepairedName, UINT32 Count); UINT8 @@ -156,17 +157,18 @@ "Hardware Unit Definition", "Reserved Memory Region", "Root Port ATS Capability", + "Remapping Hardware Static Affinity", "Unknown SubTable Type" /* Reserved */ }; static const char *AcpiDmHestSubnames[] = { - "XPF Machine Check Exception", - "XPF Corrected Machine Check", - "NOT USED???", - "XPF Non-Maskable Interrupt", - "IPF Corrected Machine Check", - "IPF Corrected Platform Error", + "IA-32 Machine Check Exception", + "IA-32 Corrected Machine Check", + "IA-32 Non-Maskable Interrupt", + "Unknown SubTable Type", /* 3 - Reserved */ + "Unknown SubTable Type", /* 4 - Reserved */ + "Unknown SubTable Type", /* 5 - Reserved */ "PCI Express Root Port AER", "PCI Express AER (AER Endpoint)", "PCI Express/PCI-X Bridge AER", @@ -208,7 +210,15 @@ "Unknown SubTable Type" /* Reserved */ }; +static const char *AcpiDmIvrsSubnames[] = +{ + "Hardware Definition Block", + "Memory Definition Block", + "Unknown SubTable Type" /* Reserved */ +}; + + #define ACPI_FADT_PM_RESERVED 8 static const char *AcpiDmFadtProfiles[] = @@ -224,11 +234,12 @@ "Unknown Profile Type" }; - /******************************************************************************* * * ACPI Table Data, indexed by signature. * + * Each entry contains: Signature, Table Info, Handler, Description + * * Simple tables have only a TableInfo structure, complex tables have a handler. * This table must be NULL terminated. RSDP and FACS are special-cased * elsewhere. @@ -249,8 +260,10 @@ {ACPI_SIG_FADT, NULL, AcpiDmDumpFadt, "Fixed ACPI Description Table"}, {ACPI_SIG_HEST, NULL, AcpiDmDumpHest, "Hardware Error Source Table"}, {ACPI_SIG_HPET, AcpiDmTableInfoHpet, NULL, "High Precision Event Timer table"}, + {ACPI_SIG_IVRS, NULL, AcpiDmDumpIvrs, "I/O Virtualization Reporting Structure"}, {ACPI_SIG_MADT, NULL, AcpiDmDumpMadt, "Multiple APIC Description Table"}, {ACPI_SIG_MCFG, NULL, AcpiDmDumpMcfg, "Memory Mapped Configuration table"}, + {ACPI_SIG_MSCT, NULL, AcpiDmDumpMsct, "Maximum System Characteristics Table"}, {ACPI_SIG_RSDT, NULL, AcpiDmDumpRsdt, "Root System Description Table"}, {ACPI_SIG_SBST, AcpiDmTableInfoSbst, NULL, "Smart Battery Specification Table"}, {ACPI_SIG_SLIC, AcpiDmTableInfoSlic, NULL, "Software Licensing Description Table"}, @@ -259,6 +272,9 @@ {ACPI_SIG_SPMI, AcpiDmTableInfoSpmi, NULL, "Server Platform Management Interface table"}, {ACPI_SIG_SRAT, NULL, AcpiDmDumpSrat, "System Resource Affinity Table"}, {ACPI_SIG_TCPA, AcpiDmTableInfoTcpa, NULL, "Trusted Computing Platform Alliance table"}, + {ACPI_SIG_UEFI, AcpiDmTableInfoUefi, NULL, "UEFI Boot Optimization Table"}, + {ACPI_SIG_WAET, AcpiDmTableInfoWaet, NULL, "Windows ACPI Emulated Devices Table"}, + {ACPI_SIG_WDAT, NULL, AcpiDmDumpWdat, "Watchdog Action Table"}, {ACPI_SIG_WDRT, AcpiDmTableInfoWdrt, NULL, "Watchdog Resource Table"}, {ACPI_SIG_XSDT, NULL, AcpiDmDumpXsdt, "Extended System Description Table"}, {NULL, NULL, NULL, NULL} @@ -511,7 +527,9 @@ UINT8 Temp8; UINT16 Temp16; ACPI_DMTABLE_DATA *TableData; + const char *Name; BOOLEAN LastOutputBlankLine = FALSE; + char RepairedName[8]; if (!Info) @@ -547,6 +565,7 @@ case ACPI_DMT_UINT8: case ACPI_DMT_CHKSUM: case ACPI_DMT_SPACEID: + case ACPI_DMT_IVRS: case ACPI_DMT_MADT: case ACPI_DMT_SRAT: case ACPI_DMT_ASF: @@ -577,6 +596,9 @@ case ACPI_DMT_NAME8: ByteLength = 8; break; + case ACPI_DMT_BUF16: + ByteLength = 16; + break; case ACPI_DMT_STRING: ByteLength = ACPI_STRLEN (ACPI_CAST_PTR (char, Target)) + 1; break; @@ -677,17 +699,28 @@ ACPI_FORMAT_UINT64 (ACPI_GET64 (Target))); break; + case ACPI_DMT_BUF16: + + /* Buffer of length 16 */ + + for (Temp8 = 0; Temp8 < 16; Temp8++) + { + AcpiOsPrintf ("%2.2X,", Target[Temp8]); + } + AcpiOsPrintf ("\n"); + break; + case ACPI_DMT_STRING: - AcpiOsPrintf ("%s\n", ACPI_CAST_PTR (char, Target)); + AcpiOsPrintf ("\"%s\"\n", ACPI_CAST_PTR (char, Target)); break; /* Fixed length ASCII name fields */ case ACPI_DMT_SIG: - AcpiDmCheckAscii (Target, 4); - AcpiOsPrintf ("\"%4.4s\" ", Target); + AcpiDmCheckAscii (Target, RepairedName, 4); + AcpiOsPrintf ("\"%.4s\" ", RepairedName); TableData = AcpiDmGetTableData (ACPI_CAST_PTR (char, Target)); if (TableData) { @@ -698,20 +731,20 @@ case ACPI_DMT_NAME4: - AcpiDmCheckAscii (Target, 4); - AcpiOsPrintf ("\"%4.4s\"\n", Target); + AcpiDmCheckAscii (Target, RepairedName, 4); + AcpiOsPrintf ("\"%.4s\"\n", RepairedName); break; case ACPI_DMT_NAME6: - AcpiDmCheckAscii (Target, 6); - AcpiOsPrintf ("\"%6.6s\"\n", Target); + AcpiDmCheckAscii (Target, RepairedName, 6); + AcpiOsPrintf ("\"%.6s\"\n", RepairedName); break; case ACPI_DMT_NAME8: - AcpiDmCheckAscii (Target, 8); - AcpiOsPrintf ("\"%8.8s\"\n", Target); + AcpiDmCheckAscii (Target, RepairedName, 8); + AcpiOsPrintf ("\"%.8s\"\n", RepairedName); break; /* Special Data Types */ @@ -742,8 +775,8 @@ /* Generic Address Structure */ AcpiOsPrintf ("\n"); - AcpiDmDumpTable (ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Length, - CurrentOffset, Target, sizeof (ACPI_GENERIC_ADDRESS), AcpiDmTableInfoGas); + AcpiDmDumpTable (TableLength, CurrentOffset, Target, + sizeof (ACPI_GENERIC_ADDRESS), AcpiDmTableInfoGas); AcpiOsPrintf ("\n"); LastOutputBlankLine = TRUE; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Sep 13 22:05:18 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F6AF1065672; Sun, 13 Sep 2009 22:05: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 E69BB106566C for ; Sun, 13 Sep 2009 22:05:17 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D3F138FC0C for ; Sun, 13 Sep 2009 22:05:17 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8DM5HQ2091036 for ; Sun, 13 Sep 2009 22:05:17 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8DM5HsA091034 for perforce@freebsd.org; Sun, 13 Sep 2009 22:05:17 GMT (envelope-from zec@fer.hr) Date: Sun, 13 Sep 2009 22:05:17 GMT Message-Id: <200909132205.n8DM5HsA091034@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 168520 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Sep 2009 22:05:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=168520 Change 168520 by zec@zec_tpx32 on 2009/09/13 22:04:23 IFC @ 168505 part two Affected files ... .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#27 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dispatcher/dsfield.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dispatcher/dswload.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/events/evgpe.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/events/evrgnini.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exfield.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exfldio.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exstorob.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exutils.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/hardware/hwregs.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/hardware/hwtimer.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/hardware/hwxface.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acconfig.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acdebug.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acglobal.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/achware.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acinterp.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/aclocal.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acmacros.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acobject.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acparser.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acpixf.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acpredef.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/actbl.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/actbl1.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/actypes.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acutils.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/amlcode.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/namespace/nsload.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/namespace/nsxfname.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/parser/psloop.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/parser/psxface.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/tables/tbutils.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utilities/uteval.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utilities/utglobal.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utilities/utinit.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utilities/utxface.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_cpu.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_pcib_acpi.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp_i810.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/amdtemp/amdtemp.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_pciids.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/r600_blit.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_em.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_igb.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ichwd/ichwd.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pci_user.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pcireg.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pcivar.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/daemon/daemon_saver.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/scterm-teken.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/syscons.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/syscons.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/fifofs/fifo_vnops.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/i386/acpica/acpi_machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/i386/cpufreq/hwpstate.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/identcpu.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/msi.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/pmap.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_proto.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/specialreg.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/xen/xen-os.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/i386/linux/linux_proto.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/locore.s#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/pmap.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_event.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_shutdown.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_sig.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_timeout.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_bus.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/kern/sys_pipe.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty.c#30 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_pts.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_mqueue.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#35 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_aio.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_subr.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/modules/acpi/acpi/Makefile#5 integrate .. //depot/projects/vimage-commit2/src/sys/modules/dtrace/lockstat/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/bpf.c#24 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#29 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.c#30 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#36 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#28 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#40 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#42 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.h#13 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#29 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#33 integrate .. //depot/projects/vimage-commit2/src/sys/netsmb/smb_dev.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/pci/intpm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/pci/intpmreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/conf/GENERIC#15 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/pci/ofw_pci.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/pci/psycho.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/pci/schizo.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/jbusppm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/bus.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/teken/teken.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/teken/teken.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/teken/teken_demo.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/teken/teken_subr.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/teken/teken_subr_compat.h#2 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#4 (text+ko) ==== @@ -341,7 +341,7 @@ zap->zap_m.zap_num_entries++; else { printf("ZFS WARNING: Duplicated ZAP " - "entry detected (%s).", + "entry detected (%s).\n", mze->mze_name); } zap_name_free(zn); ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#9 (text+ko) ==== @@ -1114,6 +1114,20 @@ znode_t *zp; int err; + /* + * XXXPJD: zfs_zget() can't operate on virtual entires like .zfs/ or + * .zfs/snapshot/ directories, so for now just return EOPNOTSUPP. + * This will make NFS to fall back to using READDIR instead of + * READDIRPLUS. + * Also snapshots are stored in AVL tree, but based on their names, + * not inode numbers, so it will be very inefficient to iterate + * over all snapshots to find the right one. + * Note that OpenSolaris READDIRPLUS implementation does LOOKUP on + * d_name, and not VGET on d_fileno as we do. + */ + if (ino == ZFSCTL_INO_ROOT || ino == ZFSCTL_INO_SNAPDIR) + return (EOPNOTSUPP); + ZFS_ENTER(zfsvfs); err = zfs_zget(zfsvfs, ino, &zp); if (err == 0 && zp->z_unlinked) { @@ -1168,11 +1182,10 @@ ZFS_ENTER(zfsvfs); /* - * On FreeBSD we are already called with snapshot's mount point - * and not the mount point of its parent. + * On FreeBSD we can get snapshot's mount point or its parent file + * system mount point depending if snapshot is already mounted or not. */ -#ifndef __FreeBSD__ - if (fidp->fid_len == LONG_FID_LEN) { + if (zfsvfs->z_parent == zfsvfs && fidp->fid_len == LONG_FID_LEN) { zfid_long_t *zlfid = (zfid_long_t *)fidp; uint64_t objsetid = 0; uint64_t setgen = 0; @@ -1190,7 +1203,6 @@ return (EINVAL); ZFS_ENTER(zfsvfs); } -#endif if (fidp->fid_len == SHORT_FID_LEN || fidp->fid_len == LONG_FID_LEN) { zfid_short_t *zfid = (zfid_short_t *)fidp; ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#27 (text+ko) ==== @@ -29,7 +29,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.157 2009/08/28 22:51:07 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.158 2009/09/13 21:30:18 zec Exp $"); #include #include @@ -2152,6 +2152,7 @@ /* handle the 'request buffer size' case */ if (ifc.ifc_buf == PTROUT(NULL)) { ifc.ifc_len = 0; + IFNET_RLOCK(); TAILQ_FOREACH(ifp, &V_ifnet, if_link) { TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { struct sockaddr *sa = ifa->ifa_addr; @@ -2159,6 +2160,7 @@ ifc.ifc_len += sizeof(ifr); } } + IFNET_RUNLOCK(); error = copyout(&ifc, uifc, sizeof(ifc)); CURVNET_RESTORE(); return (error); ==== //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/debugger/dbcmds.c#2 (text+ko) ==== @@ -500,17 +500,16 @@ void *Context, void **ReturnValue) { - ACPI_NAMESPACE_NODE *Node = (ACPI_NAMESPACE_NODE *) ObjHandle; - UINT32 *Count = (UINT32 *) Context; - const ACPI_PREDEFINED_INFO *Predefined; - ACPI_BUFFER ReturnObj; - ACPI_STATUS Status; - char *Pathname; - ACPI_BUFFER Buffer; + ACPI_NAMESPACE_NODE *Node = (ACPI_NAMESPACE_NODE *) ObjHandle; + UINT32 *Count = (UINT32 *) Context; + ACPI_BUFFER ReturnObj; + ACPI_STATUS Status; + char *Pathname; UINT32 i; ACPI_DEVICE_INFO *ObjInfo; ACPI_OBJECT_LIST ParamObjects; ACPI_OBJECT Params[ACPI_METHOD_NUM_ARGS]; + const ACPI_PREDEFINED_INFO *Predefined; Predefined = AcpiNsCheckForPredefinedName (Node); @@ -532,8 +531,7 @@ /* Get the object info for number of method parameters */ - Buffer.Length = ACPI_ALLOCATE_LOCAL_BUFFER; - Status = AcpiGetObjectInfo (ObjHandle, &Buffer); + Status = AcpiGetObjectInfo (ObjHandle, &ObjInfo); if (ACPI_FAILURE (Status)) { return (Status); @@ -542,7 +540,6 @@ ParamObjects.Pointer = NULL; ParamObjects.Count = 0; - ObjInfo = Buffer.Pointer; if (ObjInfo->Type == ACPI_TYPE_METHOD) { @@ -558,7 +555,7 @@ ParamObjects.Count = ObjInfo->ParamCount; } - ACPI_FREE (Buffer.Pointer); + ACPI_FREE (ObjInfo); ReturnObj.Pointer = NULL; ReturnObj.Length = ACPI_ALLOCATE_BUFFER; @@ -1997,12 +1994,17 @@ ACPI_NAMESPACE_NODE *Node = (ACPI_NAMESPACE_NODE *) ObjHandle; ACPI_STATUS Status; ACPI_BUFFER Buffer; - ACPI_INTEGER ADR; - ACPI_DEVICE_ID Id; - ACPI_COMPATIBLE_ID_LIST *Cid; ACPI_NAMESPACE_NODE *TempNode; + ACPI_DEVICE_INFO *Info; + UINT32 i; + if ((Node->Type != ACPI_TYPE_DEVICE) && + (Node->Type != ACPI_TYPE_PROCESSOR)) + { + return (AE_OK); + } + /* Exit if there is no _PRT under this device */ Status = AcpiGetHandle (Node, METHOD_NAME__PRT, @@ -2022,57 +2024,70 @@ return (AE_OK); } + Status = AcpiGetObjectInfo (ObjHandle, &Info); + if (ACPI_FAILURE (Status)) + { + return (AE_OK); + } + /* Display the full path */ - AcpiOsPrintf ("%-32s", (char *) Buffer.Pointer); + AcpiOsPrintf ("%-32s Type %X", (char *) Buffer.Pointer, Node->Type); ACPI_FREE (Buffer.Pointer); + if (Info->Flags & ACPI_PCI_ROOT_BRIDGE) + { + AcpiOsPrintf (" - Is PCI Root Bridge"); + } + AcpiOsPrintf ("\n"); + /* _PRT info */ - AcpiOsPrintf ("_PRT=%p", TempNode); + AcpiOsPrintf ("_PRT: %p\n", TempNode); - /* Get the _ADR value */ + /* Dump _ADR, _HID, _UID, _CID */ - Status = AcpiUtEvaluateNumericObject (METHOD_NAME__ADR, Node, &ADR); - if (ACPI_FAILURE (Status)) + if (Info->Valid & ACPI_VALID_ADR) { - AcpiOsPrintf (" No _ADR "); + AcpiOsPrintf ("_ADR: %8.8X%8.8X\n", ACPI_FORMAT_UINT64 (Info->Address)); } else { - AcpiOsPrintf (" _ADR=%8.8X", (UINT32) ADR); + AcpiOsPrintf ("_ADR: \n"); } - /* Get the _HID if present */ + if (Info->Valid & ACPI_VALID_HID) + { + AcpiOsPrintf ("_HID: %s\n", Info->HardwareId.String); + } + else + { + AcpiOsPrintf ("_HID: \n"); + } - Status = AcpiUtExecute_HID (Node, &Id); - if (ACPI_SUCCESS (Status)) + if (Info->Valid & ACPI_VALID_UID) { - AcpiOsPrintf (" _HID=%s", Id.Value); + AcpiOsPrintf ("_UID: %s\n", Info->UniqueId.String); } else { - AcpiOsPrintf (" "); + AcpiOsPrintf ("_UID: \n"); } - /* Get the _UID if present */ - - Status = AcpiUtExecute_UID (Node, &Id); - if (ACPI_SUCCESS (Status)) + if (Info->Valid & ACPI_VALID_CID) { - AcpiOsPrintf (" _UID=%s", Id.Value); + for (i = 0; i < Info->CompatibleIdList.Count; i++) + { + AcpiOsPrintf ("_CID: %s\n", + Info->CompatibleIdList.Ids[i].String); + } } - - /* Get the _CID if present */ - - Status = AcpiUtExecute_CID (Node, &Cid); - if (ACPI_SUCCESS (Status)) + else { - AcpiOsPrintf (" _CID=%s", Cid->Id[0].Value); - ACPI_FREE (Cid); + AcpiOsPrintf ("_CID: \n"); } - AcpiOsPrintf ("\n"); + ACPI_FREE (Info); return (AE_OK); } @@ -2095,7 +2110,7 @@ { /* Search all nodes in namespace */ - (void) AcpiWalkNamespace (ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX, + (void) AcpiWalkNamespace (ACPI_TYPE_ANY, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX, AcpiDbBusWalk, NULL, NULL); } ==== //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/debugger/dbdisply.c#2 (text+ko) ==== @@ -682,42 +682,52 @@ char *ObjectArg) { ACPI_HANDLE Handle; - ACPI_BUFFER Buffer; ACPI_DEVICE_INFO *Info; ACPI_STATUS Status; UINT32 i; Handle = ACPI_TO_POINTER (ACPI_STRTOUL (ObjectArg, NULL, 16)); - Buffer.Length = ACPI_ALLOCATE_LOCAL_BUFFER; - Status = AcpiGetObjectInfo (Handle, &Buffer); - if (ACPI_SUCCESS (Status)) + Status = AcpiGetObjectInfo (Handle, &Info); + if (ACPI_FAILURE (Status)) { - Info = Buffer.Pointer; - AcpiOsPrintf ( - "S1D-%2.2X S2D-%2.2X S3D-%2.2X S4D-%2.2X HID: %s, ADR: %8.8X%8.8X, Status %8.8X\n", - Info->HighestDstates[0], Info->HighestDstates[1], - Info->HighestDstates[2], Info->HighestDstates[3], - Info->HardwareId.Value, - ACPI_FORMAT_UINT64 (Info->Address), - Info->CurrentStatus); + AcpiOsPrintf ("Could not get object info, %s\n", + AcpiFormatException (Status)); + return; + } + + AcpiOsPrintf ("ADR: %8.8X%8.8X, STA: %8.8X, Flags: %X\n", + ACPI_FORMAT_UINT64 (Info->Address), + Info->CurrentStatus, Info->Flags); + + AcpiOsPrintf ("S1D-%2.2X S2D-%2.2X S3D-%2.2X S4D-%2.2X\n", + Info->HighestDstates[0], Info->HighestDstates[1], + Info->HighestDstates[2], Info->HighestDstates[3]); - if (Info->Valid & ACPI_VALID_CID) - { - for (i = 0; i < Info->CompatibilityId.Count; i++) - { - AcpiOsPrintf ("CID #%d: %s\n", i, - Info->CompatibilityId.Id[i].Value); - } - } + AcpiOsPrintf ("S0W-%2.2X S1W-%2.2X S2W-%2.2X S3W-%2.2X S4W-%2.2X\n", + Info->LowestDstates[0], Info->LowestDstates[1], + Info->LowestDstates[2], Info->LowestDstates[3], + Info->LowestDstates[4]); - ACPI_FREE (Info); + if (Info->Valid & ACPI_VALID_HID) + { + AcpiOsPrintf ("HID: %s\n", Info->HardwareId.String); + } + if (Info->Valid & ACPI_VALID_UID) + { + AcpiOsPrintf ("UID: %s\n", Info->UniqueId.String); } - else + if (Info->Valid & ACPI_VALID_CID) { - AcpiOsPrintf ("%s\n", AcpiFormatException (Status)); + for (i = 0; i < Info->CompatibleIdList.Count; i++) + { + AcpiOsPrintf ("CID %d: %s\n", i, + Info->CompatibleIdList.Ids[i].String); + } } + + ACPI_FREE (Info); } ==== //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/debugger/dbexec.c#2 (text+ko) ==== @@ -176,7 +176,6 @@ ACPI_OBJECT_LIST ParamObjects; ACPI_OBJECT Params[ACPI_METHOD_NUM_ARGS]; ACPI_HANDLE Handle; - ACPI_BUFFER Buffer; UINT32 i; ACPI_DEVICE_INFO *ObjInfo; @@ -196,8 +195,7 @@ /* Get the object info for number of method parameters */ - Buffer.Length = ACPI_ALLOCATE_LOCAL_BUFFER; - Status = AcpiGetObjectInfo (Handle, &Buffer); + Status = AcpiGetObjectInfo (Handle, &ObjInfo); if (ACPI_FAILURE (Status)) { return (Status); @@ -206,7 +204,6 @@ ParamObjects.Pointer = NULL; ParamObjects.Count = 0; - ObjInfo = Buffer.Pointer; if (ObjInfo->Type == ACPI_TYPE_METHOD) { /* Are there arguments to the method? */ @@ -256,7 +253,7 @@ } } - ACPI_FREE (Buffer.Pointer); + ACPI_FREE (ObjInfo); /* Prepare for a return object of arbitrary size */ ==== //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dispatcher/dsfield.c#2 (text+ko) ==== @@ -211,9 +211,12 @@ Flags = ACPI_NS_NO_UPSEARCH | ACPI_NS_DONT_OPEN_SCOPE | ACPI_NS_ERROR_IF_FOUND; - /* Mark node temporary if we are executing a method */ - - if (WalkState->MethodNode) + /* + * Mark node temporary if we are executing a normal control + * method. (Don't mark if this is a module-level code method) + */ + if (WalkState->MethodNode && + !(WalkState->ParseFlags & ACPI_PARSE_MODULE_LEVEL)) { Flags |= ACPI_NS_TEMPORARY; } @@ -566,9 +569,12 @@ Flags = ACPI_NS_NO_UPSEARCH | ACPI_NS_DONT_OPEN_SCOPE | ACPI_NS_ERROR_IF_FOUND; - /* Mark node(s) temporary if we are executing a method */ - - if (WalkState->MethodNode) + /* + * Mark node(s) temporary if we are executing a normal control + * method. (Don't mark if this is a module-level code method) + */ + if (WalkState->MethodNode && + !(WalkState->ParseFlags & ACPI_PARSE_MODULE_LEVEL)) { Flags |= ACPI_NS_TEMPORARY; } ==== //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 (text+ko) ==== @@ -693,10 +693,15 @@ } /* - * Delete any namespace objects created anywhere within - * the namespace by the execution of this method + * Delete any namespace objects created anywhere within the + * namespace by the execution of this method. Unless this method + * is a module-level executable code method, in which case we + * want make the objects permanent. */ - AcpiNsDeleteNamespaceByOwner (MethodDesc->Method.OwnerId); + if (!(MethodDesc->Method.Flags & AOPOBJ_MODULE_LEVEL)) + { + AcpiNsDeleteNamespaceByOwner (MethodDesc->Method.OwnerId); + } } /* Decrement the thread count on the method */ @@ -745,7 +750,10 @@ /* No more threads, we can free the OwnerId */ - AcpiUtReleaseOwnerId (&MethodDesc->Method.OwnerId); + if (!(MethodDesc->Method.Flags & AOPOBJ_MODULE_LEVEL)) + { + AcpiUtReleaseOwnerId (&MethodDesc->Method.OwnerId); + } } return_VOID; ==== //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 (text+ko) ==== @@ -548,9 +548,10 @@ case ACPI_REFCLASS_LOCAL: - ACPI_ERROR ((AE_INFO, - "Uninitialized Local[%d] at node %p", Index, Node)); - + /* + * No error message for this case, will be trapped again later to + * detect and ignore cases of Store(LocalX,LocalX) + */ return_ACPI_STATUS (AE_AML_UNINITIALIZED_LOCAL); default: ==== //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 (text+ko) ==== @@ -570,15 +570,28 @@ { /* * NumElements was exhausted, but there are remaining elements in the - * PackageList. + * PackageList. Truncate the package to NumElements. * * Note: technically, this is an error, from ACPI spec: "It is an error * for NumElements to be less than the number of elements in the - * PackageList". However, for now, we just print an error message and - * no exception is returned. + * PackageList". However, we just print an error message and + * no exception is returned. This provides Windows compatibility. Some + * BIOSs will alter the NumElements on the fly, creating this type + * of ill-formed package object. */ while (Arg) { + /* + * We must delete any package elements that were created earlier + * and are not going to be used because of the package truncation. + */ + if (Arg->Common.Node) + { + AcpiUtRemoveReference ( + ACPI_CAST_PTR (ACPI_OPERAND_OBJECT, Arg->Common.Node)); + Arg->Common.Node = NULL; + } + /* Find out how many elements there really are */ i++; @@ -586,7 +599,7 @@ } ACPI_ERROR ((AE_INFO, - "Package List length (%X) larger than NumElements count (%X), truncated\n", + "Package List length (0x%X) larger than NumElements count (0x%X), truncated\n", i, ElementCount)); } else if (i < ElementCount) @@ -596,7 +609,7 @@ * Note: this is not an error, the package is padded out with NULLs. */ ACPI_DEBUG_PRINT ((ACPI_DB_INFO, - "Package List length (%X) smaller than NumElements count (%X), padded with null elements\n", + "Package List length (0x%X) smaller than NumElements count (0x%X), padded with null elements\n", i, ElementCount)); } ==== //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dispatcher/dswload.c#2 (text+ko) ==== @@ -672,20 +672,6 @@ (WalkState->Opcode != AML_INT_NAMEPATH_OP)) || (!(WalkState->OpInfo->Flags & AML_NAMED))) { -#ifdef ACPI_ENABLE_MODULE_LEVEL_CODE - if ((WalkState->OpInfo->Class == AML_CLASS_EXECUTE) || - (WalkState->OpInfo->Class == AML_CLASS_CONTROL)) - { - ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, - "Begin/EXEC: %s (fl %8.8X)\n", WalkState->OpInfo->Name, - WalkState->OpInfo->Flags)); - - /* Executing a type1 or type2 opcode outside of a method */ - - Status = AcpiDsExecBeginOp (WalkState, OutOp); - return_ACPI_STATUS (Status); - } -#endif return_ACPI_STATUS (AE_OK); } @@ -862,7 +848,12 @@ { /* Execution mode, node cannot already exist, node is temporary */ - Flags |= (ACPI_NS_ERROR_IF_FOUND | ACPI_NS_TEMPORARY); + Flags |= ACPI_NS_ERROR_IF_FOUND; + + if (!(WalkState->ParseFlags & ACPI_PARSE_MODULE_LEVEL)) + { + Flags |= ACPI_NS_TEMPORARY; + } } /* Add new entry or lookup existing entry */ @@ -952,24 +943,6 @@ if (!(WalkState->OpInfo->Flags & AML_NSOBJECT)) { -#ifndef ACPI_NO_METHOD_EXECUTION -#ifdef ACPI_ENABLE_MODULE_LEVEL_CODE - /* No namespace object. Executable opcode? */ - - if ((WalkState->OpInfo->Class == AML_CLASS_EXECUTE) || - (WalkState->OpInfo->Class == AML_CLASS_CONTROL)) - { - ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, - "End/EXEC: %s (fl %8.8X)\n", WalkState->OpInfo->Name, - WalkState->OpInfo->Flags)); - - /* Executing a type1 or type2 opcode outside of a method */ - - Status = AcpiDsExecEndOp (WalkState); - return_ACPI_STATUS (Status); - } -#endif -#endif return_ACPI_STATUS (AE_OK); } ==== //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/events/evgpe.c#2 (text+ko) ==== @@ -543,7 +543,7 @@ /* Read the Status Register */ - Status = AcpiRead (&StatusReg, &GpeRegisterInfo->StatusAddress); + Status = AcpiHwRead (&StatusReg, &GpeRegisterInfo->StatusAddress); if (ACPI_FAILURE (Status)) { goto UnlockAndExit; @@ -551,7 +551,7 @@ /* Read the Enable Register */ - Status = AcpiRead (&EnableReg, &GpeRegisterInfo->EnableAddress); + Status = AcpiHwRead (&EnableReg, &GpeRegisterInfo->EnableAddress); if (ACPI_FAILURE (Status)) { goto UnlockAndExit; ==== //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/events/evgpeblk.c#2 (text+ko) ==== @@ -995,7 +995,7 @@ /* Disable all GPEs within this register */ - Status = AcpiWrite (0x00, &ThisRegister->EnableAddress); + Status = AcpiHwWrite (0x00, &ThisRegister->EnableAddress); if (ACPI_FAILURE (Status)) { goto ErrorExit; @@ -1003,7 +1003,7 @@ /* Clear any pending GPE events within this register */ - Status = AcpiWrite (0xFF, &ThisRegister->StatusAddress); + Status = AcpiHwWrite (0xFF, &ThisRegister->StatusAddress); if (ACPI_FAILURE (Status)) { goto ErrorExit; ==== //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/events/evrgnini.c#2 (text+ko) ==== @@ -127,10 +127,6 @@ /* Local prototypes */ static BOOLEAN -AcpiEvMatchPciRootBridge ( - char *Id); - -static BOOLEAN AcpiEvIsPciRootBridge ( ACPI_NAMESPACE_NODE *Node); @@ -444,42 +440,6 @@ /******************************************************************************* * - * FUNCTION: AcpiEvMatchPciRootBridge - * - * PARAMETERS: Id - The HID/CID in string format - * - * RETURN: TRUE if the Id is a match for a PCI/PCI-Express Root Bridge - * - * DESCRIPTION: Determine if the input ID is a PCI Root Bridge ID. - * - ******************************************************************************/ - -static BOOLEAN -AcpiEvMatchPciRootBridge ( - char *Id) -{ - - /* - * Check if this is a PCI root. - * ACPI 3.0+: check for a PCI Express root also. - */ - if (!(ACPI_STRNCMP (Id, - PCI_ROOT_HID_STRING, - sizeof (PCI_ROOT_HID_STRING))) || - - !(ACPI_STRNCMP (Id, - PCI_EXPRESS_ROOT_HID_STRING, - sizeof (PCI_EXPRESS_ROOT_HID_STRING)))) - { - return (TRUE); - } - - return (FALSE); -} - - -/******************************************************************************* - * * FUNCTION: AcpiEvIsPciRootBridge * * PARAMETERS: Node - Device node being examined @@ -496,9 +456,10 @@ ACPI_NAMESPACE_NODE *Node) { ACPI_STATUS Status; - ACPI_DEVICE_ID Hid; - ACPI_COMPATIBLE_ID_LIST *Cid; + ACPI_DEVICE_ID *Hid; + ACPI_DEVICE_ID_LIST *Cid; UINT32 i; + BOOLEAN Match; /* Get the _HID and check for a PCI Root Bridge */ @@ -509,7 +470,10 @@ return (FALSE); } - if (AcpiEvMatchPciRootBridge (Hid.Value)) + Match = AcpiUtIsPciRootBridge (Hid->String); + ACPI_FREE (Hid); + + if (Match) { return (TRUE); } @@ -526,7 +490,7 @@ for (i = 0; i < Cid->Count; i++) { - if (AcpiEvMatchPciRootBridge (Cid->Id[i].Value)) + if (AcpiUtIsPciRootBridge (Cid->Ids[i].String)) { ACPI_FREE (Cid); return (TRUE); ==== //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exconfig.c#2 (text+ko) ==== @@ -196,8 +196,15 @@ { AcpiUtRemoveReference (ObjDesc); *DdbHandle = NULL; + return_ACPI_STATUS (Status); } + /* Execute any module-level code that was found in the table */ + + AcpiExExitInterpreter (); + AcpiNsExecModuleCodeList (); + AcpiExEnterInterpreter (); + return_ACPI_STATUS (Status); } ==== //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exfield.c#2 (text+ko) ==== @@ -151,6 +151,7 @@ ACPI_OPERAND_OBJECT *BufferDesc; ACPI_SIZE Length; void *Buffer; + UINT32 Function; ACPI_FUNCTION_TRACE_PTR (ExReadDataFromField, ObjDesc); @@ -183,13 +184,27 @@ } } else if ((ObjDesc->Common.Type == ACPI_TYPE_LOCAL_REGION_FIELD) && - (ObjDesc->Field.RegionObj->Region.SpaceId == ACPI_ADR_SPACE_SMBUS)) + (ObjDesc->Field.RegionObj->Region.SpaceId == ACPI_ADR_SPACE_SMBUS || + ObjDesc->Field.RegionObj->Region.SpaceId == ACPI_ADR_SPACE_IPMI)) { /* - * This is an SMBus read. We must create a buffer to hold the data - * and directly access the region handler. + * This is an SMBus or IPMI read. We must create a buffer to hold + * the data and then directly access the region handler. + * + * Note: Smbus protocol value is passed in upper 16-bits of Function */ - BufferDesc = AcpiUtCreateBufferObject (ACPI_SMBUS_BUFFER_SIZE); + if (ObjDesc->Field.RegionObj->Region.SpaceId == ACPI_ADR_SPACE_SMBUS) + { + Length = ACPI_SMBUS_BUFFER_SIZE; + Function = ACPI_READ | (ObjDesc->Field.Attribute << 16); + } + else /* IPMI */ + { + Length = ACPI_IPMI_BUFFER_SIZE; + Function = ACPI_READ; + } + + BufferDesc = AcpiUtCreateBufferObject (Length); if (!BufferDesc) { return_ACPI_STATUS (AE_NO_MEMORY); @@ -199,13 +214,11 @@ AcpiExAcquireGlobalLock (ObjDesc->CommonField.FieldFlags); - /* - * Perform the read. - * Note: Smbus protocol value is passed in upper 16-bits of Function - */ + /* Call the region handler for the read */ + Status = AcpiExAccessRegion (ObjDesc, 0, ACPI_CAST_PTR (ACPI_INTEGER, BufferDesc->Buffer.Pointer), - ACPI_READ | (ObjDesc->Field.Attribute << 16)); + Function); AcpiExReleaseGlobalLock (ObjDesc->CommonField.FieldFlags); goto Exit; } @@ -304,6 +317,7 @@ UINT32 Length; void *Buffer; ACPI_OPERAND_OBJECT *BufferDesc; + UINT32 Function; ACPI_FUNCTION_TRACE_PTR (ExWriteDataToField, ObjDesc); @@ -332,40 +346,59 @@ } } else if ((ObjDesc->Common.Type == ACPI_TYPE_LOCAL_REGION_FIELD) && - (ObjDesc->Field.RegionObj->Region.SpaceId == ACPI_ADR_SPACE_SMBUS)) + (ObjDesc->Field.RegionObj->Region.SpaceId == ACPI_ADR_SPACE_SMBUS || + ObjDesc->Field.RegionObj->Region.SpaceId == ACPI_ADR_SPACE_IPMI)) { /* - * This is an SMBus write. We will bypass the entire field mechanism - * and handoff the buffer directly to the handler. + * This is an SMBus or IPMI write. We will bypass the entire field + * mechanism and handoff the buffer directly to the handler. For + * these address spaces, the buffer is bi-directional; on a write, + * return data is returned in the same buffer. + * + * Source must be a buffer of sufficient size: + * ACPI_SMBUS_BUFFER_SIZE or ACPI_IPMI_BUFFER_SIZE. * - * Source must be a buffer of sufficient size (ACPI_SMBUS_BUFFER_SIZE). + * Note: SMBus protocol type is passed in upper 16-bits of Function */ if (SourceDesc->Common.Type != ACPI_TYPE_BUFFER) { - ACPI_ERROR ((AE_INFO, "SMBus write requires Buffer, found type %s", + ACPI_ERROR ((AE_INFO, + "SMBus or IPMI write requires Buffer, found type %s", AcpiUtGetObjectTypeName (SourceDesc))); return_ACPI_STATUS (AE_AML_OPERAND_TYPE); } - if (SourceDesc->Buffer.Length < ACPI_SMBUS_BUFFER_SIZE) + if (ObjDesc->Field.RegionObj->Region.SpaceId == ACPI_ADR_SPACE_SMBUS) + { + Length = ACPI_SMBUS_BUFFER_SIZE; + Function = ACPI_WRITE | (ObjDesc->Field.Attribute << 16); + } + else /* IPMI */ + { + Length = ACPI_IPMI_BUFFER_SIZE; + Function = ACPI_WRITE; + } + + if (SourceDesc->Buffer.Length < Length) { ACPI_ERROR ((AE_INFO, - "SMBus write requires Buffer of length %X, found length %X", - ACPI_SMBUS_BUFFER_SIZE, SourceDesc->Buffer.Length)); + "SMBus or IPMI write requires Buffer of length %X, found length %X", + Length, SourceDesc->Buffer.Length)); return_ACPI_STATUS (AE_AML_BUFFER_LIMIT); } - BufferDesc = AcpiUtCreateBufferObject (ACPI_SMBUS_BUFFER_SIZE); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Sep 13 22:11:25 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F0D9106566C; Sun, 13 Sep 2009 22:11:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C7F321065672 for ; Sun, 13 Sep 2009 22:11:24 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9DF748FC16 for ; Sun, 13 Sep 2009 22:11:24 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8DMBOq0091492 for ; Sun, 13 Sep 2009 22:11:24 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8DMBOqr091490 for perforce@freebsd.org; Sun, 13 Sep 2009 22:11:24 GMT (envelope-from zec@fer.hr) Date: Sun, 13 Sep 2009 22:11:24 GMT Message-Id: <200909132211.n8DMBOqr091490@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 168521 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Sep 2009 22:11:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=168521 Change 168521 by zec@zec_tpx32 on 2009/09/13 22:10:42 Suppress a CURVNET_SET() recursion warning. Affected files ... .. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#31 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/vfs_lookup.c#31 (text+ko) ==== @@ -358,7 +358,7 @@ * * XXX revisit buffer length checking. */ - CURVNET_SET(TD_TO_VNET(curthread)); + CURVNET_SET_QUIET(TD_TO_VNET(curthread)); if (V_morphing_symlinks) { char *sp = strchr(cp, '@'); From owner-p4-projects@FreeBSD.ORG Mon Sep 14 08:13:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E75F106568D; Mon, 14 Sep 2009 08:13: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 EEC4F106566C for ; Mon, 14 Sep 2009 08:13:21 +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 DE2A38FC15 for ; Mon, 14 Sep 2009 08:13:21 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8E8DLMN068247 for ; Mon, 14 Sep 2009 08:13:21 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8E8DLFs068243 for perforce@freebsd.org; Mon, 14 Sep 2009 08:13:21 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 14 Sep 2009 08:13:21 GMT Message-Id: <200909140813.n8E8DLFs068243@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 168524 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Sep 2009 08:13:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=168524 Change 168524 by rene@rene_self on 2009/09/14 08:12:30 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/custom-gcc/article.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#17 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#42 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#13 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#40 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml#14 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml#12 integrate .. //depot/projects/docproj_nl/share/sgml/freebsd.ent#12 integrate .. //depot/projects/docproj_nl/www/nl/vendors.html#6 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#49 integrate .. //depot/projects/docproj_nl/www/share/sgml/press.xml#17 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/custom-gcc/article.sgml#2 (text+ko) ==== @@ -17,7 +17,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/custom-gcc/article.sgml,v 1.1 2009/09/01 18:01:01 danger Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/custom-gcc/article.sgml,v 1.2 2009/09/04 14:22:47 danger Exp $ &tm-attrib.freebsd; @@ -110,7 +110,8 @@ appropriately): .if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44) -USE_GCC=4.4 +CC=gcc44 +CXX=g++44 CPP=cpp44 .endif @@ -168,7 +169,8 @@ example: .if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44) -USE_GCC=4.4 +CC=gcc44 +CXX=g++44 CPP=cpp44 CFLAGS+=-mssse3 .endif @@ -191,7 +193,9 @@ .if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44) .if empty(.CURDIR:M/usr/ports/net/openldap*) -USE_GCC=4.X +CC=gcc44 +CXX=g++44 +CPP=cpp44 .endif .endif ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#17 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2433,6 +2433,15 @@ + RELENG_8 + + + The line of development for FreeBSD-8.X, also known + as FreeBSD 8-STABLE + + + + RELENG_7 ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#42 (text+ko) ==== @@ -1,7 +1,7 @@ 702101 May 15, 2009 7.2-STABLE after ichsmb(4) was changed to - use left-adjused slave addressing to match other + use left-adjusted slave addressing to match other SMBus controller drivers. @@ -13270,6 +13270,17 @@ 8.0-CURRENT after making the newbus subsystem Giant free by adding the newbus sxlock. + + 900000 + August 22, 2009 + 9.0-CURRENT. + + + 900001 + September 8, 2009 + 9.0-CURRENT after importing x86emu, a software + emulator for real mode x86 CPU from OpenBSD. + ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: doc/nl_NL.ISO8859-1/articles/Makefile,v 1.5 2009/04/12 12:09:37 rene Exp $ +# $FreeBSD: doc/nl_NL.ISO8859-1/articles/Makefile,v 1.6 2009/09/06 20:51:35 rene Exp $ # %SOURCE% en_US.ISO8859-1/articles/Makefile # %SRCID% 1.61 ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#40 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2549,6 +2549,15 @@ + RELENG_8 + + + De ontwikkellijn voor &os;-8.X, ook bekend als + &os; 8-STABLE. + + + + RELENG_7 From owner-p4-projects@FreeBSD.ORG Mon Sep 14 18:14:20 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B9391065679; Mon, 14 Sep 2009 18:14:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F2F14106566B for ; Mon, 14 Sep 2009 18:14:19 +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 E18EB8FC1A for ; Mon, 14 Sep 2009 18:14:19 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8EIEJqN054491 for ; Mon, 14 Sep 2009 18:14:19 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8EIEI1I054489 for perforce@freebsd.org; Mon, 14 Sep 2009 18:14:18 GMT (envelope-from trasz@freebsd.org) Date: Mon, 14 Sep 2009 18:14:18 GMT Message-Id: <200909141814.n8EIEI1I054489@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 168540 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Sep 2009 18:14:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=168540 Change 168540 by trasz@trasz_anger on 2009/09/14 18:14:17 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/Makefile.inc1#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#36 integrate .. //depot/projects/soc2008/trasz_nfs4acl/cddl/compat/opensolaris/include/assert.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/head/assert.h#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/network.subr#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/Makefile#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/NETWORKING#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/addswap#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/auto_linklocal#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/defaultroute#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/devd#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/faith#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/ip6addrctl#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/mroute6d#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/netif#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/netoptions#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/network_ipv6#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/ppp#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/route6d#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/routed#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/routing#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/rtadvd#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/stf#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/sysctl#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.subr#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/Makefile#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_iso9660.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_compat_zip.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_isojoliet_bz2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_isorr_bz2.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/Versions.def#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/net/getifaddrs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/fopen.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdtime/localtime.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libkvm/kvm_proc.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libradius/libradius.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libradius/radlib.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libradius/radlib.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libradius/radlib_private.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/net.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/nfs.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/rpc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/en_US.ISO8859-1/relnotes/article.sgml#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/picobsd/bridge/crunch.conf#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/mirror/gmirror.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/af_inet6.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/af_nd6.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifconfig.8#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/scsi_target/scsi_target.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/scsi_target/scsi_target.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/Makefile#26 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/dpms.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ed.4#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/inet6.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ips.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/Makefile#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/dpms.4#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/syscons.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/textdump.4#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/device.hints.5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/rc.conf.5#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/monetdef/zh_CN.GB18030.src#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/monetdef/zh_CN.GB2312.src#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/asia#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/australasia#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/identcpu.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/initcpu.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/msi.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/NOTES#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/_align.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/param.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/specialreg.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/linux32/linux32_proto.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/_align.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/param.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/Makefile.inc#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_cd.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_target.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#34 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_misc.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_proto.h#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_ioctl.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_misc.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_proto.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#39 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#49 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.amd64#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.i386#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#33 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options.amd64#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/acpica_prep.sh#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/changes.txt#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/common/dmrestag.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/common/dmtable.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/common/dmtbdump.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/common/dmtbinfo.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/compiler/aslcompiler.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/compiler/aslcompiler.l#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/compiler/aslcompiler.y#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/compiler/asldefine.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/compiler/aslfiles.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/compiler/aslglobal.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/compiler/aslload.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/compiler/asllookup.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/compiler/aslmain.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/compiler/aslmap.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/compiler/aslstubs.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/compiler/asltypes.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/dispatcher/dsfield.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/dispatcher/dswload.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/events/evgpe.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/events/evrgnini.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/executer/exfield.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/executer/exfldio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/executer/exstorob.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/executer/exutils.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/hardware/hwregs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/hardware/hwtimer.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/hardware/hwxface.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acconfig.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acdebug.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acglobal.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/achware.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acinterp.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/aclocal.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acmacros.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acobject.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acparser.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acpixf.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acpredef.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/actbl.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/actbl1.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/actbl2.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/actypes.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acutils.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/amlcode.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/namespace/nsload.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/namespace/nsrepair.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/namespace/nsxfname.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/parser/psloop.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/parser/psxface.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/tables/tbutils.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/utilities/uteval.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/utilities/utglobal.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/utilities/utids.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/utilities/utinit.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/utilities/utxface.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/x86emu/x86emu.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/x86emu/x86emu.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/x86emu/x86emu_regs.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/x86emu/x86emu_util.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/aac/aac.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/aac/aacvar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi_cpu.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi_pcib_acpi.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ae/if_ae.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/agp/agp_i810.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/amdtemp/amdtemp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/amr/amr.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/asmc/asmc.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/asmc/asmcvar.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-raid.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-acerlabs.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-marvell.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ah_osdep.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ah.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ah_eeprom_v3.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bce/if_bce.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_sge.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dpms/dpms.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_pciids.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/r600_blit.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/e1000/if_em.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/e1000/if_igb.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ep/if_ep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ep/if_epreg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/s3_pci.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/vesa.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/vesa.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/vga.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/firewire/fwcrom.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/firewire/fwdev.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fxp/if_fxp.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hptiop/hptiop.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ichwd/ichwd.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iir/iir.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgbe/ixgbe.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mpt/mpt_raid.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/msk/if_msk.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pci_user.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pcireg.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pcivar.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac.c#28 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/daemon/daemon_saver.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/scterm-teken.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/scvesactl.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/syscons.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/syscons.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_rum.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_rumreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_urtw.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/wi/if_wi.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/fifofs/fifo_vnops.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/msdosfs/msdosfs_conv.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clnode.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clport.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_dev.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_vfs.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/acpica/acpi_machdep.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/NOTES#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/cpufreq/hwpstate.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/identcpu.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/msi.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/pmap.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/ibcs2/ibcs2_proto.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/_align.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/param.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/pc/vesa.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/specialreg.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/xen/xen-os.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/isa/dpms.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/isa/vesa.c#5 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/linux/linux_proto.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/locore.s#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/pmap.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/include/_align.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/include/param.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_event.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_exec.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_jail.c#26 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_linker.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_lock.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_mutex.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_shutdown.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_sig.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_timeout.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_bus.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sys_generic.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sys_pipe.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty.c#27 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_pts.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_mqueue.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_socket.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_aio.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#39 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/include/_align.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/include/param.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/Makefile#31 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/acpi/acpi/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/dpms/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/dtrace/lockstat/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/vesa/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/x86emu/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bpf.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_vlan.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/route.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_action.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_proto.h#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/if_ether.c#24 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/if_ether.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.c#22 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_mcast.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_mroute.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_pcb.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.c#26 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_ifattach.c#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_proto.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_input.c#22 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/nd6.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/nd6.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/nd6_nbr.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/nd6_rtr.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netsmb/smb_dev.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_node.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_serv.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/include/_align.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/include/pc/vesa.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/pci/intpm.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pci/intpmreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/conf/GENERIC#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/_align.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/param.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_bsm_token.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/_align.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/param.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/ofw_pci.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/psycho.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/schizo.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/jbusppm.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/include/_align.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/include/param.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/_sockaddr_storage.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/bus.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/imgact_aout.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/param.h#36 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/socket.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/syscallsubr.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sysproto.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken_demo.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken_subr.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken_subr_compat.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/unzip/unzip.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/unzip/unzip.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/w/pr_time.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/acpi/acpidb/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/btxld/btxld.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ndp/ndp.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ndp/ndp.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rtsold/if.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rtsold/rtsold.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rtsold/rtsold.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rtsold/rtsold.h#2 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/Makefile.inc1#17 (text+ko) ==== @@ -1,11 +1,11 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.628 2009/07/14 21:19:13 kan Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.629 2009/09/10 07:37:36 des 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 +# -DKERNFAST define NO_KERNELCONFIG, NO_KERNELCLEAN and NO_KERNELDEPEND # -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 ==== //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#36 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.208 2009/09/03 16:34:20 remko Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.209 2009/09/10 21:42:00 delphij Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090909: vesa and dpms promoted to be i386/amd64 common +OLD_FILES+=usr/include/machine/pc/vesa.h +OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz # 20090904: remove lukemftpd OLD_FILES+=usr/libexec/lukemftpd OLD_FILES+=usr/share/man/man5/ftpd.conf.5.gz ==== //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#19 (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.359 2009/08/25 19:07:26 delphij Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.360 2009/09/12 22:22:31 hrs Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -196,6 +196,8 @@ ifconfig_lo0="inet 127.0.0.1" # default loopback device configuration. #ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry. #ifconfig_ed0_ipx="ipx 0x00010010" # Sample IPX address family entry. +#ifconfig_ed0_ipv6="inet6 2001:db8:1::1 prefixlen 64" # Sample IPv6 addr entry +#ifconfig_ed0_alias0="inet6 2001:db8:2::1 prefixlen 64" # Sample IPv6 alias #ifconfig_fxp0_name="net0" # Change interface name from fxp0 to net0. #wlans_ath0="wlan0" # wlan(4) interfaces for ath0 device #wlandebug_wlan0="scan+auth+assoc" # Set debug flags with wlanddebug(8) @@ -361,9 +363,9 @@ static_routes="" # Set to static route list (or leave empty). natm_static_routes="" # Set to static route list for NATM (or leave empty). gateway_enable="NO" # Set to YES if this host will be a gateway. -router_enable="NO" # Set to YES to enable a routing daemon. -router="/sbin/routed" # Name of routing daemon to use if enabled. -router_flags="-q" # Flags for routing daemon. +routed_enable="NO" # Set to YES to enable a routing daemon. +routed_program="/sbin/routed" # Name of routing daemon to use if enabled. +routed_flags="-q" # Flags for routing daemon. mrouted_enable="NO" # Do IPv4 multicast routing. mrouted_program="/usr/local/sbin/mrouted" # Name of IPv4 multicast # routing daemon. You need to @@ -418,8 +420,8 @@ icmp_bmcastecho="NO" # respond to broadcast ping packets ### IPv6 options: ### -ipv6_enable="NO" # Set to YES to set up for IPv6. -ipv6_network_interfaces="auto" # List of network interfaces (or "auto"). +ipv6_network_interfaces="none" # List of IPv6 network interfaces + # (or "auto" or "none"). ipv6_defaultrouter="NO" # Set to IPv6 default gateway (or NO). #ipv6_defaultrouter="2002:c058:6301::" # Use this for 6to4 (RFC 3068) ipv6_static_routes="" # Set to static route list (or leave empty). @@ -427,20 +429,19 @@ # route toward loopback interface. #ipv6_route_xxx="fec0:0000:0000:0006:: -prefixlen 64 ::1" ipv6_gateway_enable="NO" # Set to YES if this host will be a gateway. -ipv6_router_enable="NO" # Set to YES to enable an IPv6 routing daemon. -ipv6_router="/usr/sbin/route6d" # Name of IPv6 routing daemon. -ipv6_router_flags="" # Flags to IPv6 routing daemon. -#ipv6_router_flags="-l" # Example for route6d with only IPv6 site local + +route6d_enable="NO" # Set to YES to enable an IPv6 routing daemon. +route6d_program="/usr/sbin/route6d" # Name of IPv6 routing daemon. +route6d_flags="" # Flags to IPv6 routing daemon. +#route6d_flags="-l" # Example for route6d with only IPv6 site local # addrs. -#ipv6_router_flags="-q" # If you want to run a routing daemon on an end +#route6d_flags="-q" # If you want to run a routing daemon on an end # node, you should stop advertisement. #ipv6_network_interfaces="ed0 ep0" # Examples for router # or static configuration for end node. # Choose correct prefix value. #ipv6_prefix_ed0="fec0:0000:0000:0001 fec0:0000:0000:0002" # Examples for rtr. #ipv6_prefix_ep0="fec0:0000:0000:0003 fec0:0000:0000:0004" # Examples for rtr. -#ipv6_ifconfig_ed0="fec0:0:0:5::1 prefixlen 64" # Sample manual assign entry -#ipv6_ifconfig_ed0_alias0="fec0:0:0:5::2 prefixlen 64" # Sample alias entry. ipv6_default_interface="NO" # Default output interface for scoped addrs. # Now this works only for IPv6 link local # multicast addrs. @@ -482,6 +483,7 @@ # for examples ip6addrctl_enable="YES" # Set to YES to enable default address selection ip6addrctl_verbose="NO" # Set to YES to enable verbose configuration messages +ipv6_prefer="NO" # Use IPv6 when both IPv4 and IPv6 can be used ############################################################## ### System console options ################################# ==== //depot/projects/soc2008/trasz_nfs4acl/etc/network.subr#9 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.199 2009/08/27 15:24:26 dougb Exp $ +# $FreeBSD: src/etc/network.subr,v 1.201 2009/09/12 23:01:36 hrs Exp $ # # @@ -31,8 +31,8 @@ # # ifn_start ifn -# Bring up and configure an interface. If some configuration is applied -# print the interface configuration. +# Bring up and configure an interface. If some configuration is +# applied print the interface configuration. # ifn_start() { @@ -45,15 +45,16 @@ ifscript_up ${ifn} && cfg=0 ifconfig_up ${ifn} && cfg=0 ipv4_up ${ifn} && cfg=0 + ipv6_up ${ifn} && cfg=0 ipx_up ${ifn} && cfg=0 - childif_create ${ifn} + childif_create ${ifn} && cfg=0 return $cfg } -# ifn_start ifn -# Shutdown and de-configure an interface. If action is taken print the -# interface name. +# ifn_stop ifn +# Shutdown and de-configure an interface. If action is taken +# print the interface name. # ifn_stop() { @@ -61,13 +62,14 @@ ifn="$1" cfg=1 - [ -z "$ifn" ] && return 1 + [ -z "$ifn" ] && err 1 "ifn_stop called without an interface" ipx_down ${ifn} && cfg=0 + ipv6_down ${ifn} && cfg=0 ipv4_down ${ifn} && cfg=0 ifconfig_down ${ifn} && cfg=0 ifscript_down ${ifn} && cfg=0 - childif_destroy ${ifn} + childif_destroy ${ifn} && cfg=0 return $cfg } @@ -81,13 +83,51 @@ # ifconfig_up() { + local _cfg _ipv6_opts ifconfig_args _cfg=1 + # ifconfig_IF ifconfig_args=`ifconfig_getargs $1` if [ -n "${ifconfig_args}" ]; then ifconfig $1 ${ifconfig_args} + _cfg=0 + fi + + # inet6 specific + if afexists inet6; then + if ipv6if $1; then + if checkyesno ipv6_gateway_enable; then + _ipv6_opts="-accept_rtadv auto_linklocal" + else + _ipv6_opts="auto_linklocal" + fi + else + _ipv6_opts="-auto_linklocal ifdisabled" + fi + + ifconfig $1 inet6 ${_ipv6_opts} + + # ifconfig_IF_ipv6 + ifconfig_args=`ifconfig_getargs $1 ipv6` + if [ -n "${ifconfig_args}" ]; then + ifconfig $1 inet6 -ifdisabled + ifconfig $1 ${ifconfig_args} + _cfg=0 + fi + + # backward compatiblity: $ipv6_ifconfig_IF + ifconfig_args=`get_if_var $1 ipv6_ifconfig_IF` + if [ -n "${ifconfig_args}" ]; then + warn "\$ipv6_ifconfig_$1 is obsolete." \ + " Use ifconfig_$1_ipv6 instead." + ifconfig $1 inet6 -ifdisabled + ifconfig $1 inet6 ${ifconfig_args} + _cfg=0 + fi + fi + + if [ ${_cfg} -eq 0 ]; then ifconfig $1 up - _cfg=0 fi if wpaif $1; then @@ -114,7 +154,7 @@ # ifconfig_down() { - [ -z "$1" ] && return 1 + local _cfg _cfg=1 if wpaif $1; then @@ -136,13 +176,15 @@ } # get_if_var if var [default] -# Return the value of the pseudo-hash corresponding to $if where -# $var is a string containg the sub-string "IF" which will be -# replaced with $if after the characters defined in _punct are -# replaced with '_'. If the variable is unset, replace it with -# $default if given. +# Return the value of the pseudo-hash corresponding to $if where +# $var is a string containg the sub-string "IF" which will be +# replaced with $if after the characters defined in _punct are +# replaced with '_'. If the variable is unset, replace it with +# $default if given. get_if_var() { + local _if _punct _var _default prefix suffix + if [ $# -ne 2 -a $# -ne 3 ]; then err 3 'USAGE: get_if_var name var [default]' fi @@ -160,26 +202,30 @@ eval echo \${${prefix}${_if}${suffix}-${_default}} } -# _ifconfig_getargs if +# _ifconfig_getargs if [af] # Echos the arguments for the supplied interface to stdout. # returns 1 if empty. In general, ifconfig_getargs should be used # outside this file. _ifconfig_getargs() { + local _ifn _af _ifn=$1 + _af=${2+_$2} + if [ -z "$_ifn" ]; then return 1 fi - get_if_var $_ifn ifconfig_IF "$ifconfig_DEFAULT" + get_if_var $_ifn ifconfig_IF$_af "$ifconfig_DEFAULT" } -# ifconfig_getargs if +# ifconfig_getargs if [af] # Takes the result from _ifconfig_getargs and removes pseudo # args such as DHCP and WPA. ifconfig_getargs() { - _tmpargs=`_ifconfig_getargs $1` + local _tmpargs _arg _args + _tmpargs=`_ifconfig_getargs $1 $2` if [ $? -eq 1 ]; then return 1 fi @@ -206,7 +252,9 @@ # boot time and 1 otherwise. autoif() { + local _tmpargs _arg _tmpargs=`_ifconfig_getargs $1` + for _arg in $_tmpargs; do case $_arg in [Nn][Oo][Aa][Uu][Tt][Oo]) @@ -214,6 +262,7 @@ ;; esac done + return 0 } @@ -221,7 +270,9 @@ # Returns 0 if the interface is a DHCP interface and 1 otherwise. dhcpif() { + local _tmpargs _arg _tmpargs=`_ifconfig_getargs $1` + for _arg in $_tmpargs; do case $_arg in [Dd][Hh][Cc][Pp]) @@ -235,6 +286,7 @@ ;; esac done + return 1 } @@ -243,7 +295,9 @@ # 1 otherwise. syncdhcpif() { + local _tmpargs _arg _tmpargs=`_ifconfig_getargs $1` + for _arg in $_tmpargs; do case $_arg in [Nn][Oo][Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp]) @@ -254,18 +308,17 @@ ;; esac done - if checkyesno synchronous_dhclient; then - return 0 - else - return 1 - fi + + checkyesno synchronous_dhclient } # wpaif if # Returns 0 if the interface is a WPA interface and 1 otherwise. wpaif() { + local _tmpargs _arg _tmpargs=`_ifconfig_getargs $1` + for _arg in $_tmpargs; do case $_arg in [Ww][Pp][Aa]) @@ -273,17 +326,76 @@ ;; esac done + return 1 } +# afexists af +# Returns 0 if the address family is enabled in the kernel +# 1 otherwise. +afexists() +{ + local _af + _af=$1 + + case ${_af} in + inet) + ${SYSCTL_N} net.inet > /dev/null 2>&1 + ;; + inet6) + ${SYSCTL_N} net.inet6 > /dev/null 2>&1 + ;; + *) + err 1 "afexists(): Unsupported address family: $_af" + ;; + esac +} + +# noafif if +# Returns 0 if the interface has no af configuration and 1 otherwise. +noafif() +{ + local _if + _if=$1 + + case $_if in + pflog[0-9]*|\ + pfsync[0-9]*|\ + an[0-9]*|\ + ath[0-9]*|\ + ipw[0-9]*|\ + iwi[0-9]*|\ + iwn[0-9]*|\ + ral[0-9]*|\ + wi[0-9]*|\ + wl[0-9]*|\ + wpi[0-9]*) + return 0 + ;; + esac + + return 1 +} + # ipv6if if # Returns 0 if the interface should be configured for IPv6 and # 1 otherwise. ipv6if() { - if ! checkyesno ipv6_enable; then + local _if i + _if=$1 + + if ! afexists inet6; then return 1 fi + + # lo0 is always IPv6-enabled + case $_if in + lo0) + return 0 + ;; + esac + case "${ipv6_network_interfaces}" in [Aa][Uu][Tt][Oo]) return 0 @@ -292,40 +404,110 @@ return 1 ;; esac - for v6if in ${ipv6_network_interfaces}; do - if [ "${v6if}" = "${1}" ]; then + + for i in ${ipv6_network_interfaces}; do + if [ "$i" = "$_if" ]; then return 0 fi done + return 1 } +# ipv6_autoconfif if +# Returns 0 if the interface should be configured for IPv6 with +# Stateless Address Configuration, 1 otherwise. +ipv6_autoconfif() +{ + local _if _tmpargs _arg + _if=$1 + + if ! ipv6if $_if; then + return 1 + fi + if noafif $_if; then + return 1 + fi + if checkyesno ipv6_gateway_enable; then + return 1 + fi + + case $_if in + lo0|\ + stf[0-9]*|\ + faith[0-9]*|\ + lp[0-9]*|\ + sl[0-9]*) + return 1 + ;; + esac + + _tmpargs=`_ifconfig_getargs $_if ipv6` + for _arg in $_tmpargs; do + case $_arg in + accept_rtadv) + return 0 + ;; + esac + done + + return 1 +} + # ifexists if # Returns 0 if the interface exists and 1 otherwise. ifexists() { + [ -z "$1" ] && return 1 ifconfig -n $1 > /dev/null 2>&1 } # ipv4_up if -# add IPv4 addresses to the interface $if +# add IPv4 addresses to the interface $if ipv4_up() { + local _if _ret _if=$1 - ifalias_up ${_if} - ipv4_addrs_common ${_if} alias + _ret=1 + + ifalias_up ${_if} inet && _ret=0 + ipv4_addrs_common ${_if} alias && _ret=0 + + return $_ret +} + +# ipv6_up if +# add IPv6 addresses to the interface $if +ipv6_up() +{ + local _if _ret + _if=$1 + _ret=1 + + if ! ipv6if $_if; then + return 0 + fi + + ifalias_up ${_if} inet6 && _ret=0 + ipv6_prefix_hostid_addr_up ${_if} && _ret=0 + ipv6_accept_rtadv_up ${_if} && _ret=0 + + # wait for DAD + sleep `${SYSCTL_N} net.inet6.ip6.dad_count` + sleep 1 + + return $_ret } # ipv4_down if -# remove IPv4 addresses from the interface $if +# remove IPv4 addresses from the interface $if ipv4_down() { + local _if _ifs _ret inetList oldifs _inet _if=$1 _ifs="^" _ret=1 - ifexists ${_if} || return 1 - inetList="`ifconfig ${_if} | grep 'inet ' | tr "\n" "$_ifs"`" oldifs="$IFS" @@ -343,17 +525,55 @@ done IFS="$oldifs" - ifalias_down ${_if} && _ret=0 + ifalias_down ${_if} inet && _ret=0 ipv4_addrs_common ${_if} -alias && _ret=0 return $_ret } +# ipv6_down if +# remove IPv6 addresses from the interface $if +ipv6_down() +{ + local _if _ifs _ret inetList oldifs _inet6 + _if=$1 + _ifs="^" + _ret=1 + + if ! ipv6if $_if; then + return 0 + fi + + ipv6_accept_rtadv_down ${_if} && _ret=0 + ifalias_down ${_if} inet6 && _ret=0 + + inetList="`ifconfig ${_if} | grep 'inet6 ' | tr "\n" "$_ifs"`" + + oldifs="$IFS" + IFS="$_ifs" + for _inet6 in $inetList ; do + # get rid of extraneous line + [ -z "$_inet6" ] && break + + _inet6=`expr "$_inet6" : '.*\(inet6 \([0-9a-f:]*\)\).*'` + + IFS="$oldifs" + ifconfig ${_if} ${_inet6} -alias + IFS="$_ifs" + _ret=0 + done + IFS="$oldifs" + + return $_ret +} + # ipv4_addrs_common if action -# Evaluate the ifconfig_if_ipv4 arguments for interface $if -# and use $action to add or remove IPv4 addresses from $if. +# Evaluate the ifconfig_if_ipv4 arguments for interface $if and +# use $action to add or remove IPv4 addresses from $if. ipv4_addrs_common() -{ +{ + local _ret _if _action _cidr _cidr_addr + local _ipaddr _netmask _range _ipnet _iplow _iphigh _ipcount _ret=1 _if=$1 _action=$2 @@ -386,53 +606,239 @@ fi done done + return $_ret } -# ifalias_up if +# ifalias_up if af # Configure aliases for network interface $if. # It returns 0 if at least one alias was configured or # 1 if there were none. # ifalias_up() { + local _ret + _ret=1 + + case "$2" in + inet) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 14 18:15:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F0061065679; Mon, 14 Sep 2009 18:15: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 31F4E1065670 for ; Mon, 14 Sep 2009 18:15:22 +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 20A638FC17 for ; Mon, 14 Sep 2009 18:15:22 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8EIFMHX054612 for ; Mon, 14 Sep 2009 18:15:22 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8EIFLQX054608 for perforce@freebsd.org; Mon, 14 Sep 2009 18:15:21 GMT (envelope-from trasz@freebsd.org) Date: Mon, 14 Sep 2009 18:15:21 GMT Message-Id: <200909141815.n8EIFLQX054608@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 168541 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Sep 2009 18:15:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=168541 Change 168541 by trasz@trasz_anger on 2009/09/14 18:14:56 IFC. Affected files ... .. //depot/projects/soc2009/trasz_limits/Makefile.inc1#5 integrate .. //depot/projects/soc2009/trasz_limits/ObsoleteFiles.inc#13 integrate .. //depot/projects/soc2009/trasz_limits/bin/setfacl/mask.c#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/setfacl/merge.c#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/setfacl/remove.c#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/setfacl/setfacl.1#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/setfacl/setfacl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/setfacl/setfacl.h#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/compat/opensolaris/include/assert.h#1 branch .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/head/assert.h#2 delete .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gdtoa/gdtoaimp.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gdtoa/misc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/defaults/rc.conf#7 integrate .. //depot/projects/soc2009/trasz_limits/etc/network.subr#5 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/Makefile#8 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/NETWORKING#3 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/addswap#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/auto_linklocal#2 delete .. //depot/projects/soc2009/trasz_limits/etc/rc.d/defaultroute#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/devd#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/faith#1 branch .. //depot/projects/soc2009/trasz_limits/etc/rc.d/ip6addrctl#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/mroute6d#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/netif#4 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/netoptions#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/network_ipv6#3 delete .. //depot/projects/soc2009/trasz_limits/etc/rc.d/ppp#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/route6d#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/routed#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/routing#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/rtadvd#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/stf#1 branch .. //depot/projects/soc2009/trasz_limits/etc/rc.d/sysctl#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.subr#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libarchive/archive_read_support_format_iso9660.c#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libarchive/test/test_compat_zip.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libarchive/test/test_read_format_isojoliet_bz2.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libarchive/test/test_read_format_isorr_bz2.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/Versions.def#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/net/getifaddrs.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/stdio/fopen.3#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/stdtime/localtime.c#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libkvm/kvm_proc.c#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libradius/libradius.3#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libradius/radlib.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libradius/radlib.h#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libradius/radlib_private.h#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libstand/net.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libstand/nfs.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libstand/rpc.c#3 integrate .. //depot/projects/soc2009/trasz_limits/release/doc/en_US.ISO8859-1/relnotes/article.sgml#5 integrate .. //depot/projects/soc2009/trasz_limits/release/picobsd/bridge/crunch.conf#2 integrate .. //depot/projects/soc2009/trasz_limits/release/scripts/package-split.py#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/geom/class/mirror/gmirror.8#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/ifconfig/Makefile#4 integrate .. //depot/projects/soc2009/trasz_limits/sbin/ifconfig/af_inet6.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/ifconfig/af_nd6.c#1 branch .. //depot/projects/soc2009/trasz_limits/sbin/ifconfig/ifconfig.8#4 integrate .. //depot/projects/soc2009/trasz_limits/sbin/ifconfig/ifgif.c#3 integrate .. //depot/projects/soc2009/trasz_limits/share/examples/scsi_target/scsi_target.c#2 integrate .. //depot/projects/soc2009/trasz_limits/share/examples/scsi_target/scsi_target.h#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/Makefile#10 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/dpms.4#1 branch .. //depot/projects/soc2009/trasz_limits/share/man/man4/ed.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/inet6.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/ips.4#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/man4.i386/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/man4.i386/dpms.4#2 delete .. //depot/projects/soc2009/trasz_limits/share/man/man4/syscons.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/textdump.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man5/device.hints.5#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/soc2009/trasz_limits/share/monetdef/zh_CN.GB18030.src#2 integrate .. //depot/projects/soc2009/trasz_limits/share/monetdef/zh_CN.GB2312.src#2 integrate .. //depot/projects/soc2009/trasz_limits/share/zoneinfo/asia#6 integrate .. //depot/projects/soc2009/trasz_limits/share/zoneinfo/australasia#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/initcpu.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/msi.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/include/_align.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/amd64/include/param.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/include/_align.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/arm/include/param.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/scsi/scsi_target.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/rpc/xdr.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/proc.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_ioctl.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_misc.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/NOTES#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.amd64#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.i386#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/options#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/options.amd64#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/acpica_prep.sh#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/changes.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/common/dmrestag.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/common/dmtable.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/common/dmtbdump.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/common/dmtbinfo.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslcompiler.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslcompiler.l#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslcompiler.y#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/asldefine.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslfiles.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslglobal.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslload.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/asllookup.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslmain.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslmap.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslstubs.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/asltypes.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/dispatcher/dsfield.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/dispatcher/dswload.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/events/evgpe.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/events/evrgnini.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exfield.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exfldio.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exstorob.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exutils.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/hardware/hwregs.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/hardware/hwtimer.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/hardware/hwxface.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acconfig.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acdebug.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acglobal.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/achware.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acinterp.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/aclocal.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acmacros.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acobject.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acparser.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acpixf.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acpredef.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/actbl.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/actbl1.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/actbl2.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/actypes.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acutils.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/amlcode.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nsload.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nsrepair.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nsxfname.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/parser/psloop.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/parser/psxface.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/tables/tbutils.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/uteval.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utglobal.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utids.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utinit.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utxface.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/x86emu/x86emu.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/contrib/x86emu/x86emu.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/contrib/x86emu/x86emu_regs.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/contrib/x86emu/x86emu_util.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/aac/aac.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi_cpu.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi_pcib_acpi.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ae/if_ae.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/agp/agp_i810.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/amdtemp/amdtemp.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/amr/amr.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/asmc/asmc.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/asmc/asmcvar.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-acerlabs.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-marvell.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ah_osdep.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/dpms/dpms.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/drm/drm_pciids.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/drm/r600_blit.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/if_em.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/if_igb.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ep/if_ep.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ep/if_epreg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/fb/s3_pci.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/fb/vesa.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/fb/vesa.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/fb/vga.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/firewire/fwcrom.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/firewire/fwdev.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/iir/iir.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ixgbe/ixgbe.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/msk/if_msk.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/pci/pcivar.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sound/pci/hda/hdac.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/syscons/daemon/daemon_saver.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/syscons/scterm-teken.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/syscons/scvesactl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_rum.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_rumreg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_urtw.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/wi/if_wi.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/fifofs/fifo_vnops.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clnode.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clport.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/pseudofs/pseudofs_vncache.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/geom_dev.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/geom_vfs.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/acpica/acpi_machdep.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/conf/NOTES#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/cpufreq/hwpstate.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/msi.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/pmap.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/_align.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/i386/include/param.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/pc/vesa.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/xen/xen-os.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/isa/dpms.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/i386/isa/vesa.c#4 delete .. //depot/projects/soc2009/trasz_limits/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/xen/locore.s#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/xen/pmap.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/include/_align.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/ia64/include/param.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_event.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_exec.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_jail.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_linker.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_lock.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_mutex.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_shutdown.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_sig.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_bus.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/sys_generic.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/sys_pipe.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/tty.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/tty_pts.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_mqueue.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_socket.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_aio.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/include/_align.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/include/param.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/Makefile#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/acpi/acpi/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/dpms/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/dtrace/lockstat/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/vesa/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/x86emu/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/sys/net/bpf.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/if_vlan.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/route.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_action.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_proto.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/if_ether.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/if_ether.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/in.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/in.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/in_mcast.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ip_mroute.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/in6.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/in6_ifattach.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/in6_proto.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/ip6_input.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/nd6.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/nd6.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/nd6_nbr.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/nd6_rtr.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/netsmb/smb_dev.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/nfs_node.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsserver/nfs_serv.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/pc98/include/_align.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/pc98/include/pc/vesa.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/pci/intpm.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/pci/intpmreg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/conf/GENERIC#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/_align.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/param.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/security/audit/audit_bsm_token.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/include/_align.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/sparc64/include/param.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/ofw_pci.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/psycho.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/schizo.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/jbusppm.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sun4v/include/_align.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/sun4v/include/param.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/_sockaddr_storage.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/sys/bus.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/imgact_aout.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/param.h#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/socket.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/syscallsubr.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/sysproto.h#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/teken/teken.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/teken/teken.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/teken/teken_demo.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/teken/teken_subr.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/teken/teken_subr_compat.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/ufs/ufs/ufs_acl.c#3 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/acltools/00.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/acltools/01.t#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/acltools/tools-nfs4.test#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/acltools/tools-posix.test#4 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/fstest.c#3 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/chmod/12.t#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/granular/00.t#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/granular/01.t#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/granular/02.t#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/granular/03.t#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/granular/04.t#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/granular/05.t#1 branch .. //depot/projects/soc2009/trasz_limits/usr.bin/tar/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/unzip/unzip.1#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/unzip/unzip.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/w/pr_time.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/acpi/acpidb/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/btxld/btxld.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/ndp/ndp.8#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/ndp/ndp.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/rtsold/if.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/rtsold/rtsold.8#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/rtsold/rtsold.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/rtsold/rtsold.h#2 integrate Differences ... ==== //depot/projects/soc2009/trasz_limits/Makefile.inc1#5 (text+ko) ==== @@ -1,11 +1,11 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.628 2009/07/14 21:19:13 kan Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.629 2009/09/10 07:37:36 des 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 +# -DKERNFAST define NO_KERNELCONFIG, NO_KERNELCLEAN and NO_KERNELDEPEND # -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 ==== //depot/projects/soc2009/trasz_limits/ObsoleteFiles.inc#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.208 2009/09/03 16:34:20 remko Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.209 2009/09/10 21:42:00 delphij Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090909: vesa and dpms promoted to be i386/amd64 common +OLD_FILES+=usr/include/machine/pc/vesa.h +OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz # 20090904: remove lukemftpd OLD_FILES+=usr/libexec/lukemftpd OLD_FILES+=usr/share/man/man5/ftpd.conf.5.gz ==== //depot/projects/soc2009/trasz_limits/bin/setfacl/mask.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/mask.c,v 1.8 2005/01/10 08:39:25 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/mask.c,v 1.9 2009/09/07 16:19:32 trasz Exp $"); #include #include @@ -40,7 +40,7 @@ /* set the appropriate mask the given ACL's */ int -set_acl_mask(acl_t *prev_acl) +set_acl_mask(acl_t *prev_acl, const char *filename) { acl_entry_t entry; acl_t acl; @@ -59,7 +59,7 @@ acl = acl_dup(*prev_acl); if (acl == NULL) - err(1, "acl_dup() failed"); + err(1, "%s: acl_dup() failed", filename); if (n_flag == 0) { /* @@ -70,7 +70,7 @@ * class in the resulting ACL */ if (acl_calc_mask(&acl)) { - warn("acl_calc_mask() failed"); + warn("%s: acl_calc_mask() failed", filename); acl_free(acl); return (-1); } @@ -86,7 +86,8 @@ while (acl_get_entry(acl, entry_id, &entry) == 1) { entry_id = ACL_NEXT_ENTRY; if (acl_get_tag_type(entry, &tag) == -1) - err(1, "acl_get_tag_type() failed"); + err(1, "%s: acl_get_tag_type() failed", + filename); if (tag == ACL_MASK) { acl_free(acl); @@ -100,7 +101,7 @@ * file, then write an error message to standard error and * continue with the next file. */ - warnx("warning: no mask entry"); + warnx("%s: warning: no mask entry", filename); acl_free(acl); return (0); } ==== //depot/projects/soc2009/trasz_limits/bin/setfacl/merge.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/merge.c,v 1.8 2005/01/10 08:39:25 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/merge.c,v 1.9 2009/09/07 16:19:32 trasz Exp $"); #include #include @@ -36,12 +36,15 @@ #include "setfacl.h" -static int merge_user_group(acl_entry_t *entry, acl_entry_t *entry_new); +static int merge_user_group(acl_entry_t *entry, acl_entry_t *entry_new, + int acl_brand); static int -merge_user_group(acl_entry_t *entry, acl_entry_t *entry_new) +merge_user_group(acl_entry_t *entry, acl_entry_t *entry_new, int acl_brand) { acl_permset_t permset; + acl_entry_type_t entry_type; + acl_flagset_t flagset; int have_entry; uid_t *id, *id_new; @@ -59,6 +62,18 @@ err(1, "acl_get_permset() failed"); if (acl_set_permset(*entry_new, permset) == -1) err(1, "acl_set_permset() failed"); + + if (acl_brand == ACL_BRAND_NFS4) { + if (acl_get_entry_type_np(*entry, &entry_type)) + err(1, "acl_get_entry_type_np() failed"); + if (acl_set_entry_type_np(*entry_new, entry_type)) + err(1, "acl_set_entry_type_np() failed"); + if (acl_get_flagset_np(*entry, &flagset)) + err(1, "acl_get_flagset_np() failed"); + if (acl_set_flagset_np(*entry_new, flagset)) + err(1, "acl_set_flagset_np() failed"); + } + have_entry = 1; } acl_free(id); @@ -71,20 +86,31 @@ * merge an ACL into existing file's ACL */ int -merge_acl(acl_t acl, acl_t *prev_acl) +merge_acl(acl_t acl, acl_t *prev_acl, const char *filename) { acl_entry_t entry, entry_new; acl_permset_t permset; acl_t acl_new; acl_tag_t tag, tag_new; - int entry_id, entry_id_new, have_entry; + acl_entry_type_t entry_type, entry_type_new; + acl_flagset_t flagset; + int entry_id, entry_id_new, have_entry, entry_number = 0; + int acl_brand, prev_acl_brand; + + acl_get_brand_np(acl, &acl_brand); + acl_get_brand_np(*prev_acl, &prev_acl_brand); + + if (acl_brand != prev_acl_brand) { + warnx("%s: branding mismatch; existing ACL is %s, " + "entry to be merged is %s", filename, + prev_acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e", + acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e"); + return (-1); + } - if (acl_type == ACL_TYPE_ACCESS) - acl_new = acl_dup(prev_acl[ACCESS_ACL]); - else - acl_new = acl_dup(prev_acl[DEFAULT_ACL]); + acl_new = acl_dup(*prev_acl); if (acl_new == NULL) - err(1, "acl_dup() failed"); + err(1, "%s: acl_dup() failed", filename); entry_id = ACL_FIRST_ENTRY; @@ -94,28 +120,45 @@ /* keep track of existing ACL_MASK entries */ if (acl_get_tag_type(entry, &tag) == -1) - err(1, "acl_get_tag_type() failed - invalid ACL entry"); + err(1, "%s: acl_get_tag_type() failed - " + "invalid ACL entry", filename); if (tag == ACL_MASK) have_mask = 1; /* check against the existing ACL entries */ entry_id_new = ACL_FIRST_ENTRY; - while (have_entry == 0 && - acl_get_entry(acl_new, entry_id_new, &entry_new) == 1) { + while (acl_get_entry(acl_new, entry_id_new, &entry_new) == 1) { entry_id_new = ACL_NEXT_ENTRY; if (acl_get_tag_type(entry, &tag) == -1) - err(1, "acl_get_tag_type() failed"); + err(1, "%s: acl_get_tag_type() failed", + filename); if (acl_get_tag_type(entry_new, &tag_new) == -1) - err(1, "acl_get_tag_type() failed"); + err(1, "%s: acl_get_tag_type() failed", + filename); if (tag != tag_new) continue; + /* + * For NFSv4, in addition to "tag" and "id" we also + * compare "entry_type". + */ + if (acl_brand == ACL_BRAND_NFS4) { + if (acl_get_entry_type_np(entry, &entry_type)) + err(1, "%s: acl_get_entry_type_np() " + "failed", filename); + if (acl_get_entry_type_np(entry_new, &entry_type_new)) + err(1, "%s: acl_get_entry_type_np() " + "failed", filename); + if (entry_type != entry_type_new) + continue; + } + switch(tag) { case ACL_USER: case ACL_GROUP: have_entry = merge_user_group(&entry, - &entry_new); + &entry_new, acl_brand); if (have_entry == 0) break; /* FALLTHROUGH */ @@ -123,37 +166,127 @@ case ACL_GROUP_OBJ: case ACL_OTHER: case ACL_MASK: + case ACL_EVERYONE: if (acl_get_permset(entry, &permset) == -1) - err(1, "acl_get_permset() failed"); + err(1, "%s: acl_get_permset() failed", + filename); if (acl_set_permset(entry_new, permset) == -1) - err(1, "acl_set_permset() failed"); + err(1, "%s: acl_set_permset() failed", + filename); + + if (acl_brand == ACL_BRAND_NFS4) { + if (acl_get_entry_type_np(entry, &entry_type)) + err(1, "%s: acl_get_entry_type_np() failed", + filename); + if (acl_set_entry_type_np(entry_new, entry_type)) + err(1, "%s: acl_set_entry_type_np() failed", + filename); + if (acl_get_flagset_np(entry, &flagset)) + err(1, "%s: acl_get_flagset_np() failed", + filename); + if (acl_set_flagset_np(entry_new, flagset)) + err(1, "%s: acl_set_flagset_np() failed", + filename); + } have_entry = 1; break; default: /* should never be here */ - errx(1, "Invalid tag type: %i", tag); + errx(1, "%s: invalid tag type: %i", filename, tag); break; } } /* if this entry has not been found, it must be new */ if (have_entry == 0) { - if (acl_create_entry(&acl_new, &entry_new) == -1) { - acl_free(acl_new); - return (-1); + + /* + * NFSv4 ACL entries must be prepended to the ACL. + * Appending them at the end makes no sense, since + * in most cases they wouldn't even get evaluated. + */ + if (acl_brand == ACL_BRAND_NFS4) { + if (acl_create_entry_np(&acl_new, &entry_new, entry_number) == -1) { + warn("%s: acl_create_entry_np() failed", filename); + acl_free(acl_new); + return (-1); + } + /* + * Without this increment, adding several + * entries at once, for example + * "setfacl -m user:1:r:allow,user:2:r:allow", + * would make them appear in reverse order. + */ + entry_number++; + } else { + if (acl_create_entry(&acl_new, &entry_new) == -1) { + warn("%s: acl_create_entry() failed", filename); + acl_free(acl_new); + return (-1); + } } if (acl_copy_entry(entry_new, entry) == -1) - err(1, "acl_copy_entry() failed"); + err(1, "%s: acl_copy_entry() failed", filename); } } - if (acl_type == ACL_TYPE_ACCESS) { - acl_free(prev_acl[ACCESS_ACL]); - prev_acl[ACCESS_ACL] = acl_new; - } else { - acl_free(prev_acl[DEFAULT_ACL]); - prev_acl[DEFAULT_ACL] = acl_new; + acl_free(*prev_acl); + *prev_acl = acl_new; + + return (0); +} + +int +add_acl(acl_t acl, uint entry_number, acl_t *prev_acl, const char *filename) +{ + acl_entry_t entry, entry_new; + acl_t acl_new; + int entry_id, acl_brand, prev_acl_brand; + + acl_get_brand_np(acl, &acl_brand); + acl_get_brand_np(*prev_acl, &prev_acl_brand); + + if (prev_acl_brand != ACL_BRAND_NFS4) { + warnx("%s: the '-a' option is only applicable to NFSv4 ACLs", + filename); + return (-1); + } + + if (acl_brand != ACL_BRAND_NFS4) { + warnx("%s: branding mismatch; existing ACL is NFSv4, " + "entry to be added is POSIX.1e", filename); + return (-1); + } + + acl_new = acl_dup(*prev_acl); + if (acl_new == NULL) + err(1, "%s: acl_dup() failed", filename); + + entry_id = ACL_FIRST_ENTRY; + + while (acl_get_entry(acl, entry_id, &entry) == 1) { + entry_id = ACL_NEXT_ENTRY; + + if (acl_create_entry_np(&acl_new, &entry_new, entry_number) == -1) { + warn("%s: acl_create_entry_np() failed", filename); + acl_free(acl_new); + return (-1); + } + + /* + * Without this increment, adding several + * entries at once, for example + * "setfacl -m user:1:r:allow,user:2:r:allow", + * would make them appear in reverse order. + */ + entry_number++; + + if (acl_copy_entry(entry_new, entry) == -1) + err(1, "%s: acl_copy_entry() failed", filename); } + acl_free(*prev_acl); + *prev_acl = acl_new; + return (0); } ==== //depot/projects/soc2009/trasz_limits/bin/setfacl/remove.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/remove.c,v 1.6 2005/01/10 08:39:25 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/remove.c,v 1.7 2009/09/07 16:19:32 trasz Exp $"); #include #include @@ -41,21 +41,31 @@ * remove ACL entries from an ACL */ int -remove_acl(acl_t acl, acl_t *prev_acl) +remove_acl(acl_t acl, acl_t *prev_acl, const char *filename) { acl_entry_t entry; acl_t acl_new; acl_tag_t tag; - int carried_error, entry_id; + int carried_error, entry_id, acl_brand, prev_acl_brand; + + carried_error = 0; + + acl_get_brand_np(acl, &acl_brand); + acl_get_brand_np(*prev_acl, &prev_acl_brand); + + if (acl_brand != prev_acl_brand) { + warnx("%s: branding mismatch; existing ACL is %s, " + "entry to be removed is %s", filename, + prev_acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e", + acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e"); + return (-1); + } carried_error = 0; - if (acl_type == ACL_TYPE_ACCESS) - acl_new = acl_dup(prev_acl[ACCESS_ACL]); - else - acl_new = acl_dup(prev_acl[DEFAULT_ACL]); + acl_new = acl_dup(*prev_acl); if (acl_new == NULL) - err(1, "acl_dup() failed"); + err(1, "%s: acl_dup() failed", filename); tag = ACL_UNDEFINED_TAG; @@ -64,23 +74,68 @@ while (acl_get_entry(acl, entry_id, &entry) == 1) { entry_id = ACL_NEXT_ENTRY; if (acl_get_tag_type(entry, &tag) == -1) - err(1, "acl_get_tag_type() failed"); + err(1, "%s: acl_get_tag_type() failed", filename); if (tag == ACL_MASK) have_mask++; if (acl_delete_entry(acl_new, entry) == -1) { carried_error++; - warnx("cannot remove non-existent acl entry"); + warnx("%s: cannot remove non-existent ACL entry", + filename); } } - if (acl_type == ACL_TYPE_ACCESS) { - acl_free(prev_acl[ACCESS_ACL]); - prev_acl[ACCESS_ACL] = acl_new; - } else { - acl_free(prev_acl[DEFAULT_ACL]); - prev_acl[DEFAULT_ACL] = acl_new; + acl_free(*prev_acl); + *prev_acl = acl_new; + + if (carried_error) + return (-1); + + return (0); +} + +int +remove_by_number(uint entry_number, acl_t *prev_acl, const char *filename) +{ + acl_entry_t entry; + acl_t acl_new; + acl_tag_t tag; + int carried_error, entry_id; + uint i; + + carried_error = 0; + + acl_new = acl_dup(*prev_acl); + if (acl_new == NULL) + err(1, "%s: acl_dup() failed", filename); + + tag = ACL_UNDEFINED_TAG; + + /* + * Find out whether we're removing the mask entry, + * to behave the same as the routine above. + * + * XXX: Is this loop actually needed? + */ + entry_id = ACL_FIRST_ENTRY; + i = 0; + while (acl_get_entry(acl_new, entry_id, &entry) == 1) { + entry_id = ACL_NEXT_ENTRY; + if (i != entry_number) + continue; + if (acl_get_tag_type(entry, &tag) == -1) + err(1, "%s: acl_get_tag_type() failed", filename); + if (tag == ACL_MASK) + have_mask++; + } + + if (acl_delete_entry_np(acl_new, entry_number) == -1) { + carried_error++; + warn("%s: acl_delete_entry_np() failed", filename); } + acl_free(*prev_acl); + *prev_acl = acl_new; + if (carried_error) return (-1); @@ -91,18 +146,14 @@ * remove default entries */ int -remove_default(acl_t *prev_acl) +remove_default(acl_t *prev_acl, const char *filename) { - if (prev_acl[1]) { - acl_free(prev_acl[1]); - prev_acl[1] = acl_init(ACL_MAX_ENTRIES); - if (prev_acl[1] == NULL) - err(1, "acl_init() failed"); - } else { - warn("cannot remove default ACL"); - return (-1); - } + acl_free(*prev_acl); + *prev_acl = acl_init(ACL_MAX_ENTRIES); + if (*prev_acl == NULL) + err(1, "%s: acl_init() failed", filename); + return (0); } @@ -110,71 +161,14 @@ * remove extended entries */ void -remove_ext(acl_t *prev_acl) +remove_ext(acl_t *prev_acl, const char *filename) { - acl_t acl_new, acl_old; - acl_entry_t entry, entry_new; - acl_permset_t perm; - acl_tag_t tag; - int entry_id, have_mask_entry; + acl_t acl_new; - if (acl_type == ACL_TYPE_ACCESS) - acl_old = acl_dup(prev_acl[ACCESS_ACL]); - else - acl_old = acl_dup(prev_acl[DEFAULT_ACL]); - if (acl_old == NULL) - err(1, "acl_dup() failed"); - - have_mask_entry = 0; - acl_new = acl_init(ACL_MAX_ENTRIES); + acl_new = acl_strip_np(*prev_acl, !n_flag); if (acl_new == NULL) - err(1, "acl_init() failed"); - tag = ACL_UNDEFINED_TAG; + err(1, "%s: acl_strip_np() failed", filename); - /* only save the default user/group/other entries */ - entry_id = ACL_FIRST_ENTRY; - while (acl_get_entry(acl_old, entry_id, &entry) == 1) { - entry_id = ACL_NEXT_ENTRY; - - if (acl_get_tag_type(entry, &tag) == -1) - err(1, "acl_get_tag_type() failed"); - - switch(tag) { - case ACL_USER_OBJ: - case ACL_GROUP_OBJ: - case ACL_OTHER: - if (acl_get_tag_type(entry, &tag) == -1) - err(1, "acl_get_tag_type() failed"); - if (acl_get_permset(entry, &perm) == -1) - err(1, "acl_get_permset() failed"); - if (acl_create_entry(&acl_new, &entry_new) == -1) - err(1, "acl_create_entry() failed"); - if (acl_set_tag_type(entry_new, tag) == -1) - err(1, "acl_set_tag_type() failed"); - if (acl_set_permset(entry_new, perm) == -1) - err(1, "acl_get_permset() failed"); - if (acl_copy_entry(entry_new, entry) == -1) - err(1, "acl_copy_entry() failed"); - break; - case ACL_MASK: - have_mask_entry = 1; - break; - default: - break; - } - } - if (have_mask_entry && n_flag == 0) { - if (acl_calc_mask(&acl_new) == -1) - err(1, "acl_calc_mask() failed"); - } else { - have_mask = 1; - } - - if (acl_type == ACL_TYPE_ACCESS) { - acl_free(prev_acl[ACCESS_ACL]); - prev_acl[ACCESS_ACL] = acl_new; - } else { - acl_free(prev_acl[DEFAULT_ACL]); - prev_acl[DEFAULT_ACL] = acl_new; - } + acl_free(*prev_acl); + *prev_acl = acl_new; } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 14 18:21:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37C5E1065676; Mon, 14 Sep 2009 18: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 F02D51065672 for ; Mon, 14 Sep 2009 18:21:28 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E101F8FC14 for ; Mon, 14 Sep 2009 18:21:28 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8EILSbZ055036 for ; Mon, 14 Sep 2009 18:21:28 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8EILSAR055034 for perforce@freebsd.org; Mon, 14 Sep 2009 18:21:28 GMT (envelope-from peter@wemm.org) Date: Mon, 14 Sep 2009 18:21:28 GMT Message-Id: <200909141821.n8EILSAR055034@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 168542 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Sep 2009 18:21:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=168542 Change 168542 by peter@peter_overcee on 2009/09/14 18:20:40 Make debug compile Affected files ... .. //depot/projects/hammer/sys/dev/si/si.c#31 edit Differences ... ==== //depot/projects/hammer/sys/dev/si/si.c#31 (text+ko) ==== @@ -1549,7 +1549,7 @@ /* This is very very bad. The card has crashed. */ /* XXX the driver breaks at this point */ if (err == ETIMEDOUT) - DPRINT(("%s: tsleep1 timeout. hi_stat %s, sp_pend %s\n", pp->sp_name, si_cmdname(ccbp->hi_stat), si_cmdname(pp->sp_pend))); + DPRINT((pp, DBG_PARAM, "%s: tsleep1 timeout. hi_stat %s, sp_pend %s\n", pp->sp_name, si_cmdname(ccbp->hi_stat), si_cmdname(pp->sp_pend))); splx(oldspl); return; } @@ -1586,7 +1586,7 @@ if (err) { DPRINT((pp, DBG_PARAM, "sicmd2 tsleep error: hi_stat (%s) sp_pend (%s)\n", si_cmdname(ccbp->hi_stat), si_cmdname(pp->sp_pend))); if (err == ETIMEDOUT) { - DPRINT(("%s: tsleep2 timeout. hi_stat %s, sp_pend %s\n", pp->sp_name, si_cmdname(ccbp->hi_stat), si_cmdname(pp->sp_pend))); + DPRINT((pp, DBG_PARAM, "%s: tsleep2 timeout. hi_stat %s, sp_pend %s\n", pp->sp_name, si_cmdname(ccbp->hi_stat), si_cmdname(pp->sp_pend))); } break; } From owner-p4-projects@FreeBSD.ORG Mon Sep 14 20:39:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 254B91065694; Mon, 14 Sep 2009 20:39:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DDAEE106568F for ; Mon, 14 Sep 2009 20:38:59 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CE7E68FC1D for ; Mon, 14 Sep 2009 20:38:59 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8EKcxrf067238 for ; Mon, 14 Sep 2009 20:38:59 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8EKcxVN067236 for perforce@freebsd.org; Mon, 14 Sep 2009 20:38:59 GMT (envelope-from anchie@FreeBSD.org) Date: Mon, 14 Sep 2009 20:38:59 GMT Message-Id: <200909142038.n8EKcxVN067236@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Cc: Subject: PERFORCE change 168548 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Sep 2009 20:39:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=168548 Change 168548 by anchie@anchie_malimis on 2009/09/14 20:38:05 Cleaning the unrelated noise. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/cddl/compat/opensolaris/rpc/xdr.h#3 edit .. //depot/projects/soc2009/anchie_send/src/sys/i386/conf/GENERIC#5 edit Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/cddl/compat/opensolaris/rpc/xdr.h#3 (text+ko) ==== @@ -1,112 +1,70 @@ /* - * CDDL HEADER START + * Sun RPC is a product of Sun Microsystems, Inc. and is provided for + * unrestricted use provided that this legend is included on all tape + * media and as a part of the software program in whole or part. Users + * may copy or modify Sun RPC without charge, but are not authorized + * to license or distribute it to anyone else except as part of a product or + * program developed by the user. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE + * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR + * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. + * Sun RPC is provided with no support and without any obligation on the + * part of Sun Microsystems, Inc. to assist in its use, correction, + * modification or enhancement. * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] + * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE + * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC + * OR ANY PART THEREOF. * - * CDDL HEADER END + * In no event will Sun Microsystems, Inc. be liable for any lost revenue + * or profits or other special, indirect and consequential damages, even if + * Sun has been advised of the possibility of such damages. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/rpc/xdr.h,v 1.4 2008/04/22 07:42:59 jb Exp $ + * Sun Microsystems, Inc. + * 2550 Garcia Avenue + * Mountain View, California 94043 */ -/* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ -/* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ - -/* - * Portions of this source code were derived from Berkeley 4.3 BSD - * under license from the Regents of the University of California. - */ - #ifndef _OPENSOLARIS_RPC_XDR_H_ #define _OPENSOLARIS_RPC_XDR_H_ #include_next #ifndef _KERNEL -#include_next -/* - * Strangely, my glibc version (2.3.6) doesn't have xdr_control(), so - * we have to hack it in here (source taken from OpenSolaris). - * By the way, it is assumed the xdrmem implementation is used. - */ - -#undef xdr_control -#define xdr_control(a,b,c) xdrmem_control(a,b,c) +#include /* - * These are the request arguments to XDR_CONTROL. + * Taken from sys/xdr/xdr_mem.c. * - * XDR_PEEK - returns the contents of the next XDR unit on the XDR stream. - * XDR_SKIPBYTES - skips the next N bytes in the XDR stream. - * XDR_RDMAGET - for xdr implementation over RDMA, gets private flags from - * the XDR stream being moved over RDMA - * XDR_RDMANOCHUNK - for xdr implementaion over RDMA, sets private flags in - * the XDR stream moving over RDMA. + * FreeBSD's userland XDR doesn't implement control method (only the kernel), + * but OpenSolaris nvpair still depend on it, so we have to implement it here. */ -#define XDR_PEEK 2 -#define XDR_SKIPBYTES 3 -#define XDR_RDMAGET 4 -#define XDR_RDMASET 5 - -/* FIXME: probably doesn't work */ static __inline bool_t xdrmem_control(XDR *xdrs, int request, void *info) { xdr_bytesrec *xptr; - int32_t *int32p; - int len; switch (request) { - case XDR_GET_BYTES_AVAIL: xptr = (xdr_bytesrec *)info; xptr->xc_is_last_record = TRUE; xptr->xc_num_avail = xdrs->x_handy; return (TRUE); - - case XDR_PEEK: - /* - * Return the next 4 byte unit in the XDR stream. - */ - if (xdrs->x_handy < sizeof (int32_t)) - return (FALSE); - int32p = (int32_t *)info; - *int32p = (int32_t)ntohl((uint32_t) - (*((int32_t *)(xdrs->x_private)))); - return (TRUE); - - case XDR_SKIPBYTES: - /* - * Skip the next N bytes in the XDR stream. - */ - int32p = (int32_t *)info; - len = RNDUP((int)(*int32p)); - if ((xdrs->x_handy -= len) < 0) - return (FALSE); - xdrs->x_private += len; - return (TRUE); - + default: + assert(!"unexpected request"); } return (FALSE); } + +#undef XDR_CONTROL +#define XDR_CONTROL(xdrs, req, op) \ + (((xdrs)->x_ops->x_control == NULL) ? \ + xdrmem_control((xdrs), (req), (op)) : \ + (*(xdrs)->x_ops->x_control)(xdrs, req, op)) + #endif /* !_KERNEL */ #endif /* !_OPENSOLARIS_RPC_XDR_H_ */ ==== //depot/projects/soc2009/anchie_send/src/sys/i386/conf/GENERIC#5 (text+ko) ==== @@ -85,8 +85,6 @@ options WITNESS # Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed -options DEBUG_MEMGUARD - # To make an SMP kernel, the next two lines are needed options SMP # Symmetric MultiProcessor Kernel device apic # I/O APIC From owner-p4-projects@FreeBSD.ORG Mon Sep 14 23:07:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94B5D1065705; Mon, 14 Sep 2009 23:07:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 588A01065702 for ; Mon, 14 Sep 2009 23:07:42 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 469E18FC14 for ; Mon, 14 Sep 2009 23:07:42 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8EN7gI0091175 for ; Mon, 14 Sep 2009 23:07:42 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8EN7gZi091173 for perforce@freebsd.org; Mon, 14 Sep 2009 23:07:42 GMT (envelope-from gk@FreeBSD.org) Date: Mon, 14 Sep 2009 23:07:42 GMT Message-Id: <200909142307.n8EN7gZi091173@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gk@FreeBSD.org using -f From: Gleb Kurtsou To: Perforce Change Reviews Cc: Subject: PERFORCE change 168553 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Sep 2009 23:07:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=168553 Change 168553 by gk@gk_h1 on 2009/09/14 23:07:07 implement mapped read and write Affected files ... .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#14 edit Differences ... ==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#14 (text+ko) ==== @@ -51,18 +51,23 @@ #include #include #include +#include #include #include #include #include - -#include +#include +#include #include #include #include +#include +#include #include +#include + static int pefs_bug_bypass = 0; /* for debugging: enables bypass printf'ing */ SYSCTL_INT(_debug, OID_AUTO, pefs_bug_bypass, CTLFLAG_RW, &pefs_bug_bypass, 0, ""); @@ -631,32 +636,49 @@ } static int -pefs_vreg_grow(struct vnode *vp, u_quad_t nsize, struct ucred *cred) +pefs_tryextend(struct vnode *vp, u_quad_t nsize, struct ucred *cred) { struct vnode *lvp = PEFS_LOWERVP(vp); - struct vattr o_va; + struct vattr va; struct uio *puio; struct pefs_node *pn = VP_TO_PN(vp); struct pefs_chunk pc; struct pefs_ctx *ctx; + u_quad_t osize; off_t offset; size_t bsize, size; int error; - error = VOP_GETATTR(lvp, &o_va, cred); + MPASS(vp->v_type == VREG); + + error = VOP_GETATTR(lvp, &va, cred); if (error) return (error); + osize = va.va_size; - PEFSDEBUG("pefs_vreg_grow: old size %jd, new size %jd\n", - nsize, o_va.va_size); - if (nsize <= o_va.va_size) + if (nsize <= osize) return (0); - if (nsize - o_va.va_size >= INT_MAX) - return (EINVAL); - size = nsize - o_va.va_size; + if (VOP_ISLOCKED(vp) != LK_EXCLUSIVE) { + vn_lock(vp, LK_UPGRADE | LK_RETRY); + error = VOP_GETATTR(lvp, &va, cred); + if (error) + return (error); + osize = va.va_size; + if (nsize <= osize) + return (0); + } + + PEFSDEBUG("pefs_tryextend: old size 0x%jx, new size 0x%jx\n", osize, nsize); + + VATTR_NULL(&va); + va.va_size = nsize; + VOP_SETATTR(lvp, &va, cred); + vnode_pager_setsize(vp, nsize); + + size = nsize - osize; bsize = qmin(size, DFLTPHYS); - offset = o_va.va_size; + offset = osize; pefs_chunk_create(&pc, pn, bsize); ctx = pefs_ctx_get(); @@ -665,14 +687,13 @@ pefs_chunk_zero(&pc); pefs_data_encrypt_update(ctx, &pn->pn_tkey, &pc); puio = pefs_chunk_uio(&pc, offset, UIO_WRITE); - PEFSDEBUG("pefs_vreg_grow: resizing file; filling with zeros: offset=%jd, resid=%jd\n", offset, bsize); + PEFSDEBUG("pefs_tryextend: resizing file; filling with zeros: offset=0x%jx, resid=0x%jx\n", offset, bsize); error = VOP_WRITE(lvp, puio, 0, cred); if (error) { /* try to reset */ - size = o_va.va_size; - VATTR_NULL(&o_va); - o_va.va_size = size; - VOP_SETATTR(lvp, &o_va, cred); + VATTR_NULL(&va); + va.va_size = osize; + VOP_SETATTR(lvp, &va, cred); break; } offset += bsize; @@ -695,7 +716,6 @@ pefs_setattr(struct vop_setattr_args *ap) { struct vnode *vp = ap->a_vp; - struct vnode *lvp; struct ucred *cred = ap->a_cred; struct vattr *vap = ap->a_vap; int error; @@ -723,22 +743,23 @@ * Disallow write attempts if the filesystem is * mounted read-only. */ - if (vp->v_mount->mnt_flag & MNT_RDONLY) + if ((vp->v_mount->mnt_flag & MNT_RDONLY) || + pefs_no_keys(vp)) return (EROFS); if (vp->v_type == VREG) - error = pefs_vreg_grow(vp, vap->va_size, cred); + error = pefs_tryextend(vp, vap->va_size, cred); else - error = EOPNOTSUPP; // TODO pefs_vlnk_chsize + error = EOPNOTSUPP; /* TODO */ if (error) return (error); + vnode_pager_setsize(vp, vap->va_size); break; default: return (EOPNOTSUPP); } } - lvp = PEFS_LOWERVP(vp); - return (VOP_SETATTR(lvp, vap, cred)); + return (VOP_SETATTR(PEFS_LOWERVP(vp), vap, cred)); } /* @@ -1041,6 +1062,15 @@ pefs_node_buf_free(pn); VI_UNLOCK(vp); + if (vp->v_object != NULL) { + if (vp->v_object->resident_page_count > 0) + PEFSDEBUG("pefs_inactive: vobject has dirty pages: vp=%p count=%d\n", + vp, vp->v_object->resident_page_count); + VM_OBJECT_LOCK(vp->v_object); + vm_object_page_clean(vp->v_object, 0, 0, OBJPC_SYNC); + VM_OBJECT_UNLOCK(vp->v_object); + } + if ((pn->pn_flags & PN_WANTRECYCLE) || (pn->pn_flags & PN_HASKEY) == 0) vrecycle(vp, td); @@ -1206,7 +1236,6 @@ if (error) break; - /* Nothing was written.. somehow */ if (pc.pc_size == puio->uio_resid) break; pefs_chunk_setsize(&pc, pc.pc_size - puio->uio_resid); @@ -1536,6 +1565,33 @@ return (error); } +static inline int +pefs_getsize(struct vnode *vp, u_quad_t *sizep, struct ucred *cred) +{ + struct vattr va; + int error; + + error = VOP_GETATTR(PEFS_LOWERVP(vp), &va, cred); + if (error == 0) + *sizep = va.va_size; + + return (error); +} + +static inline int +pefs_ismapped(struct vnode *vp) +{ + vm_object_t object = vp->v_object; + + if (object == NULL) + return (0); + + if (object->resident_page_count > 0 || object->cache != NULL || + object->root != NULL) + return (1); + return (0); +} + static int pefs_read(struct vop_read_args *ap) { @@ -1543,16 +1599,21 @@ struct vnode *lvp = PEFS_LOWERVP(vp); struct uio *uio = ap->a_uio; struct uio *puio; + struct ucred *cred = ap->a_cred; struct pefs_node *pn = VP_TO_PN(vp); struct pefs_chunk pc; struct pefs_ctx *ctx; - ssize_t bsize, done; - int error = 0; + vm_page_t m; + vm_offset_t moffset; + u_quad_t fsize; + ssize_t bsize, msize, done; + int ioflag = ap->a_ioflag; + int error = 0, mapped, restart_decrypt; if (vp->v_type == VDIR) return (EISDIR); if (!(pn->pn_flags & PN_HASKEY) || vp->v_type == VFIFO) - return (VOP_READ(lvp, uio, ap->a_ioflag, ap->a_cred)); + return (VOP_READ(lvp, uio, ioflag, cred)); if (vp->v_type != VREG) return (EOPNOTSUPP); if (uio->uio_resid == 0) @@ -1560,40 +1621,72 @@ if (uio->uio_offset < 0) return (EINVAL); - bsize = qmin(uio->uio_resid, DFLTPHYS); + mapped = pefs_ismapped(vp); + bsize = qmin(uio->uio_resid, mapped ? PAGE_SIZE : DFLTPHYS); + error = pefs_getsize(vp, &fsize, cred); + if (error != 0) + return (error); ctx = pefs_ctx_get(); - pefs_data_decrypt_start(ctx, &pn->pn_tkey, uio->uio_offset); pefs_chunk_create(&pc, pn, bsize); - while (uio->uio_resid > 0) { + restart_decrypt = 1; + while (uio->uio_resid > 0 && uio->uio_offset < fsize) { + bsize = qmin(uio->uio_resid, bsize); + bsize = qmin(fsize - uio->uio_offset, bsize); + pefs_chunk_setsize(&pc, bsize); + + if (mapped) { + moffset = uio->uio_offset & PAGE_MASK; + msize = qmin(PAGE_SIZE - moffset, bsize); + + VM_OBJECT_LOCK(vp->v_object); +lookupvpg: + m = vm_page_lookup(vp->v_object, + OFF_TO_IDX(uio->uio_offset)); + if (m != NULL && vm_page_is_valid(m, moffset, msize)) { + if (vm_page_sleep_if_busy(m, FALSE, "pefsmr")) + goto lookupvpg; + vm_page_busy(m); + VM_OBJECT_UNLOCK(vp->v_object); + PEFSDEBUG("pefs_read: mapped: offset=0x%jx moffset=0x%jx msize=0x%jx\n", + uio->uio_offset, moffset, msize); + error = uiomove_fromphys(&m, moffset, msize, uio); + VM_OBJECT_LOCK(vp->v_object); + vm_page_wakeup(m); + VM_OBJECT_UNLOCK(vp->v_object); + if (error != 0) + break; + restart_decrypt = 1; + continue; + } else if (m != NULL && uio->uio_segflg == UIO_NOCOPY) { + /* FIXME: UIO_NOCOPY is not supported */ + VM_OBJECT_UNLOCK(vp->v_object); + return (EIO); + } + VM_OBJECT_UNLOCK(vp->v_object); + /* Page not cached. Make next read page-aligned. */ + pefs_chunk_setsize(&pc, msize); + } + + PEFSDEBUG("pefs_read: mapped=%d m=%d offset=0x%jx size=0x%jx\n", + mapped, m != NULL, uio->uio_offset, pc.pc_size); puio = pefs_chunk_uio(&pc, uio->uio_offset, uio->uio_rw); - error = VOP_READ(lvp, puio, ap->a_ioflag, ap->a_cred); - if (error != 0) { + error = VOP_READ(lvp, puio, ioflag, cred); + if (error != 0) break; - } done = pc.pc_size - puio->uio_resid; -#if 0 - error = VOP_GETATTR(lvp, &va, ap->a_cred); - if (error != 0) { - pefs_chunk_free(&pc, pn); - return (error); - } - if (va.va_size < uio->uio_offset) { - /* Read past end of file */ - done -= uio->uio_offset - va.va_size; - MPASS(done >= 0); - } -#endif if (done <= 0) break; pefs_chunk_setsize(&pc, done); + if (restart_decrypt) { + restart_decrypt = 0; + pefs_data_decrypt_start(ctx, &pn->pn_tkey, + uio->uio_offset); + } pefs_data_decrypt_update(ctx, &pn->pn_tkey, &pc); pefs_chunk_copy(&pc, uio); - - bsize = qmin(uio->uio_resid, bsize); - pefs_chunk_setsize(&pc, bsize); } pefs_ctx_free(ctx); pefs_chunk_free(&pc, pn); @@ -1606,19 +1699,28 @@ { struct vnode *vp = ap->a_vp; struct vnode *lvp = PEFS_LOWERVP(vp); + struct ucred *cred = ap->a_cred; struct uio *uio = ap->a_uio; struct uio *puio; + struct sf_buf *sf; struct pefs_node *pn = VP_TO_PN(vp); struct pefs_chunk pc; struct pefs_ctx *ctx; + vm_page_t m = NULL; + vm_offset_t moffset; + vm_pindex_t idx; + u_quad_t nsize; + char *ma; off_t offset; - ssize_t resid, bsize; - int error = 0; + ssize_t resid, bsize, msize; + int ioflag = ap->a_ioflag; + int restart_encrypt; + int error = 0, mapped; if (vp->v_type == VDIR) return (EISDIR); if (vp->v_type == VFIFO) - return (error = VOP_WRITE(lvp, uio, ap->a_ioflag, ap->a_cred)); + return (VOP_WRITE(lvp, uio, ioflag, cred)); if (vp->v_type != VREG) return (EOPNOTSUPP); if (uio->uio_resid == 0) @@ -1629,36 +1731,117 @@ if (!(pn->pn_flags & PN_HASKEY)) return (EROFS); + error = pefs_getsize(vp, &nsize, cred); + if (error != 0) + return (error); + + if (ioflag & IO_APPEND) { + uio->uio_offset = nsize; + ioflag &= ~IO_APPEND; + } + offset = uio->uio_offset; resid = uio->uio_resid; - error = pefs_vreg_grow(vp, offset, ap->a_cred); - if (error != 0) - return (error); + if (offset > nsize) { + error = pefs_tryextend(vp, offset, cred); + if (error != 0) + return (error); + } + + mapped = pefs_ismapped(vp); + bsize = qmin(resid, mapped ? PAGE_SIZE : DFLTPHYS); + + if (offset + resid > nsize) { + PEFSDEBUG("pefs_write: extend: 0x%jx (old size: 0x%jx)\n", offset + resid, nsize); + nsize = offset + resid; + vnode_pager_setsize(vp, nsize); + } - bsize = qmin(resid, DFLTPHYS); ctx = pefs_ctx_get(); - pefs_data_encrypt_start(ctx, &pn->pn_tkey, uio->uio_offset); - pefs_chunk_create(&pc, pn, bsize); + restart_encrypt = 1; + pefs_chunk_create(&pc, pn, mapped ? PAGE_SIZE : bsize); while (resid > 0) { + bsize = qmin(resid, bsize); + if (mapped) { + moffset = offset & PAGE_MASK; + msize = qmin(PAGE_SIZE - moffset, bsize); + msize = qmin(nsize - offset, msize); + pefs_chunk_setsize(&pc, moffset + msize); + + VM_OBJECT_LOCK(vp->v_object); +lookupvpg: + idx = OFF_TO_IDX(offset); + m = vm_page_lookup(vp->v_object, idx); + if (m != NULL && vm_page_is_valid(m, 0, moffset + msize)) { + if (vm_page_sleep_if_busy(m, FALSE, "pefsmw")) + goto lookupvpg; + vm_page_busy(m); + vm_page_lock_queues(); + vm_page_undirty(m); + vm_page_unlock_queues(); + VM_OBJECT_UNLOCK(vp->v_object); + PEFSDEBUG("pefs_write: mapped: offset=0x%jx moffset=0x%jx msize=0x%jx\n", + offset, moffset, msize); + sched_pin(); + sf = sf_buf_alloc(m, SFB_CPUPRIVATE); + ma = (char *)sf_buf_kva(sf); + error = uiomove(ma + moffset, msize, uio); + memcpy(pc.pc_base, ma, pc.pc_size); + sf_buf_free(sf); + sched_unpin(); + VM_OBJECT_LOCK(vp->v_object); + vm_page_wakeup(m); + VM_OBJECT_UNLOCK(vp->v_object); + if (error != 0) { + break; + } + if (moffset != 0) { + resid += moffset; + offset -= moffset; + restart_encrypt = 1; + } + goto lower_update; + } else if (__predict_false(vp->v_object->cache != NULL)) { + PEFSDEBUG("pefs_write: free cache: 0x%jx\n", offset - moffset); + vm_page_cache_free(vp->v_object, idx, + idx + 1); + } + MPASS(m == NULL || + !vm_page_is_valid(m, moffset, msize)); + VM_OBJECT_UNLOCK(vp->v_object); + /* Page align consequent writes */ + pefs_chunk_setsize(&pc, msize); + } else { + pefs_chunk_setsize(&pc, bsize); + } pefs_chunk_copy(&pc, uio); +lower_update: + PEFSDEBUG("pefs_write: mapped=%d m=%d offset=0x%jx size=0x%jx\n", + mapped, m != NULL, offset, pc.pc_size); + if (restart_encrypt) { + restart_encrypt = 0; + pefs_data_encrypt_start(ctx, &pn->pn_tkey, offset); + } pefs_data_encrypt_update(ctx, &pn->pn_tkey, &pc); puio = pefs_chunk_uio(&pc, offset, uio->uio_rw); - error = VOP_WRITE(lvp, puio, ap->a_ioflag, ap->a_cred); + /* IO_APPEND handled above to prevent offset change races. */ + error = VOP_WRITE(lvp, puio, ioflag, cred); if (error != 0) break; MPASS(puio->uio_resid == 0); - resid -= bsize; - offset += bsize; + resid -= pc.pc_size; + offset += pc.pc_size; - bsize = qmin(resid, bsize); - pefs_chunk_setsize(&pc, bsize); } pefs_ctx_free(ctx); pefs_chunk_free(&pc, pn); + MPASS(resid == uio->uio_resid); + MPASS(offset == uio->uio_offset); + return (error); } From owner-p4-projects@FreeBSD.ORG Tue Sep 15 13:47:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD93C1065693; Tue, 15 Sep 2009 13:47: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 809CF106568D for ; Tue, 15 Sep 2009 13:47:46 +0000 (UTC) (envelope-from yohanes@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6D7328FC0C for ; Tue, 15 Sep 2009 13:47:46 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8FDlkLj010775 for ; Tue, 15 Sep 2009 13:47:46 GMT (envelope-from yohanes@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8FDli2L010771 for perforce@freebsd.org; Tue, 15 Sep 2009 13:47:44 GMT (envelope-from yohanes@FreeBSD.org) Date: Tue, 15 Sep 2009 13:47:44 GMT Message-Id: <200909151347.n8FDli2L010771@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to yohanes@FreeBSD.org using -f From: Yohanes Nugroho To: Perforce Change Reviews Cc: Subject: PERFORCE change 168566 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Sep 2009 13:47:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=168566 Change 168566 by yohanes@econa on 2009/09/15 13:47:05 sync Affected files ... .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/firewalls/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/virtualization/chapter.sgml#4 integrate .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/Makefile#2 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/custom-gcc/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/custom-gcc/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#5 integrate .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/articles/Makefile#2 integrate .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/firewalls/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/linuxemu/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/virtualization/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/articles/Makefile#2 integrate .. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#4 integrate .. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/share/pgpkeys/johans.key#2 integrate .. //depot/projects/str91xx/doc/share/sgml/freebsd.ent#2 integrate .. //depot/projects/str91xx/ports/CHANGES#3 integrate .. //depot/projects/str91xx/ports/GIDs#4 integrate .. //depot/projects/str91xx/ports/LEGAL#3 integrate .. //depot/projects/str91xx/ports/MOVED#5 integrate .. //depot/projects/str91xx/ports/Mk/bsd.cmake.mk#2 integrate .. //depot/projects/str91xx/ports/Mk/bsd.database.mk#3 integrate .. //depot/projects/str91xx/ports/Mk/bsd.gcc.mk#3 integrate .. //depot/projects/str91xx/ports/Mk/bsd.kde4.mk#4 integrate .. //depot/projects/str91xx/ports/Mk/bsd.linux-apps.mk#3 integrate .. //depot/projects/str91xx/ports/Mk/bsd.port.mk#4 integrate .. //depot/projects/str91xx/ports/Mk/bsd.qt.mk#3 integrate .. //depot/projects/str91xx/ports/Mk/bsd.sites.mk#4 integrate .. //depot/projects/str91xx/ports/Tools/scripts/bump_revision.pl#2 integrate .. //depot/projects/str91xx/ports/UIDs#4 integrate .. //depot/projects/str91xx/ports/UPDATING#5 integrate .. //depot/projects/str91xx/src/Makefile.inc1#3 integrate .. //depot/projects/str91xx/src/ObsoleteFiles.inc#5 integrate .. //depot/projects/str91xx/src/UPDATING#5 integrate .. //depot/projects/str91xx/src/bin/chmod/chmod.c#3 integrate .. //depot/projects/str91xx/src/bin/cp/utils.c#3 integrate .. //depot/projects/str91xx/src/bin/getfacl/getfacl.1#2 integrate .. //depot/projects/str91xx/src/bin/getfacl/getfacl.c#2 integrate .. //depot/projects/str91xx/src/bin/ls/print.c#2 integrate .. //depot/projects/str91xx/src/bin/mv/mv.c#2 integrate .. //depot/projects/str91xx/src/bin/setfacl/mask.c#2 integrate .. //depot/projects/str91xx/src/bin/setfacl/merge.c#2 integrate .. //depot/projects/str91xx/src/bin/setfacl/remove.c#2 integrate .. //depot/projects/str91xx/src/bin/setfacl/setfacl.1#2 integrate .. //depot/projects/str91xx/src/bin/setfacl/setfacl.c#2 integrate .. //depot/projects/str91xx/src/bin/setfacl/setfacl.h#2 integrate .. //depot/projects/str91xx/src/bin/sh/eval.c#5 integrate .. //depot/projects/str91xx/src/bin/sh/exec.c#4 integrate .. //depot/projects/str91xx/src/bin/sh/mknodes.c#3 integrate .. //depot/projects/str91xx/src/bin/sh/nodes.c.pat#3 integrate .. //depot/projects/str91xx/src/cddl/compat/opensolaris/include/assert.h#1 branch .. //depot/projects/str91xx/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate .. //depot/projects/str91xx/src/cddl/contrib/opensolaris/head/assert.h#2 delete .. //depot/projects/str91xx/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 integrate .. //depot/projects/str91xx/src/contrib/ee/ee.c#3 integrate .. //depot/projects/str91xx/src/contrib/gdtoa/gdtoaimp.h#2 integrate .. //depot/projects/str91xx/src/contrib/gdtoa/misc.c#2 integrate .. //depot/projects/str91xx/src/etc/Makefile#3 integrate .. //depot/projects/str91xx/src/etc/defaults/rc.conf#4 integrate .. //depot/projects/str91xx/src/etc/inetd.conf#2 integrate .. //depot/projects/str91xx/src/etc/mtree/BSD.local.dist#3 delete .. //depot/projects/str91xx/src/etc/mtree/BSD.usr.dist#3 integrate .. //depot/projects/str91xx/src/etc/mtree/BSD.x11-4.dist#2 delete .. //depot/projects/str91xx/src/etc/mtree/BSD.x11.dist#2 delete .. //depot/projects/str91xx/src/etc/mtree/Makefile#2 integrate .. //depot/projects/str91xx/src/etc/network.subr#4 integrate .. //depot/projects/str91xx/src/etc/rc.d/Makefile#5 integrate .. //depot/projects/str91xx/src/etc/rc.d/NETWORKING#3 integrate .. //depot/projects/str91xx/src/etc/rc.d/addswap#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/auto_linklocal#2 delete .. //depot/projects/str91xx/src/etc/rc.d/defaultroute#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/devd#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/faith#1 branch .. //depot/projects/str91xx/src/etc/rc.d/ip6addrctl#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/mroute6d#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/netif#3 integrate .. //depot/projects/str91xx/src/etc/rc.d/netoptions#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/network_ipv6#3 delete .. //depot/projects/str91xx/src/etc/rc.d/ppp#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/route6d#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/routed#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/routing#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/rtadvd#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/stf#1 branch .. //depot/projects/str91xx/src/etc/rc.d/sysctl#2 integrate .. //depot/projects/str91xx/src/etc/rc.subr#3 integrate .. //depot/projects/str91xx/src/lib/Makefile#3 integrate .. //depot/projects/str91xx/src/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/str91xx/src/lib/libarchive/archive_read_support_format_iso9660.c#3 integrate .. //depot/projects/str91xx/src/lib/libarchive/test/test_compat_zip.c#2 integrate .. //depot/projects/str91xx/src/lib/libarchive/test/test_read_format_isojoliet_bz2.c#2 integrate .. //depot/projects/str91xx/src/lib/libarchive/test/test_read_format_isorr_bz2.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/Versions.def#2 integrate .. //depot/projects/str91xx/src/lib/libc/locale/ctype.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/locale/digittoint.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/locale/isalnum.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/locale/isalpha.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/locale/isascii.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/locale/isblank.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/locale/iscntrl.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/locale/isdigit.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/locale/isgraph.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/locale/isideogram.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/locale/islower.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/locale/isphonogram.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/locale/isprint.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/locale/ispunct.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/locale/isrune.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/locale/isspace.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/locale/isspecial.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/locale/isupper.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/locale/isxdigit.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/locale/toascii.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/locale/tolower.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/locale/toupper.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/net/getifaddrs.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/posix1e/acl_calc_mask.c#3 integrate .. //depot/projects/str91xx/src/lib/libc/posix1e/acl_support.c#3 integrate .. //depot/projects/str91xx/src/lib/libc/posix1e/acl_to_text.c#3 integrate .. //depot/projects/str91xx/src/lib/libc/stdio/fopen.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/stdtime/localtime.c#3 integrate .. //depot/projects/str91xx/src/lib/libc/stdtime/strptime.c#3 integrate .. //depot/projects/str91xx/src/lib/libc/sys/intro.2#2 integrate .. //depot/projects/str91xx/src/lib/libkvm/kvm_proc.c#3 integrate .. //depot/projects/str91xx/src/lib/libpam/modules/pam_lastlog/pam_lastlog.c#2 integrate .. //depot/projects/str91xx/src/lib/libradius/libradius.3#2 integrate .. //depot/projects/str91xx/src/lib/libradius/radlib.c#2 integrate .. //depot/projects/str91xx/src/lib/libradius/radlib.h#2 integrate .. //depot/projects/str91xx/src/lib/libradius/radlib_private.h#2 integrate .. //depot/projects/str91xx/src/lib/libstand/net.c#2 integrate .. //depot/projects/str91xx/src/lib/libstand/nfs.c#2 integrate .. //depot/projects/str91xx/src/lib/libstand/rpc.c#3 integrate .. //depot/projects/str91xx/src/libexec/Makefile#2 integrate .. //depot/projects/str91xx/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 integrate .. //depot/projects/str91xx/src/release/picobsd/bridge/crunch.conf#2 integrate .. //depot/projects/str91xx/src/release/scripts/package-split.py#3 integrate .. //depot/projects/str91xx/src/sbin/camcontrol/camcontrol.8#3 integrate .. //depot/projects/str91xx/src/sbin/camcontrol/camcontrol.c#3 integrate .. //depot/projects/str91xx/src/sbin/geom/class/mirror/geom_mirror.c#2 integrate .. //depot/projects/str91xx/src/sbin/geom/class/mirror/gmirror.8#2 integrate .. //depot/projects/str91xx/src/sbin/geom/core/geom.c#3 integrate .. //depot/projects/str91xx/src/sbin/ifconfig/Makefile#3 integrate .. //depot/projects/str91xx/src/sbin/ifconfig/af_inet6.c#3 integrate .. //depot/projects/str91xx/src/sbin/ifconfig/af_nd6.c#1 branch .. //depot/projects/str91xx/src/sbin/ifconfig/ifconfig.8#3 integrate .. //depot/projects/str91xx/src/sbin/ifconfig/ifgif.c#2 integrate .. //depot/projects/str91xx/src/sbin/mount/mount.8#2 integrate .. //depot/projects/str91xx/src/sbin/mount/mount.c#3 integrate .. //depot/projects/str91xx/src/sbin/route/route.8#2 integrate .. //depot/projects/str91xx/src/share/colldef/Makefile#3 integrate .. //depot/projects/str91xx/src/share/colldef/la_LN.ISO8859-13.src#1 branch .. //depot/projects/str91xx/src/share/colldef/lt_LT.ISO8859-13.src#2 delete .. //depot/projects/str91xx/src/share/examples/scsi_target/scsi_target.c#2 integrate .. //depot/projects/str91xx/src/share/examples/scsi_target/scsi_target.h#2 integrate .. //depot/projects/str91xx/src/share/man/man4/Makefile#4 integrate .. //depot/projects/str91xx/src/share/man/man4/ahci.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/dpms.4#1 branch .. //depot/projects/str91xx/src/share/man/man4/ed.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/inet6.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/ip6.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/ips.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/man4.i386/Makefile#2 integrate .. //depot/projects/str91xx/src/share/man/man4/man4.i386/dpms.4#2 delete .. //depot/projects/str91xx/src/share/man/man4/mfi.4#3 integrate .. //depot/projects/str91xx/src/share/man/man4/pts.4#3 integrate .. //depot/projects/str91xx/src/share/man/man4/pty.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/syscons.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/textdump.4#2 integrate .. //depot/projects/str91xx/src/share/man/man5/device.hints.5#2 integrate .. //depot/projects/str91xx/src/share/man/man5/make.conf.5#2 integrate .. //depot/projects/str91xx/src/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/str91xx/src/share/mklocale/Makefile#3 integrate .. //depot/projects/str91xx/src/share/mklocale/la_LN.ISO8859-13.src#1 branch .. //depot/projects/str91xx/src/share/mklocale/lt_LT.ISO8859-13.src#2 delete .. //depot/projects/str91xx/src/share/monetdef/Makefile#3 integrate .. //depot/projects/str91xx/src/share/monetdef/lv_LV.ISO8859-13.src#1 branch .. //depot/projects/str91xx/src/share/monetdef/zh_CN.GB18030.src#2 integrate .. //depot/projects/str91xx/src/share/monetdef/zh_CN.GB2312.src#2 integrate .. //depot/projects/str91xx/src/share/msgdef/Makefile#3 integrate .. //depot/projects/str91xx/src/share/msgdef/lv_LV.ISO8859-13.src#1 branch .. //depot/projects/str91xx/src/share/msgdef/lv_LV.UTF-8.src#1 branch .. //depot/projects/str91xx/src/share/numericdef/Makefile#3 integrate .. //depot/projects/str91xx/src/share/timedef/Makefile#3 integrate .. //depot/projects/str91xx/src/share/timedef/ja_JP.UTF-8.src#2 integrate .. //depot/projects/str91xx/src/share/timedef/lv_LV.ISO8859-13.src#1 branch .. //depot/projects/str91xx/src/share/timedef/lv_LV.UTF-8.src#1 branch .. //depot/projects/str91xx/src/share/zoneinfo/asia#4 integrate .. //depot/projects/str91xx/src/share/zoneinfo/australasia#3 integrate .. //depot/projects/str91xx/src/sys/amd64/amd64/elf_machdep.c#3 integrate .. //depot/projects/str91xx/src/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/str91xx/src/sys/amd64/amd64/initcpu.c#3 integrate .. //depot/projects/str91xx/src/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/str91xx/src/sys/amd64/amd64/msi.c#3 integrate .. //depot/projects/str91xx/src/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/str91xx/src/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/str91xx/src/sys/amd64/include/_align.h#1 branch .. //depot/projects/str91xx/src/sys/amd64/include/param.h#3 integrate .. //depot/projects/str91xx/src/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/str91xx/src/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/str91xx/src/sys/arm/arm/vm_machdep.c#4 integrate .. //depot/projects/str91xx/src/sys/arm/include/_align.h#1 branch .. //depot/projects/str91xx/src/sys/arm/include/param.h#3 integrate .. //depot/projects/str91xx/src/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/str91xx/src/sys/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/str91xx/src/sys/cam/ata/ata_all.c#2 integrate .. //depot/projects/str91xx/src/sys/cam/ata/ata_all.h#2 integrate .. //depot/projects/str91xx/src/sys/cam/ata/ata_da.c#2 integrate .. //depot/projects/str91xx/src/sys/cam/ata/ata_xpt.c#3 integrate .. //depot/projects/str91xx/src/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/str91xx/src/sys/cam/cam_xpt_internal.h#2 integrate .. //depot/projects/str91xx/src/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/str91xx/src/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/str91xx/src/sys/cam/scsi/scsi_target.c#3 integrate .. //depot/projects/str91xx/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/str91xx/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/str91xx/src/sys/cddl/compat/opensolaris/sys/proc.h#3 integrate .. //depot/projects/str91xx/src/sys/cddl/compat/opensolaris/sys/vfs.h#2 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#3 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#4 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/str91xx/src/sys/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/str91xx/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/str91xx/src/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/str91xx/src/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/str91xx/src/sys/compat/linux/linux_ioctl.c#5 integrate .. //depot/projects/str91xx/src/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/str91xx/src/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/str91xx/src/sys/conf/NOTES#4 integrate .. //depot/projects/str91xx/src/sys/conf/files#5 integrate .. //depot/projects/str91xx/src/sys/conf/files.amd64#3 integrate .. //depot/projects/str91xx/src/sys/conf/files.i386#4 integrate .. //depot/projects/str91xx/src/sys/conf/files.ia64#2 integrate .. //depot/projects/str91xx/src/sys/conf/files.powerpc#4 integrate .. //depot/projects/str91xx/src/sys/conf/files.sparc64#2 integrate .. //depot/projects/str91xx/src/sys/conf/options#5 integrate .. //depot/projects/str91xx/src/sys/conf/options.amd64#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/acpica_prep.sh#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/changes.txt#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/common/dmrestag.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/common/dmtable.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/common/dmtbdump.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/common/dmtbinfo.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/compiler/asldefine.h#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/compiler/aslfiles.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/compiler/aslglobal.h#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/compiler/aslload.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/compiler/asllookup.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/compiler/aslmain.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/compiler/aslmap.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/compiler/aslstubs.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/compiler/asltypes.h#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/dispatcher/dsfield.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/dispatcher/dswload.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/events/evgpe.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/events/evrgnini.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/executer/exfield.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/executer/exfldio.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/executer/exstorob.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/executer/exutils.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/hardware/hwregs.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/hardware/hwtimer.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/hardware/hwxface.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/acconfig.h#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/acdebug.h#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/acglobal.h#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/achware.h#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/acinterp.h#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/aclocal.h#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/acmacros.h#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/acobject.h#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/acparser.h#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/acpixf.h#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/acpredef.h#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/actbl.h#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/actbl1.h#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/actbl2.h#1 branch .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/actypes.h#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/acutils.h#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/amlcode.h#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/namespace/nsload.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/namespace/nsrepair.c#1 branch .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/namespace/nsxfname.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/parser/psloop.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/parser/psxface.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/tables/tbutils.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/utilities/uteval.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/utilities/utglobal.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/utilities/utids.c#1 branch .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/utilities/utinit.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/utilities/utxface.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/x86emu/x86emu.c#1 branch .. //depot/projects/str91xx/src/sys/contrib/x86emu/x86emu.h#1 branch .. //depot/projects/str91xx/src/sys/contrib/x86emu/x86emu_regs.h#1 branch .. //depot/projects/str91xx/src/sys/contrib/x86emu/x86emu_util.c#1 branch .. //depot/projects/str91xx/src/sys/dev/aac/aac.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/ae/if_ae.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/agp/agp_i810.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/ahci/ahci.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/ahci/ahci.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/amdtemp/amdtemp.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/amr/amr.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/asmc/asmc.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/asmc/asmcvar.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-acerlabs.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-marvell.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ath/ah_osdep.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ath/ath_hal/ah.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/dpms/dpms.c#1 branch .. //depot/projects/str91xx/src/sys/dev/drm/drm_pciids.h#4 integrate .. //depot/projects/str91xx/src/sys/dev/drm/r600_blit.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/e1000/if_em.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/e1000/if_igb.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/ep/if_epreg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/fb/s3_pci.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/fb/vesa.c#1 branch .. //depot/projects/str91xx/src/sys/dev/fb/vesa.h#1 branch .. //depot/projects/str91xx/src/sys/dev/fb/vga.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/firewire/fwcrom.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/firewire/fwdev.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/hwpmc/hwpmc_core.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/hwpmc/pmc_events.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/iir/iir.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/isp/isp.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/ixgbe/ixgbe.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/msk/if_msk.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/mwl/if_mwl.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/null/null.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/pci/pcivar.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/pty/pty.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/rp/rp_pci.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/siis/siis.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/sound/pci/hda/hdac_private.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/sound/pci/hda/hdac_reg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/syscons/daemon/daemon_saver.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/syscons/scterm-teken.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/syscons/scvesactl.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/syscons/teken/Makefile#2 delete .. //depot/projects/str91xx/src/sys/dev/syscons/teken/gensequences#2 delete .. //depot/projects/str91xx/src/sys/dev/syscons/teken/sequences#3 delete .. //depot/projects/str91xx/src/sys/dev/syscons/teken/teken.c#4 delete .. //depot/projects/str91xx/src/sys/dev/syscons/teken/teken.h#3 delete .. //depot/projects/str91xx/src/sys/dev/syscons/teken/teken_demo.c#3 delete .. //depot/projects/str91xx/src/sys/dev/syscons/teken/teken_scs.h#2 delete .. //depot/projects/str91xx/src/sys/dev/syscons/teken/teken_stress.c#3 delete .. //depot/projects/str91xx/src/sys/dev/syscons/teken/teken_subr.h#2 delete .. //depot/projects/str91xx/src/sys/dev/syscons/teken/teken_subr_compat.h#3 delete .. //depot/projects/str91xx/src/sys/dev/syscons/teken/teken_wcwidth.h#2 delete .. //depot/projects/str91xx/src/sys/dev/txp/if_txp.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/usb/storage/umass.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_rum.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_rumreg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_urtw.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_zyd.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/wi/if_wi.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/xen/blkfront/blkfront.c#3 integrate .. //depot/projects/str91xx/src/sys/fs/fifofs/fifo_vnops.c#4 integrate .. //depot/projects/str91xx/src/sys/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/str91xx/src/sys/fs/nfsclient/nfs_clnode.c#3 integrate .. //depot/projects/str91xx/src/sys/fs/nfsclient/nfs_clport.c#3 integrate .. //depot/projects/str91xx/src/sys/fs/pseudofs/pseudofs_vncache.c#3 integrate .. //depot/projects/str91xx/src/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate .. //depot/projects/str91xx/src/sys/geom/geom_dev.c#3 integrate .. //depot/projects/str91xx/src/sys/geom/geom_disk.c#2 integrate .. //depot/projects/str91xx/src/sys/geom/geom_io.c#3 integrate .. //depot/projects/str91xx/src/sys/geom/geom_vfs.c#3 integrate .. //depot/projects/str91xx/src/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/str91xx/src/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/str91xx/src/sys/i386/acpica/acpi_machdep.c#4 integrate .. //depot/projects/str91xx/src/sys/i386/conf/NOTES#4 integrate .. //depot/projects/str91xx/src/sys/i386/cpufreq/hwpstate.c#3 integrate .. //depot/projects/str91xx/src/sys/i386/i386/elf_machdep.c#4 integrate .. //depot/projects/str91xx/src/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/str91xx/src/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/str91xx/src/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/str91xx/src/sys/i386/i386/msi.c#3 integrate .. //depot/projects/str91xx/src/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/str91xx/src/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/str91xx/src/sys/i386/include/_align.h#1 branch .. //depot/projects/str91xx/src/sys/i386/include/param.h#3 integrate .. //depot/projects/str91xx/src/sys/i386/include/pc/vesa.h#2 delete .. //depot/projects/str91xx/src/sys/i386/include/pcpu.h#2 integrate .. //depot/projects/str91xx/src/sys/i386/include/pmap.h#3 integrate .. //depot/projects/str91xx/src/sys/i386/include/specialreg.h#3 integrate .. //depot/projects/str91xx/src/sys/i386/include/xen/xen-os.h#2 integrate .. //depot/projects/str91xx/src/sys/i386/isa/dpms.c#2 delete .. //depot/projects/str91xx/src/sys/i386/isa/vesa.c#4 delete .. //depot/projects/str91xx/src/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/str91xx/src/sys/i386/xen/locore.s#2 integrate .. //depot/projects/str91xx/src/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/str91xx/src/sys/ia64/include/_align.h#1 branch .. //depot/projects/str91xx/src/sys/ia64/include/param.h#3 integrate .. //depot/projects/str91xx/src/sys/kern/imgact_elf.c#3 integrate .. //depot/projects/str91xx/src/sys/kern/kern_conf.c#3 integrate .. //depot/projects/str91xx/src/sys/kern/kern_event.c#3 integrate .. //depot/projects/str91xx/src/sys/kern/kern_exec.c#3 integrate .. //depot/projects/str91xx/src/sys/kern/kern_fork.c#4 integrate .. //depot/projects/str91xx/src/sys/kern/kern_jail.c#5 integrate .. //depot/projects/str91xx/src/sys/kern/kern_kthread.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/kern_linker.c#4 integrate .. //depot/projects/str91xx/src/sys/kern/kern_lock.c#4 integrate .. //depot/projects/str91xx/src/sys/kern/kern_mutex.c#4 integrate .. //depot/projects/str91xx/src/sys/kern/kern_proc.c#4 integrate .. //depot/projects/str91xx/src/sys/kern/kern_shutdown.c#5 integrate .. //depot/projects/str91xx/src/sys/kern/kern_sig.c#3 integrate .. //depot/projects/str91xx/src/sys/kern/kern_sx.c#5 integrate .. //depot/projects/str91xx/src/sys/kern/kern_thr.c#3 integrate .. //depot/projects/str91xx/src/sys/kern/kern_thread.c#3 integrate .. //depot/projects/str91xx/src/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/subr_bus.c#4 integrate .. //depot/projects/str91xx/src/sys/kern/subr_witness.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/sys_generic.c#4 integrate .. //depot/projects/str91xx/src/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/str91xx/src/sys/kern/tty.c#4 integrate .. //depot/projects/str91xx/src/sys/kern/tty_pts.c#5 integrate .. //depot/projects/str91xx/src/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/str91xx/src/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/str91xx/src/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/str91xx/src/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/str91xx/src/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/str91xx/src/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/str91xx/src/sys/mips/include/_align.h#1 branch .. //depot/projects/str91xx/src/sys/mips/include/param.h#3 integrate .. //depot/projects/str91xx/src/sys/modules/Makefile#5 integrate .. //depot/projects/str91xx/src/sys/modules/acpi/acpi/Makefile#3 integrate .. //depot/projects/str91xx/src/sys/modules/dpms/Makefile#2 integrate .. //depot/projects/str91xx/src/sys/modules/dtrace/lockstat/Makefile#2 integrate .. //depot/projects/str91xx/src/sys/modules/vesa/Makefile#2 integrate .. //depot/projects/str91xx/src/sys/modules/x86emu/Makefile#1 branch .. //depot/projects/str91xx/src/sys/net/bpf.c#4 integrate .. //depot/projects/str91xx/src/sys/net/if_arp.h#2 integrate .. //depot/projects/str91xx/src/sys/net/if_llatbl.c#4 integrate .. //depot/projects/str91xx/src/sys/net/if_vlan.c#4 integrate .. //depot/projects/str91xx/src/sys/net/route.h#3 integrate .. //depot/projects/str91xx/src/sys/net/rtsock.c#5 integrate .. //depot/projects/str91xx/src/sys/net/vnet.c#3 integrate .. //depot/projects/str91xx/src/sys/net80211/ieee80211_action.c#2 integrate .. //depot/projects/str91xx/src/sys/net80211/ieee80211_dfs.c#4 integrate .. //depot/projects/str91xx/src/sys/net80211/ieee80211_proto.h#3 integrate .. //depot/projects/str91xx/src/sys/net80211/ieee80211_sta.c#3 integrate .. //depot/projects/str91xx/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate .. //depot/projects/str91xx/src/sys/netinet/if_ether.c#3 integrate .. //depot/projects/str91xx/src/sys/netinet/if_ether.h#2 integrate .. //depot/projects/str91xx/src/sys/netinet/in.c#4 integrate .. //depot/projects/str91xx/src/sys/netinet/in.h#3 integrate .. //depot/projects/str91xx/src/sys/netinet/in_mcast.c#3 integrate .. //depot/projects/str91xx/src/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/str91xx/src/sys/netinet/ip_fastfwd.c#3 integrate .. //depot/projects/str91xx/src/sys/netinet/ip_mroute.c#3 integrate .. //depot/projects/str91xx/src/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/str91xx/src/sys/netinet6/icmp6.c#5 integrate .. //depot/projects/str91xx/src/sys/netinet6/in6.c#5 integrate .. //depot/projects/str91xx/src/sys/netinet6/in6_ifattach.c#5 integrate .. //depot/projects/str91xx/src/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/str91xx/src/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/str91xx/src/sys/netinet6/ip6_input.c#5 integrate .. //depot/projects/str91xx/src/sys/netinet6/ip6_output.c#3 integrate .. //depot/projects/str91xx/src/sys/netinet6/nd6.c#4 integrate .. //depot/projects/str91xx/src/sys/netinet6/nd6.h#3 integrate .. //depot/projects/str91xx/src/sys/netinet6/nd6_nbr.c#3 integrate .. //depot/projects/str91xx/src/sys/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/str91xx/src/sys/netipsec/ipsec.h#3 integrate .. //depot/projects/str91xx/src/sys/netipsec/key.c#3 integrate .. //depot/projects/str91xx/src/sys/netsmb/smb_dev.c#2 integrate .. //depot/projects/str91xx/src/sys/nfsclient/nfs_node.c#3 integrate .. //depot/projects/str91xx/src/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/str91xx/src/sys/nfsserver/nfs_serv.c#3 integrate .. //depot/projects/str91xx/src/sys/opencrypto/cryptodev.c#2 integrate .. //depot/projects/str91xx/src/sys/pc98/include/_align.h#1 branch .. //depot/projects/str91xx/src/sys/pc98/include/pc/vesa.h#2 delete .. //depot/projects/str91xx/src/sys/pci/intpm.c#2 integrate .. //depot/projects/str91xx/src/sys/pci/intpmreg.h#2 integrate .. //depot/projects/str91xx/src/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/str91xx/src/sys/powerpc/include/_align.h#1 branch .. //depot/projects/str91xx/src/sys/powerpc/include/param.h#3 integrate .. //depot/projects/str91xx/src/sys/security/audit/audit_bsm_token.c#3 integrate .. //depot/projects/str91xx/src/sys/sparc64/include/_align.h#1 branch .. //depot/projects/str91xx/src/sys/sparc64/include/param.h#3 integrate .. //depot/projects/str91xx/src/sys/sparc64/pci/ofw_pci.h#2 integrate .. //depot/projects/str91xx/src/sys/sparc64/pci/psycho.c#2 integrate .. //depot/projects/str91xx/src/sys/sparc64/pci/schizo.c#2 integrate .. //depot/projects/str91xx/src/sys/sparc64/sparc64/jbusppm.c#2 integrate .. //depot/projects/str91xx/src/sys/sun4v/include/_align.h#1 branch .. //depot/projects/str91xx/src/sys/sun4v/include/param.h#3 integrate .. //depot/projects/str91xx/src/sys/sys/_sockaddr_storage.h#1 branch .. //depot/projects/str91xx/src/sys/sys/bus.h#4 integrate .. //depot/projects/str91xx/src/sys/sys/conf.h#3 integrate .. //depot/projects/str91xx/src/sys/sys/imgact_aout.h#2 integrate .. //depot/projects/str91xx/src/sys/sys/imgact_elf.h#3 integrate .. //depot/projects/str91xx/src/sys/sys/ioctl_compat.h#2 integrate .. //depot/projects/str91xx/src/sys/sys/param.h#5 integrate .. //depot/projects/str91xx/src/sys/sys/proc.h#3 integrate .. //depot/projects/str91xx/src/sys/sys/socket.h#2 integrate .. //depot/projects/str91xx/src/sys/sys/syscallsubr.h#4 integrate .. //depot/projects/str91xx/src/sys/sys/sysproto.h#3 integrate .. //depot/projects/str91xx/src/sys/sys/tty.h#4 integrate .. //depot/projects/str91xx/src/sys/sys/ttycom.h#2 integrate .. //depot/projects/str91xx/src/sys/sys/types.h#2 integrate .. //depot/projects/str91xx/src/sys/teken/Makefile#1 branch .. //depot/projects/str91xx/src/sys/teken/gensequences#1 branch .. //depot/projects/str91xx/src/sys/teken/sequences#1 branch .. //depot/projects/str91xx/src/sys/teken/teken.c#1 branch .. //depot/projects/str91xx/src/sys/teken/teken.h#1 branch .. //depot/projects/str91xx/src/sys/teken/teken_demo.c#1 branch .. //depot/projects/str91xx/src/sys/teken/teken_scs.h#1 branch .. //depot/projects/str91xx/src/sys/teken/teken_stress.c#1 branch .. //depot/projects/str91xx/src/sys/teken/teken_subr.h#1 branch .. //depot/projects/str91xx/src/sys/teken/teken_subr_compat.h#1 branch .. //depot/projects/str91xx/src/sys/teken/teken_wcwidth.h#1 branch .. //depot/projects/str91xx/src/sys/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/str91xx/src/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/str91xx/src/sys/ufs/ufs/ufs_acl.c#2 integrate .. //depot/projects/str91xx/src/sys/vm/device_pager.c#3 integrate .. //depot/projects/str91xx/src/sys/vm/sg_pager.c#2 integrate .. //depot/projects/str91xx/src/sys/vm/vm.h#3 integrate .. //depot/projects/str91xx/src/sys/vm/vm_extern.h#3 integrate .. //depot/projects/str91xx/src/sys/vm/vm_glue.c#3 integrate .. //depot/projects/str91xx/src/tools/regression/acltools/00.t#2 integrate .. //depot/projects/str91xx/src/tools/regression/acltools/01.t#1 branch .. //depot/projects/str91xx/src/tools/regression/acltools/tools-nfs4.test#1 branch .. //depot/projects/str91xx/src/tools/regression/acltools/tools-posix.test#3 integrate .. //depot/projects/str91xx/src/tools/regression/bin/sh/execution/func2.0#1 branch .. //depot/projects/str91xx/src/tools/regression/fstest/Makefile#2 integrate .. //depot/projects/str91xx/src/tools/regression/fstest/fstest.c#3 integrate .. //depot/projects/str91xx/src/tools/regression/fstest/tests/chmod/12.t#1 branch .. //depot/projects/str91xx/src/tools/regression/fstest/tests/granular/00.t#1 branch .. //depot/projects/str91xx/src/tools/regression/fstest/tests/granular/01.t#1 branch .. //depot/projects/str91xx/src/tools/regression/fstest/tests/granular/02.t#1 branch .. //depot/projects/str91xx/src/tools/regression/fstest/tests/granular/03.t#1 branch .. //depot/projects/str91xx/src/tools/regression/fstest/tests/granular/04.t#1 branch .. //depot/projects/str91xx/src/tools/regression/fstest/tests/granular/05.t#1 branch .. //depot/projects/str91xx/src/usr.bin/ee/Makefile#4 integrate .. //depot/projects/str91xx/src/usr.bin/find/function.c#3 integrate .. //depot/projects/str91xx/src/usr.bin/netstat/inet.c#2 integrate .. //depot/projects/str91xx/src/usr.bin/netstat/main.c#2 integrate .. //depot/projects/str91xx/src/usr.bin/netstat/netstat.h#2 integrate .. //depot/projects/str91xx/src/usr.bin/tar/Makefile#2 integrate .. //depot/projects/str91xx/src/usr.bin/unzip/unzip.1#2 integrate .. //depot/projects/str91xx/src/usr.bin/unzip/unzip.c#2 integrate .. //depot/projects/str91xx/src/usr.bin/w/extern.h#2 integrate .. //depot/projects/str91xx/src/usr.bin/w/pr_time.c#2 integrate .. //depot/projects/str91xx/src/usr.bin/w/w.c#2 integrate .. //depot/projects/str91xx/src/usr.sbin/acpi/acpidb/Makefile#3 integrate .. //depot/projects/str91xx/src/usr.sbin/btxld/btxld.c#2 integrate .. //depot/projects/str91xx/src/usr.sbin/diskinfo/diskinfo.c#2 integrate .. //depot/projects/str91xx/src/usr.sbin/mfiutil/README#2 delete .. //depot/projects/str91xx/src/usr.sbin/mfiutil/mfiutil.1#2 delete .. //depot/projects/str91xx/src/usr.sbin/ndp/ndp.8#2 integrate .. //depot/projects/str91xx/src/usr.sbin/ndp/ndp.c#2 integrate .. //depot/projects/str91xx/src/usr.sbin/pkg_install/lib/lib.h#3 integrate .. //depot/projects/str91xx/src/usr.sbin/rtsold/if.c#2 integrate .. //depot/projects/str91xx/src/usr.sbin/rtsold/rtsold.8#2 integrate .. //depot/projects/str91xx/src/usr.sbin/rtsold/rtsold.c#2 integrate .. //depot/projects/str91xx/src/usr.sbin/rtsold/rtsold.h#2 integrate .. //depot/projects/str91xx/www/de/docs/books.sgml#2 integrate .. //depot/projects/str91xx/www/de/share/sgml/news.xml#4 integrate .. //depot/projects/str91xx/www/de/share/sgml/press.xml#3 integrate .. //depot/projects/str91xx/www/en/docproj/translations.sgml#3 integrate .. //depot/projects/str91xx/www/en/docs/books.sgml#2 integrate .. //depot/projects/str91xx/www/es/docs.sgml#2 integrate .. //depot/projects/str91xx/www/fr/security/Makefile#2 integrate .. //depot/projects/str91xx/www/fr/security/advisories.sgml#1 branch .. //depot/projects/str91xx/www/hu/docs/books.sgml#2 integrate .. //depot/projects/str91xx/www/hu/share/sgml/news.xml#5 integrate .. //depot/projects/str91xx/www/hu/share/sgml/press.xml#4 integrate .. //depot/projects/str91xx/www/nl/vendors.html#2 integrate .. //depot/projects/str91xx/www/share/sgml/news.xml#5 integrate .. //depot/projects/str91xx/www/share/sgml/press.xml#4 integrate Differences ... ==== //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/firewalls/chapter.sgml#3 (text+ko) ==== @@ -4,10 +4,10 @@ The FreeBSD Greek Documentation Project - $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/firewalls/chapter.sgml,v 1.3 2009/06/13 11:00:23 manolis Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/firewalls/chapter.sgml,v 1.4 2009/09/03 18:32:36 manolis Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml - %SRCID% 1.89 + %SRCID% 1.90 --> @@ -2379,11 +2379,11 @@ ìåôáâëçôÞ firewall_type óôçí áðüëõôç äéáäñïìÞ ôïõ áñ÷åßïõ ðïõ ðåñéÝ÷åé ôïõò êáíüíåò ôïõ firewall, ÷ùñßò íá äþóåôå ïñßóìáôá óôçí ãñáììÞ åíôïëþí ãéá ôï ßäéï ôï - &man.ipfw.8;. ¸íá áðëü ðáñÜäåéãìá ôÝôïéïõ áñ÷åßïõ êáíüíùí ìðïñåß - íá åßíáé ôï ðáñáêÜôù: + &man.ipfw.8;. Ôï áñ÷åßï êáíüíùí ðïõ öáßíåôáé ðáñáêÜôù, áðïññßðôåé + üëç ôçí åéóåñ÷üìåíç êáé åîåñ÷üìåíç êßíçóç: - add block in all -add block out all + add deny in +add deny out Áðü ôçí Üëëç ìåñéÜ, åßíáé åðßóçò äõíáôü íá èÝóåôå ôç ìåôáâëçôÞ firewall_script óôçí áðüëõôç äéáäñïìÞ åíüò @@ -2396,8 +2396,8 @@ ipfw -q flush -ipfw add block in all -ipfw add block out all +ipfw add deny in +ipfw add deny out Áí èÝóåôå ôçí ôéìÞ ôïõ firewall_type åßôå ==== //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.sgml#2 (text+ko) ==== @@ -4,10 +4,10 @@ The FreeBSD Greek Documentation Project - $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.sgml,v 1.11 2009/04/10 11:59:04 manolis Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.sgml,v 1.13 2009/09/03 18:32:37 manolis Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml - %SRCID% 1.137 + %SRCID% 1.139 --> @@ -185,9 +185,17 @@ ôç ÓõëëïãÞ ôùí Ports. ÁðëÜ êÜíôå ôï ðáñáêÜôù: - &prompt.root; cd /usr/ports/emulators/linux_base-fc4 + &prompt.root; cd /usr/ports/emulators/linux_base-f10 &prompt.root; make install distclean + + Áí ÷ñçóéìïðïéåßôå êÜðïéá Ýêäïóç ôïõ &os; ðñéí ôçí 8.0, èá + ðñÝðåé íá åãêáôáóôÞóåôå ôï port emulators/linux_base-fc4 + áíôß ãéá ôï emulators/linux_base-f10. + + Èá ðñÝðåé ôþñá íá Ý÷åôå êáíïíéêÞ óõìâáôüôçôá ìå åêôåëÝóéìá ôïõ Linux. ÌåñéêÜ ðñïãñÜììáôá ðáñáðïíéïýíôáé üôé ïé âéâëéïèÞêåò óõóôÞìáôïò (system libraries) äåí åßíáé óôç ôåëåõôáßá ôïõò Ýêäïóç. @@ -352,6 +360,27 @@ + ÅãêáôÜóôáóç ìéáò Ôõ÷áßáò Linux RPM ÅöáñìïãÞò + + Ôï &os; äéáèÝôåé ôçí äéêÞ ôïõ âÜóç äåäïìÝíùí ãéá ôá ðáêÝôá, + ç ïðïßá ÷ñçóéìïðïéåßôáé ãéá üëá ôá ports (êáé ãéá áõôÜ ðïõ + ðñïÝñ÷ïíôáé áðü ôï &linux;). Ãéá ôï ëüãï áõôü, ç âÜóç äåäïìÝíùí + &linux; RPM äåí ÷ñçóéìïðïéåßôáé (äåí õðïóôçñßæåôáé). + + Áí ùóôüóï ÷ñåéÜæåôáé íá åãêáôáóôÞóåôå ìéá ïðïéáäÞðïôå åöáñìïãÞ + ôïõ &linux; ðïõ âáóßæåôáé óå ðáêÝôï RPM, ìðïñåßôå íá ôï åðéôý÷åôå + ìå ôïí ðáñáêÜôù ôñüðï: + + &prompt.root; cd /compat/linux +&prompt.root; rpm2cpio -q < /path/to/linux.archive.rpm | cpio -id + + ×ñçóéìïðïéÞóôå ôçí &man.brandelf.1; ãéá íá ôõðïðïéÞóåôå + êáôÜëëçëá ôá åêôåëÝóéìá (ü÷é ôéò âéâëéïèÞêåò!) ùò åöáñìïãÝò &linux;. + Äåí èá ìðïñåßôå íá áðåãêáôáóôÞóåôå ôéò åöáñìïãÝò ìå êáèáñü ôñüðï, + áëëÜ èá ìðïñÝóåôå íá êÜíåôå ôéò äïêéìÝò ðïõ åðéèõìåßôå. + + + Ñýèìéóç ôïõ Hostname Resolver Áí ôï DNS äå äïõëåýåé Þ áí óáò åìöáíßæåôáé ôï ðáñáêÜôù ==== //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/virtualization/chapter.sgml#4 (text+ko) ==== @@ -4,10 +4,10 @@ The FreeBSD Greek Documentation Project - $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/virtualization/chapter.sgml,v 1.9 2009/08/13 21:01:22 manolis Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/virtualization/chapter.sgml,v 1.10 2009/09/03 18:32:36 manolis Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml - %SRCID% 1.19 + %SRCID% 1.20 --> @@ -897,9 +897,8 @@ ¶ëëåò ÅðéëïãÝò Åéêïíéêïðïßçóçò Õðü åîÝëéîç âñßóêåôáé ç ðñïóðÜèåéá íá ëåéôïõñãÞóåé ôï - &xen; ùò ðåñéâÜëëïí îåíéóôÞ ãéá ôï &os;. - Ìéá ðñþôç ðåéñáìáôéêÞ Ýêäïóç áõôÞò ôçò äõíáôüôçôáò èá åìöáíéóôåß óôï - &os; 8.0. + &xen; ùò ðåñéâÜëëïí îåíéóôÞ ãéá ôï + &os;. ==== //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml#3 (text+ko) ==== @@ -4,10 +4,10 @@ The FreeBSD Greek Documentation Project - $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml,v 1.12 2009/08/16 12:32:10 manolis Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml,v 1.13 2009/08/28 18:53:28 manolis Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/x11/chapter.sgml - %SRCID% 1.192 + %SRCID% 1.194 --> @@ -521,11 +521,30 @@ Áõôüò ï óõíäõáóìüò ðëÞêôñùí Þôáí åíåñãïðïéçìÝíïò áðü ðñïåðéëïãÞ óôéò åêäüóåéò ôïõ &xorg; ìÝ÷ñé ôçí 7.3. - Ãéá íá ôï åíåñãïðïéÞóåôå áðü ôçí Ýêäïóç 7.4 êáé ìåôÜ, ðñïóèÝóôå ôçí - ðáñáêÜôù ãñáììÞ óôçí åíüôçôá ServerLayout Þ - ServerFlags ôïõ áñ÷åßïõ ñõèìßóåùí: + Ãéá íá ôï åíåñãïðïéÞóåôå áðü ôçí Ýêäïóç 7.4 êáé ìåôÜ, ìðïñåßôå + íá äþóåôå ôçí ðáñáêÜôù åíôïëÞ óå êÜðïéï ôåñìáôéêü ôïõ X: + + &prompt.user; setxkbmap -option terminate:ctrl_alt_bksp + + ÅíáëëáêôéêÜ, äçìéïõñãÞóôå Ýíá áñ÷åßï ñõèìßóåùí ðëçêôñïëïãßïõ + ãéá ôï hald ìå ôçí ïíïìáóßá + x11-input.fdi êáé áðïèçêåýóôå ôï óôïí + êáôÜëïãï /usr/local/etc/hal/fdi/policy. + Ôï áñ÷åßï áõôü èá ðñÝðåé íá ðåñéÝ÷åé ôéò ðáñáêÜôù ãñáììÝò: + + <?xml version="1.0" encoding="ISO-8859-1"?> +<deviceinfo version="0.2"> + <device> + <match key="info.capabilities" contains="input.keyboard"> + <merge key="input.x11_options.XkbOptions" type="string">terminate:ctrl_alt_bksp</merge> + </match> + </device> +</deviceinfo> - Option "DontZap" "Off" + Èá ÷ñåéáóôåß íá åðáíåêêéíÞóåôå ôï ìç÷Üíçìá óáò ãéá íá + åîáíáãêÜóåôå ôï hald íá äéáâÜóåé áõôü + ôï áñ÷åßï. Áí ôï ðïíôßêé äåí ëåéôïõñãåß, èá ÷ñåéáóôåß íá ôï ñõèìßóåôå @@ -545,6 +564,56 @@ ÷ñçóéìïðïéþíôáò êáé üðïéåò Üëëåò åðéëïãÝò ÷ñåéÜæåóôå (ð.÷. åíáëëáãÞ ðëçêôñïëïãßïõ). + + ¼ðùò åîçãÞóáìå êáé ðñïçãïõìÝíùò, áðü ôçí Ýêäïóç 7.4 êáé ìåôÜ + ï äáßìïíáò hald áíáëáìâÜíåé íá + áíé÷íåýóåé áõôüìáôá ôï ðëçêôñïëüãéï óáò. ÕðÜñ÷åé ðåñßðôùóç íá + ìçí ãßíåé óùóôÞ áíß÷íåõóç ôïõ ìïíôÝëïõ Þ ôçò äéÜôáîçò, ùóôüóï + êÜðïéá ãñáöéêÜ ðåñéâÜëëïíôá üðùò ôï + GNOME ôï KDE + êáé ôï Xfce ðáñÝ÷ïõí ôá äéêÜ ôïõò + åñãáëåßá ãéá ôç ñýèìéóç ôïõ. Ìðïñåßôå üìùò íá ñõèìßóåôå ôéò + éäéüôçôåò ôïõ ðëçêôñïëïãßïõ êáé áðåõèåßáò, åßôå ìÝóù ôïõ + âïçèçôéêïý ðñïãñÜììáôïò &man.setxkbmap.1; åßôå ìå ôçí ðñïóèÞêç + åíüò êáíüíá óôï hald. + + Ãéá ðáñÜäåéãìá, áí êÜðïéïò èÝëåé íá ÷ñçóéìïðïéÞóåé Ýíá + ðëçêôñïëüãéï 102 ðëÞêôñùí ìå ãáëëéêÞ äéÜôáîç, èá ðñÝðåé íá + äçìéïõñãÞóåé Ýíá áñ÷åßï ñõèìßóåùí ãéá ôï + hald ìå ôï üíïìá + x11-input.fdi êáé íá ôï áðïèçêåýóåé óôïí + êáôÜëïãï /usr/local/etc/hal/fdi/policy. + Ôï áñ÷åßï áõôü èá ðåñéÝ÷åé ôéò ðáñáêÜôù ãñáììÝò: + + <?xml version="1.0" encoding="ISO-8859-1"?> +<deviceinfo version="0.2"> + <device> + <match key="info.capabilities" contains="input.keyboard"> + <merge key="input.x11_options.XkbModel" type="string">pc102</merge> + <merge key="input.x11_options.XkbLayout" type="string">fr</merge> + </match> + </device> +</deviceinfo> + + Áí ôï áñ÷åßï áõôü õðÜñ÷åé Þäç, áðëþò áíôéãñÜøôå ôéò ðáñáðÜíù + ãñáììÝò ìÝóá óôï õðÜñ÷ïí ðåñéå÷üìåíï. + + Èá ðñÝðåé íá åðáíåêêéíÞóåôå ôï ìç÷Üíçìá óáò ãéá íá + åîáíáãêÜóåôå ôï hald íá äéáâÜóåé ôï + áñ÷åßï. + + Ìðïñåßôå åðßóçò íá êÜíåôå ôçí ßäéá ñýèìéóç ìÝóá áðü Ýíá + ôåñìáôéêü óôá × Þ áêüìá êáé áðü Ýíá script, åêôåëþíôáò ôçí + ðáñáêÜôù åíôïëÞ: + + &prompt.user; setxkbmap -model pc102 -layout fr + + Ìðïñåßôå íá âñåßôå ôéò äéáèÝóéìåò åðéëïãÝò ðëçêôñïëïãßùí êáé + äéáôÜîåùí óôï áñ÷åßï + /usr/local/share/X11/xkb/rules/base.lst. + + Ñýèìéóç ôïõ X11 ¸ðåéôá, ðñïóáñìüóôå ôï áñ÷åßï ñõèìßóåùí ==== //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: doc/en_US.ISO8859-1/articles/Makefile,v 1.60 2008/05/31 13:32:19 remko Exp $ +# $FreeBSD: doc/en_US.ISO8859-1/articles/Makefile,v 1.61 2009/09/01 18:01:01 danger Exp $ SUBDIR = SUBDIR+= 5-roadmap @@ -13,6 +13,7 @@ SUBDIR+= contributing-ports SUBDIR+= contributors SUBDIR+= cups +SUBDIR+= custom-gcc SUBDIR+= cvs-freebsd SUBDIR+= cvsup-advanced SUBDIR+= dialup-firewall ==== //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2281,11 +2281,12 @@ rules for ipfw firewall. One is by setting firewall_type variable to absolute path of file, which contains firewall rules - without any command-line options for &man.ipfw.8; itself. A - simple example of ruleset file can be following: + without any command-line options for &man.ipfw.8; itself. + The following is a simple example of a ruleset file that blocks + all incoming and outgoing traffic: - add block in all -add block out all + add deny in +add deny out On the other hand, it is possible to set the firewall_script variable to the absolute path of an @@ -2298,8 +2299,8 @@ ipfw -q flush -ipfw add block in all -ipfw add block out all +ipfw add deny in +ipfw add deny out If firewall_type is set to either ==== //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -326,6 +326,24 @@ + Installing a Random Linux RPM Based Application + + FreeBSD has its own package database and it is used to track + all ports (&linux; ports as well). So the &linux; RPM database is not + used (not supported). + + However if you need to install a random &linux; RPM-based + application it can be achieved by: + + &prompt.root; cd /compat/linux +&prompt.root; rpm2cpio -q < /path/to/linux.archive.rpm | cpio -id + + Then brandelf installed ELF binaries (not libraries!). + You will not be able to do a clean uninstall, but it may help you + to do tests. + + + Configuring the Hostname Resolver If DNS does not work or you get this message: ==== //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2433,6 +2433,15 @@ + RELENG_8 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 15 17:44:06 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47B621065694; Tue, 15 Sep 2009 17:44:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0AA7E106568F for ; Tue, 15 Sep 2009 17:44:06 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EC3948FC16 for ; Tue, 15 Sep 2009 17:44:05 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8FHi5qs042045 for ; Tue, 15 Sep 2009 17:44:05 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8FHi4Ax042041 for perforce@freebsd.org; Tue, 15 Sep 2009 17:44:04 GMT (envelope-from mav@freebsd.org) Date: Tue, 15 Sep 2009 17:44:04 GMT Message-Id: <200909151744.n8FHi4Ax042041@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Cc: Subject: PERFORCE change 168570 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Sep 2009 17:44:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=168570 Change 168570 by mav@mav_mavbook on 2009/09/15 17:43:45 IFC Affected files ... .. //depot/projects/scottl-camlock/src/Makefile.inc1#7 integrate .. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#15 integrate .. //depot/projects/scottl-camlock/src/UPDATING#16 integrate .. //depot/projects/scottl-camlock/src/bin/setfacl/mask.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/setfacl/merge.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/setfacl/remove.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/setfacl/setfacl.1#3 integrate .. //depot/projects/scottl-camlock/src/bin/setfacl/setfacl.c#3 integrate .. //depot/projects/scottl-camlock/src/bin/setfacl/setfacl.h#2 integrate .. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/include/assert.h#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/head/assert.h#2 delete .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/gdtoa/gdtoaimp.h#3 integrate .. //depot/projects/scottl-camlock/src/contrib/gdtoa/misc.c#2 integrate .. //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#7 integrate .. //depot/projects/scottl-camlock/src/etc/network.subr#7 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/Makefile#8 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/NETWORKING#5 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/addswap#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/auto_linklocal#3 delete .. //depot/projects/scottl-camlock/src/etc/rc.d/defaultroute#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/devd#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/faith#1 branch .. //depot/projects/scottl-camlock/src/etc/rc.d/ip6addrctl#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/mroute6d#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/netif#6 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/netoptions#4 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/network_ipv6#3 delete .. //depot/projects/scottl-camlock/src/etc/rc.d/ppp#4 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/route6d#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/routed#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/routing#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/rtadvd#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/stf#1 branch .. //depot/projects/scottl-camlock/src/etc/rc.d/sysctl#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.subr#4 integrate .. //depot/projects/scottl-camlock/src/lib/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read.c#5 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_iso9660.c#5 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_compat_zip.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isojoliet_bz2.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isorr_bz2.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/Versions.def#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/net/getifaddrs.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdio/fopen.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdtime/localtime.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libkvm/kvm_proc.c#5 integrate .. //depot/projects/scottl-camlock/src/lib/libradius/libradius.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libradius/radlib.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libradius/radlib.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/libradius/radlib_private.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/libstand/net.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libstand/nfs.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libstand/rpc.c#3 integrate .. //depot/projects/scottl-camlock/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 integrate .. //depot/projects/scottl-camlock/src/release/picobsd/bridge/crunch.conf#3 integrate .. //depot/projects/scottl-camlock/src/release/scripts/package-split.py#4 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/class/mirror/gmirror.8#3 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/af_inet6.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/af_nd6.c#1 branch .. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.8#7 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifgif.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/mount/mount.8#3 integrate .. //depot/projects/scottl-camlock/src/sbin/mount/mount.c#5 integrate .. //depot/projects/scottl-camlock/src/share/examples/scsi_target/scsi_target.c#2 integrate .. //depot/projects/scottl-camlock/src/share/examples/scsi_target/scsi_target.h#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#11 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/dpms.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/ed.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/inet6.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ips.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.i386/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.i386/dpms.4#2 delete .. //depot/projects/scottl-camlock/src/share/man/man4/syscons.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/textdump.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/device.hints.5#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/rc.conf.5#6 integrate .. //depot/projects/scottl-camlock/src/share/monetdef/zh_CN.GB18030.src#2 integrate .. //depot/projects/scottl-camlock/src/share/monetdef/zh_CN.GB2312.src#2 integrate .. //depot/projects/scottl-camlock/src/share/zoneinfo/asia#6 integrate .. //depot/projects/scottl-camlock/src/share/zoneinfo/australasia#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/identcpu.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/initcpu.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/msi.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/NOTES#19 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/_align.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/param.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/specialreg.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_proto.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/_align.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/param.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/pxe.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/Makefile.inc#5 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#103 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_target.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/proc.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/vfs.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_proto.h#23 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_proto.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#35 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#46 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.amd64#22 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.i386#22 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#32 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.amd64#11 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acpica_prep.sh#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/changes.txt#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/dmrestag.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/dmtable.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/dmtbdump.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/dmtbinfo.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#8 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asldefine.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslfiles.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslglobal.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslload.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asllookup.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslmain.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslmap.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslstubs.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asltypes.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsfield.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dswload.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evgpe.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evrgnini.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exfield.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exfldio.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exstorob.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exutils.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hardware/hwregs.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hardware/hwtimer.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hardware/hwxface.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acconfig.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acdebug.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acglobal.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/achware.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acinterp.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/aclocal.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acmacros.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acobject.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acparser.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acpixf.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acpredef.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/actbl.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/actbl1.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/actbl2.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/actypes.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acutils.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/amlcode.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsload.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsrepair.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsxfname.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/psloop.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/psxface.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tables/tbutils.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/uteval.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utglobal.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utids.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utinit.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utxface.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/x86emu/x86emu.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/x86emu/x86emu.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/x86emu/x86emu_regs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/x86emu/x86emu_util.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aacvar.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cpu.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pcib_acpi.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpivar.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ae/if_ae.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/agp/agp_i810.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#62 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amdtemp/amdtemp.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/asmc/asmc.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/asmc/asmcvar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-raid.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-acerlabs.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ah_osdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bce.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_sge.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dpms/dpms.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_pciids.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/r600_blit.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ep/if_ep.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ep/if_epreg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/s3_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/fb/vga.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwcrom.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwdev.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fxp/if_fxp.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptiop/hptiop.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ichwd/ichwd.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iir/iir.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#28 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_raid.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/msk/if_msk.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci_user.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pcireg.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pcivar.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/daemon/daemon_saver.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/scterm-teken.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/scvesactl.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_rum.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_rumreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_urtw.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wi/if_wi.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/fs/fifofs/fifo_vnops.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_conv.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clnode.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clport.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs_vncache.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_dev.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_io.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_vfs.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/acpica/acpi_machdep.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/NOTES#23 integrate .. //depot/projects/scottl-camlock/src/sys/i386/cpufreq/hwpstate.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/identcpu.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/msi.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#34 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_proto.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/_align.h#1 branch .. //depot/projects/scottl-camlock/src/sys/i386/include/param.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/pc/vesa.h#3 delete .. //depot/projects/scottl-camlock/src/sys/i386/include/specialreg.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/xen/xen-os.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/dpms.c#2 delete .. //depot/projects/scottl-camlock/src/sys/i386/isa/vesa.c#10 delete .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_proto.h#19 integrate .. //depot/projects/scottl-camlock/src/sys/i386/xen/locore.s#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/xen/pmap.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/_align.h#1 branch .. //depot/projects/scottl-camlock/src/sys/ia64/include/param.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_event.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_exec.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_linker.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_lock.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mutex.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_shutdown.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_timeout.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#32 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_generic.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_pipe.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty_pts.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_mqueue.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket.c#28 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_aio.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_subr.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/_align.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/include/param.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#35 integrate .. //depot/projects/scottl-camlock/src/sys/modules/acpi/acpi/Makefile#13 integrate .. //depot/projects/scottl-camlock/src/sys/modules/dpms/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/dtrace/lockstat/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/vesa/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/x86emu/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/net/bpf.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_vlan.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/net/route.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_action.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_proto.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/if_ether.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/if_ether.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_mcast.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.c#28 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_mroute.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6.c#28 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_ifattach.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_proto.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_input.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6_nbr.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6_rtr.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/netsmb/smb_dev.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_node.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vfsops.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_serv.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/include/_align.h#1 branch .. //depot/projects/scottl-camlock/src/sys/pc98/include/pc/vesa.h#2 delete .. //depot/projects/scottl-camlock/src/sys/pci/intpm.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/pci/intpmreg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/GENERIC#22 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/_align.h#1 branch .. //depot/projects/scottl-camlock/src/sys/powerpc/include/param.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm_token.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/_align.h#1 branch .. //depot/projects/scottl-camlock/src/sys/sparc64/include/param.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/ofw_pci.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/psycho.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/schizo.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/jbusppm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/include/_align.h#1 branch .. //depot/projects/scottl-camlock/src/sys/sun4v/include/param.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sys/_sockaddr_storage.h#1 branch .. //depot/projects/scottl-camlock/src/sys/sys/bus.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/sys/imgact_aout.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/sys/param.h#31 integrate .. //depot/projects/scottl-camlock/src/sys/sys/socket.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/sys/syscallsubr.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sysproto.h#20 integrate .. //depot/projects/scottl-camlock/src/sys/teken/teken.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/teken/teken.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/teken/teken_demo.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/teken/teken_subr.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/teken/teken_subr_compat.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_vfsops.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_acl.c#6 integrate .. //depot/projects/scottl-camlock/src/tools/regression/acltools/00.t#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/acltools/01.t#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/acltools/tools-nfs4.test#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/acltools/tools-posix.test#4 integrate .. //depot/projects/scottl-camlock/src/tools/regression/fstest/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/tools/regression/fstest/fstest.c#4 integrate .. //depot/projects/scottl-camlock/src/tools/regression/fstest/tests/chmod/12.t#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/fstest/tests/granular/00.t#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/fstest/tests/granular/01.t#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/fstest/tests/granular/02.t#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/fstest/tests/granular/03.t#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/fstest/tests/granular/04.t#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/fstest/tests/granular/05.t#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/tar/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/unzip/unzip.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/unzip/unzip.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/w/pr_time.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/acpi/acpidb/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/btxld/btxld.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ndp/ndp.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ndp/ndp.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rtsold/if.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rtsold/rtsold.8#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rtsold/rtsold.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rtsold/rtsold.h#3 integrate Differences ... ==== //depot/projects/scottl-camlock/src/Makefile.inc1#7 (text+ko) ==== @@ -1,11 +1,11 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.628 2009/07/14 21:19:13 kan Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.629 2009/09/10 07:37:36 des 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 +# -DKERNFAST define NO_KERNELCONFIG, NO_KERNELCLEAN and NO_KERNELDEPEND # -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 ==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#15 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.208 2009/09/03 16:34:20 remko Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.209 2009/09/10 21:42:00 delphij Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090909: vesa and dpms promoted to be i386/amd64 common +OLD_FILES+=usr/include/machine/pc/vesa.h +OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz # 20090904: remove lukemftpd OLD_FILES+=usr/libexec/lukemftpd OLD_FILES+=usr/share/man/man5/ftpd.conf.5.gz ==== //depot/projects/scottl-camlock/src/UPDATING#16 (text+ko) ==== @@ -22,6 +22,10 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090910: + ZFS snapshots are now mounted with MNT_IGNORE flag. Use -v option for + mount(8) and -a option for df(1) to see them. + 20090825: The old tunable hw.bus.devctl_disable has been superseded by hw.bus.devctl_queue. hw.bus.devctl_disable=1 in loader.conf should be @@ -971,4 +975,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.638 2009/09/05 08:09:35 imp Exp $ +$FreeBSD: src/UPDATING,v 1.639 2009/09/14 21:10:40 pjd Exp $ ==== //depot/projects/scottl-camlock/src/bin/setfacl/mask.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/mask.c,v 1.8 2005/01/10 08:39:25 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/mask.c,v 1.9 2009/09/07 16:19:32 trasz Exp $"); #include #include @@ -40,7 +40,7 @@ /* set the appropriate mask the given ACL's */ int -set_acl_mask(acl_t *prev_acl) +set_acl_mask(acl_t *prev_acl, const char *filename) { acl_entry_t entry; acl_t acl; @@ -59,7 +59,7 @@ acl = acl_dup(*prev_acl); if (acl == NULL) - err(1, "acl_dup() failed"); + err(1, "%s: acl_dup() failed", filename); if (n_flag == 0) { /* @@ -70,7 +70,7 @@ * class in the resulting ACL */ if (acl_calc_mask(&acl)) { - warn("acl_calc_mask() failed"); + warn("%s: acl_calc_mask() failed", filename); acl_free(acl); return (-1); } @@ -86,7 +86,8 @@ while (acl_get_entry(acl, entry_id, &entry) == 1) { entry_id = ACL_NEXT_ENTRY; if (acl_get_tag_type(entry, &tag) == -1) - err(1, "acl_get_tag_type() failed"); + err(1, "%s: acl_get_tag_type() failed", + filename); if (tag == ACL_MASK) { acl_free(acl); @@ -100,7 +101,7 @@ * file, then write an error message to standard error and * continue with the next file. */ - warnx("warning: no mask entry"); + warnx("%s: warning: no mask entry", filename); acl_free(acl); return (0); } ==== //depot/projects/scottl-camlock/src/bin/setfacl/merge.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/merge.c,v 1.8 2005/01/10 08:39:25 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/merge.c,v 1.9 2009/09/07 16:19:32 trasz Exp $"); #include #include @@ -36,12 +36,15 @@ #include "setfacl.h" -static int merge_user_group(acl_entry_t *entry, acl_entry_t *entry_new); +static int merge_user_group(acl_entry_t *entry, acl_entry_t *entry_new, + int acl_brand); static int -merge_user_group(acl_entry_t *entry, acl_entry_t *entry_new) +merge_user_group(acl_entry_t *entry, acl_entry_t *entry_new, int acl_brand) { acl_permset_t permset; + acl_entry_type_t entry_type; + acl_flagset_t flagset; int have_entry; uid_t *id, *id_new; @@ -59,6 +62,18 @@ err(1, "acl_get_permset() failed"); if (acl_set_permset(*entry_new, permset) == -1) err(1, "acl_set_permset() failed"); + + if (acl_brand == ACL_BRAND_NFS4) { + if (acl_get_entry_type_np(*entry, &entry_type)) + err(1, "acl_get_entry_type_np() failed"); + if (acl_set_entry_type_np(*entry_new, entry_type)) + err(1, "acl_set_entry_type_np() failed"); + if (acl_get_flagset_np(*entry, &flagset)) + err(1, "acl_get_flagset_np() failed"); + if (acl_set_flagset_np(*entry_new, flagset)) + err(1, "acl_set_flagset_np() failed"); + } + have_entry = 1; } acl_free(id); @@ -71,20 +86,31 @@ * merge an ACL into existing file's ACL */ int -merge_acl(acl_t acl, acl_t *prev_acl) +merge_acl(acl_t acl, acl_t *prev_acl, const char *filename) { acl_entry_t entry, entry_new; acl_permset_t permset; acl_t acl_new; acl_tag_t tag, tag_new; - int entry_id, entry_id_new, have_entry; + acl_entry_type_t entry_type, entry_type_new; + acl_flagset_t flagset; + int entry_id, entry_id_new, have_entry, entry_number = 0; + int acl_brand, prev_acl_brand; + + acl_get_brand_np(acl, &acl_brand); + acl_get_brand_np(*prev_acl, &prev_acl_brand); + + if (acl_brand != prev_acl_brand) { + warnx("%s: branding mismatch; existing ACL is %s, " + "entry to be merged is %s", filename, + prev_acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e", + acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e"); + return (-1); + } - if (acl_type == ACL_TYPE_ACCESS) - acl_new = acl_dup(prev_acl[ACCESS_ACL]); - else - acl_new = acl_dup(prev_acl[DEFAULT_ACL]); + acl_new = acl_dup(*prev_acl); if (acl_new == NULL) - err(1, "acl_dup() failed"); + err(1, "%s: acl_dup() failed", filename); entry_id = ACL_FIRST_ENTRY; @@ -94,28 +120,45 @@ /* keep track of existing ACL_MASK entries */ if (acl_get_tag_type(entry, &tag) == -1) - err(1, "acl_get_tag_type() failed - invalid ACL entry"); + err(1, "%s: acl_get_tag_type() failed - " + "invalid ACL entry", filename); if (tag == ACL_MASK) have_mask = 1; /* check against the existing ACL entries */ entry_id_new = ACL_FIRST_ENTRY; - while (have_entry == 0 && - acl_get_entry(acl_new, entry_id_new, &entry_new) == 1) { + while (acl_get_entry(acl_new, entry_id_new, &entry_new) == 1) { entry_id_new = ACL_NEXT_ENTRY; if (acl_get_tag_type(entry, &tag) == -1) - err(1, "acl_get_tag_type() failed"); + err(1, "%s: acl_get_tag_type() failed", + filename); if (acl_get_tag_type(entry_new, &tag_new) == -1) - err(1, "acl_get_tag_type() failed"); + err(1, "%s: acl_get_tag_type() failed", + filename); if (tag != tag_new) continue; + /* + * For NFSv4, in addition to "tag" and "id" we also + * compare "entry_type". + */ + if (acl_brand == ACL_BRAND_NFS4) { + if (acl_get_entry_type_np(entry, &entry_type)) + err(1, "%s: acl_get_entry_type_np() " + "failed", filename); + if (acl_get_entry_type_np(entry_new, &entry_type_new)) + err(1, "%s: acl_get_entry_type_np() " + "failed", filename); + if (entry_type != entry_type_new) + continue; + } + switch(tag) { case ACL_USER: case ACL_GROUP: have_entry = merge_user_group(&entry, - &entry_new); + &entry_new, acl_brand); if (have_entry == 0) break; /* FALLTHROUGH */ @@ -123,37 +166,127 @@ case ACL_GROUP_OBJ: case ACL_OTHER: case ACL_MASK: + case ACL_EVERYONE: if (acl_get_permset(entry, &permset) == -1) - err(1, "acl_get_permset() failed"); + err(1, "%s: acl_get_permset() failed", + filename); if (acl_set_permset(entry_new, permset) == -1) - err(1, "acl_set_permset() failed"); + err(1, "%s: acl_set_permset() failed", + filename); + + if (acl_brand == ACL_BRAND_NFS4) { + if (acl_get_entry_type_np(entry, &entry_type)) + err(1, "%s: acl_get_entry_type_np() failed", + filename); + if (acl_set_entry_type_np(entry_new, entry_type)) + err(1, "%s: acl_set_entry_type_np() failed", + filename); + if (acl_get_flagset_np(entry, &flagset)) + err(1, "%s: acl_get_flagset_np() failed", + filename); + if (acl_set_flagset_np(entry_new, flagset)) + err(1, "%s: acl_set_flagset_np() failed", + filename); + } have_entry = 1; break; default: /* should never be here */ - errx(1, "Invalid tag type: %i", tag); + errx(1, "%s: invalid tag type: %i", filename, tag); break; } } /* if this entry has not been found, it must be new */ if (have_entry == 0) { - if (acl_create_entry(&acl_new, &entry_new) == -1) { - acl_free(acl_new); - return (-1); + + /* + * NFSv4 ACL entries must be prepended to the ACL. + * Appending them at the end makes no sense, since + * in most cases they wouldn't even get evaluated. + */ + if (acl_brand == ACL_BRAND_NFS4) { + if (acl_create_entry_np(&acl_new, &entry_new, entry_number) == -1) { + warn("%s: acl_create_entry_np() failed", filename); + acl_free(acl_new); + return (-1); + } + /* + * Without this increment, adding several + * entries at once, for example + * "setfacl -m user:1:r:allow,user:2:r:allow", + * would make them appear in reverse order. + */ + entry_number++; + } else { + if (acl_create_entry(&acl_new, &entry_new) == -1) { + warn("%s: acl_create_entry() failed", filename); + acl_free(acl_new); + return (-1); + } } if (acl_copy_entry(entry_new, entry) == -1) - err(1, "acl_copy_entry() failed"); + err(1, "%s: acl_copy_entry() failed", filename); } } - if (acl_type == ACL_TYPE_ACCESS) { - acl_free(prev_acl[ACCESS_ACL]); - prev_acl[ACCESS_ACL] = acl_new; - } else { - acl_free(prev_acl[DEFAULT_ACL]); - prev_acl[DEFAULT_ACL] = acl_new; + acl_free(*prev_acl); + *prev_acl = acl_new; + + return (0); +} + +int +add_acl(acl_t acl, uint entry_number, acl_t *prev_acl, const char *filename) +{ + acl_entry_t entry, entry_new; + acl_t acl_new; + int entry_id, acl_brand, prev_acl_brand; + + acl_get_brand_np(acl, &acl_brand); + acl_get_brand_np(*prev_acl, &prev_acl_brand); + + if (prev_acl_brand != ACL_BRAND_NFS4) { + warnx("%s: the '-a' option is only applicable to NFSv4 ACLs", + filename); + return (-1); + } + + if (acl_brand != ACL_BRAND_NFS4) { + warnx("%s: branding mismatch; existing ACL is NFSv4, " + "entry to be added is POSIX.1e", filename); + return (-1); + } + + acl_new = acl_dup(*prev_acl); + if (acl_new == NULL) + err(1, "%s: acl_dup() failed", filename); + + entry_id = ACL_FIRST_ENTRY; + + while (acl_get_entry(acl, entry_id, &entry) == 1) { + entry_id = ACL_NEXT_ENTRY; + + if (acl_create_entry_np(&acl_new, &entry_new, entry_number) == -1) { + warn("%s: acl_create_entry_np() failed", filename); + acl_free(acl_new); + return (-1); + } + + /* + * Without this increment, adding several + * entries at once, for example + * "setfacl -m user:1:r:allow,user:2:r:allow", + * would make them appear in reverse order. + */ + entry_number++; + + if (acl_copy_entry(entry_new, entry) == -1) + err(1, "%s: acl_copy_entry() failed", filename); } + acl_free(*prev_acl); + *prev_acl = acl_new; + return (0); } ==== //depot/projects/scottl-camlock/src/bin/setfacl/remove.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/remove.c,v 1.6 2005/01/10 08:39:25 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/remove.c,v 1.7 2009/09/07 16:19:32 trasz Exp $"); #include #include @@ -41,21 +41,31 @@ * remove ACL entries from an ACL */ int -remove_acl(acl_t acl, acl_t *prev_acl) +remove_acl(acl_t acl, acl_t *prev_acl, const char *filename) { acl_entry_t entry; acl_t acl_new; acl_tag_t tag; - int carried_error, entry_id; + int carried_error, entry_id, acl_brand, prev_acl_brand; + + carried_error = 0; + + acl_get_brand_np(acl, &acl_brand); + acl_get_brand_np(*prev_acl, &prev_acl_brand); + + if (acl_brand != prev_acl_brand) { + warnx("%s: branding mismatch; existing ACL is %s, " + "entry to be removed is %s", filename, + prev_acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e", + acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e"); + return (-1); + } carried_error = 0; - if (acl_type == ACL_TYPE_ACCESS) - acl_new = acl_dup(prev_acl[ACCESS_ACL]); - else - acl_new = acl_dup(prev_acl[DEFAULT_ACL]); + acl_new = acl_dup(*prev_acl); if (acl_new == NULL) - err(1, "acl_dup() failed"); + err(1, "%s: acl_dup() failed", filename); tag = ACL_UNDEFINED_TAG; @@ -64,23 +74,68 @@ while (acl_get_entry(acl, entry_id, &entry) == 1) { entry_id = ACL_NEXT_ENTRY; if (acl_get_tag_type(entry, &tag) == -1) - err(1, "acl_get_tag_type() failed"); + err(1, "%s: acl_get_tag_type() failed", filename); if (tag == ACL_MASK) have_mask++; if (acl_delete_entry(acl_new, entry) == -1) { carried_error++; - warnx("cannot remove non-existent acl entry"); + warnx("%s: cannot remove non-existent ACL entry", + filename); } } - if (acl_type == ACL_TYPE_ACCESS) { - acl_free(prev_acl[ACCESS_ACL]); - prev_acl[ACCESS_ACL] = acl_new; - } else { - acl_free(prev_acl[DEFAULT_ACL]); - prev_acl[DEFAULT_ACL] = acl_new; + acl_free(*prev_acl); + *prev_acl = acl_new; + + if (carried_error) + return (-1); + + return (0); +} + +int +remove_by_number(uint entry_number, acl_t *prev_acl, const char *filename) +{ + acl_entry_t entry; + acl_t acl_new; + acl_tag_t tag; + int carried_error, entry_id; + uint i; + + carried_error = 0; + + acl_new = acl_dup(*prev_acl); + if (acl_new == NULL) + err(1, "%s: acl_dup() failed", filename); + + tag = ACL_UNDEFINED_TAG; + + /* + * Find out whether we're removing the mask entry, + * to behave the same as the routine above. + * + * XXX: Is this loop actually needed? + */ + entry_id = ACL_FIRST_ENTRY; + i = 0; + while (acl_get_entry(acl_new, entry_id, &entry) == 1) { + entry_id = ACL_NEXT_ENTRY; + if (i != entry_number) + continue; + if (acl_get_tag_type(entry, &tag) == -1) + err(1, "%s: acl_get_tag_type() failed", filename); + if (tag == ACL_MASK) + have_mask++; + } + + if (acl_delete_entry_np(acl_new, entry_number) == -1) { + carried_error++; + warn("%s: acl_delete_entry_np() failed", filename); } + acl_free(*prev_acl); + *prev_acl = acl_new; + if (carried_error) return (-1); @@ -91,18 +146,14 @@ * remove default entries */ int -remove_default(acl_t *prev_acl) +remove_default(acl_t *prev_acl, const char *filename) { - if (prev_acl[1]) { - acl_free(prev_acl[1]); - prev_acl[1] = acl_init(ACL_MAX_ENTRIES); - if (prev_acl[1] == NULL) - err(1, "acl_init() failed"); - } else { - warn("cannot remove default ACL"); - return (-1); - } + acl_free(*prev_acl); + *prev_acl = acl_init(ACL_MAX_ENTRIES); + if (*prev_acl == NULL) + err(1, "%s: acl_init() failed", filename); + return (0); } @@ -110,71 +161,14 @@ * remove extended entries */ void -remove_ext(acl_t *prev_acl) +remove_ext(acl_t *prev_acl, const char *filename) { - acl_t acl_new, acl_old; - acl_entry_t entry, entry_new; - acl_permset_t perm; - acl_tag_t tag; - int entry_id, have_mask_entry; + acl_t acl_new; - if (acl_type == ACL_TYPE_ACCESS) - acl_old = acl_dup(prev_acl[ACCESS_ACL]); - else - acl_old = acl_dup(prev_acl[DEFAULT_ACL]); - if (acl_old == NULL) - err(1, "acl_dup() failed"); - - have_mask_entry = 0; - acl_new = acl_init(ACL_MAX_ENTRIES); + acl_new = acl_strip_np(*prev_acl, !n_flag); if (acl_new == NULL) - err(1, "acl_init() failed"); - tag = ACL_UNDEFINED_TAG; + err(1, "%s: acl_strip_np() failed", filename); - /* only save the default user/group/other entries */ - entry_id = ACL_FIRST_ENTRY; - while (acl_get_entry(acl_old, entry_id, &entry) == 1) { - entry_id = ACL_NEXT_ENTRY; - - if (acl_get_tag_type(entry, &tag) == -1) - err(1, "acl_get_tag_type() failed"); - - switch(tag) { - case ACL_USER_OBJ: - case ACL_GROUP_OBJ: - case ACL_OTHER: - if (acl_get_tag_type(entry, &tag) == -1) - err(1, "acl_get_tag_type() failed"); - if (acl_get_permset(entry, &perm) == -1) - err(1, "acl_get_permset() failed"); - if (acl_create_entry(&acl_new, &entry_new) == -1) - err(1, "acl_create_entry() failed"); - if (acl_set_tag_type(entry_new, tag) == -1) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 16 20:43:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB44D1065694; Wed, 16 Sep 2009 20:43:40 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8FD29106568F for ; Wed, 16 Sep 2009 20:43:40 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7F0258FC08 for ; Wed, 16 Sep 2009 20:43:40 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8GKhePw048259 for ; Wed, 16 Sep 2009 20:43:40 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8GKhejX048257 for perforce@freebsd.org; Wed, 16 Sep 2009 20:43:40 GMT (envelope-from lulf@FreeBSD.org) Date: Wed, 16 Sep 2009 20:43:40 GMT Message-Id: <200909162043.n8GKhejX048257@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 168596 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Sep 2009 20:43:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=168596 Change 168596 by lulf@lulf_nobby on 2009/09/16 20:42:52 - Return correct clock frequency for MCI. The device itself seems to work now, but other problems not directly to mmc (it seems) blocks operation. The clock rate handling should be fixed once I get the device to work. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/at32_pm.c#8 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/at32_pm.c#8 (text+ko) ==== @@ -251,7 +251,14 @@ static uint64_t at32_mci_get_rate(devclk_t clk) { - return (0); +/* unsigned long cksel, shift = 0; + clksel = RD4(AT32_PM_CKSEL); + + if (clksel & (1 << AT32_PM_CKSEL_PBBDIV)) { + shift = 0; // XXX: Need to take divider into account + }*/ + // XXX: Assume OSC0 for now. Fix later. + return (20000000); } static int From owner-p4-projects@FreeBSD.ORG Wed Sep 16 21:51:55 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 342D71065679; Wed, 16 Sep 2009 21:51:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B53BD1065670 for ; Wed, 16 Sep 2009 21:51:54 +0000 (UTC) (envelope-from sbruno@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A2AFD8FC0C for ; Wed, 16 Sep 2009 21:51:54 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8GLpsn9064259 for ; Wed, 16 Sep 2009 21:51:54 GMT (envelope-from sbruno@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8GLprBW064255 for perforce@freebsd.org; Wed, 16 Sep 2009 21:51:53 GMT (envelope-from sbruno@freebsd.org) Date: Wed, 16 Sep 2009 21:51:53 GMT Message-Id: <200909162151.n8GLprBW064255@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sbruno@freebsd.org using -f From: Sean Bruno To: Perforce Change Reviews Cc: Subject: PERFORCE change 168597 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Sep 2009 21:51:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=168597 Change 168597 by sbruno@sbruno_consultcsg on 2009/09/16 21:51:48 Populating a workspace for firewire enhancements and development Affected files ... .. //depot/projects/firewire/COPYRIGHT#1 branch .. //depot/projects/firewire/LOCKS#1 branch .. //depot/projects/firewire/MAINTAINERS#1 branch .. //depot/projects/firewire/Makefile#1 branch .. //depot/projects/firewire/Makefile.inc1#1 branch .. //depot/projects/firewire/ObsoleteFiles.inc#1 branch .. //depot/projects/firewire/README#1 branch .. //depot/projects/firewire/UPDATING#1 branch .. //depot/projects/firewire/bin/Makefile#1 branch .. //depot/projects/firewire/bin/Makefile.inc#1 branch .. //depot/projects/firewire/bin/cat/Makefile#1 branch .. //depot/projects/firewire/bin/cat/cat.1#1 branch .. //depot/projects/firewire/bin/cat/cat.c#1 branch .. //depot/projects/firewire/bin/chflags/Makefile#1 branch .. //depot/projects/firewire/bin/chflags/chflags.1#1 branch .. //depot/projects/firewire/bin/chflags/chflags.c#1 branch .. //depot/projects/firewire/bin/chio/Makefile#1 branch .. //depot/projects/firewire/bin/chio/chio.1#1 branch .. //depot/projects/firewire/bin/chio/chio.c#1 branch .. //depot/projects/firewire/bin/chio/defs.h#1 branch .. //depot/projects/firewire/bin/chio/pathnames.h#1 branch .. //depot/projects/firewire/bin/chmod/Makefile#1 branch .. //depot/projects/firewire/bin/chmod/chmod.1#1 branch .. //depot/projects/firewire/bin/chmod/chmod.c#1 branch .. //depot/projects/firewire/bin/cp/Makefile#1 branch .. //depot/projects/firewire/bin/cp/cp.1#1 branch .. //depot/projects/firewire/bin/cp/cp.c#1 branch .. //depot/projects/firewire/bin/cp/extern.h#1 branch .. //depot/projects/firewire/bin/cp/utils.c#1 branch .. //depot/projects/firewire/bin/csh/Makefile#1 branch .. //depot/projects/firewire/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/firewire/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/firewire/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/firewire/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/firewire/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/firewire/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/firewire/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/firewire/bin/csh/config.h#1 branch .. //depot/projects/firewire/bin/csh/config_p.h#1 branch .. //depot/projects/firewire/bin/csh/host.defs#1 branch .. //depot/projects/firewire/bin/csh/iconv.h#1 branch .. //depot/projects/firewire/bin/csh/iconv_stub.c#1 branch .. //depot/projects/firewire/bin/date/Makefile#1 branch .. //depot/projects/firewire/bin/date/date.1#1 branch .. //depot/projects/firewire/bin/date/date.c#1 branch .. //depot/projects/firewire/bin/date/extern.h#1 branch .. //depot/projects/firewire/bin/date/netdate.c#1 branch .. //depot/projects/firewire/bin/date/vary.c#1 branch .. //depot/projects/firewire/bin/date/vary.h#1 branch .. //depot/projects/firewire/bin/dd/Makefile#1 branch .. //depot/projects/firewire/bin/dd/args.c#1 branch .. //depot/projects/firewire/bin/dd/conv.c#1 branch .. //depot/projects/firewire/bin/dd/conv_tab.c#1 branch .. //depot/projects/firewire/bin/dd/dd.1#1 branch .. //depot/projects/firewire/bin/dd/dd.c#1 branch .. //depot/projects/firewire/bin/dd/dd.h#1 branch .. //depot/projects/firewire/bin/dd/extern.h#1 branch .. //depot/projects/firewire/bin/dd/gen.c#1 branch .. //depot/projects/firewire/bin/dd/misc.c#1 branch .. //depot/projects/firewire/bin/dd/position.c#1 branch .. //depot/projects/firewire/bin/dd/ref.ascii#1 branch .. //depot/projects/firewire/bin/dd/ref.ebcdic#1 branch .. //depot/projects/firewire/bin/dd/ref.ibm#1 branch .. //depot/projects/firewire/bin/dd/ref.lcase#1 branch .. //depot/projects/firewire/bin/dd/ref.oldascii#1 branch .. //depot/projects/firewire/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/firewire/bin/dd/ref.oldibm#1 branch .. //depot/projects/firewire/bin/dd/ref.pareven#1 branch .. //depot/projects/firewire/bin/dd/ref.parnone#1 branch .. //depot/projects/firewire/bin/dd/ref.parodd#1 branch .. //depot/projects/firewire/bin/dd/ref.parset#1 branch .. //depot/projects/firewire/bin/dd/ref.swab#1 branch .. //depot/projects/firewire/bin/dd/ref.ucase#1 branch .. //depot/projects/firewire/bin/df/Makefile#1 branch .. //depot/projects/firewire/bin/df/df.1#1 branch .. //depot/projects/firewire/bin/df/df.c#1 branch .. //depot/projects/firewire/bin/domainname/Makefile#1 branch .. //depot/projects/firewire/bin/domainname/domainname.1#1 branch .. //depot/projects/firewire/bin/domainname/domainname.c#1 branch .. //depot/projects/firewire/bin/echo/Makefile#1 branch .. //depot/projects/firewire/bin/echo/echo.1#1 branch .. //depot/projects/firewire/bin/echo/echo.c#1 branch .. //depot/projects/firewire/bin/ed/Makefile#1 branch .. //depot/projects/firewire/bin/ed/POSIX#1 branch .. //depot/projects/firewire/bin/ed/README#1 branch .. //depot/projects/firewire/bin/ed/buf.c#1 branch .. //depot/projects/firewire/bin/ed/cbc.c#1 branch .. //depot/projects/firewire/bin/ed/ed.1#1 branch .. //depot/projects/firewire/bin/ed/ed.h#1 branch .. //depot/projects/firewire/bin/ed/glbl.c#1 branch .. //depot/projects/firewire/bin/ed/io.c#1 branch .. //depot/projects/firewire/bin/ed/main.c#1 branch .. //depot/projects/firewire/bin/ed/re.c#1 branch .. //depot/projects/firewire/bin/ed/sub.c#1 branch .. //depot/projects/firewire/bin/ed/test/=.err#1 branch .. //depot/projects/firewire/bin/ed/test/Makefile#1 branch .. //depot/projects/firewire/bin/ed/test/README#1 branch .. //depot/projects/firewire/bin/ed/test/TODO#1 branch .. //depot/projects/firewire/bin/ed/test/a.d#1 branch .. //depot/projects/firewire/bin/ed/test/a.r#1 branch .. //depot/projects/firewire/bin/ed/test/a.t#1 branch .. //depot/projects/firewire/bin/ed/test/a1.err#1 branch .. //depot/projects/firewire/bin/ed/test/a2.err#1 branch .. //depot/projects/firewire/bin/ed/test/addr.d#1 branch .. //depot/projects/firewire/bin/ed/test/addr.r#1 branch .. //depot/projects/firewire/bin/ed/test/addr.t#1 branch .. //depot/projects/firewire/bin/ed/test/addr1.err#1 branch .. //depot/projects/firewire/bin/ed/test/addr2.err#1 branch .. //depot/projects/firewire/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/firewire/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/firewire/bin/ed/test/ascii.t#1 branch .. //depot/projects/firewire/bin/ed/test/bang1.d#1 branch .. //depot/projects/firewire/bin/ed/test/bang1.err#1 branch .. //depot/projects/firewire/bin/ed/test/bang1.r#1 branch .. //depot/projects/firewire/bin/ed/test/bang1.t#1 branch .. //depot/projects/firewire/bin/ed/test/bang2.err#1 branch .. //depot/projects/firewire/bin/ed/test/c.d#1 branch .. //depot/projects/firewire/bin/ed/test/c.r#1 branch .. //depot/projects/firewire/bin/ed/test/c.t#1 branch .. //depot/projects/firewire/bin/ed/test/c1.err#1 branch .. //depot/projects/firewire/bin/ed/test/c2.err#1 branch .. //depot/projects/firewire/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/firewire/bin/ed/test/d.d#1 branch .. //depot/projects/firewire/bin/ed/test/d.err#1 branch .. //depot/projects/firewire/bin/ed/test/d.r#1 branch .. //depot/projects/firewire/bin/ed/test/d.t#1 branch .. //depot/projects/firewire/bin/ed/test/e1.d#1 branch .. //depot/projects/firewire/bin/ed/test/e1.err#1 branch .. //depot/projects/firewire/bin/ed/test/e1.r#1 branch .. //depot/projects/firewire/bin/ed/test/e1.t#1 branch .. //depot/projects/firewire/bin/ed/test/e2.d#1 branch .. //depot/projects/firewire/bin/ed/test/e2.err#1 branch .. //depot/projects/firewire/bin/ed/test/e2.r#1 branch .. //depot/projects/firewire/bin/ed/test/e2.t#1 branch .. //depot/projects/firewire/bin/ed/test/e3.d#1 branch .. //depot/projects/firewire/bin/ed/test/e3.err#1 branch .. //depot/projects/firewire/bin/ed/test/e3.r#1 branch .. //depot/projects/firewire/bin/ed/test/e3.t#1 branch .. //depot/projects/firewire/bin/ed/test/e4.d#1 branch .. //depot/projects/firewire/bin/ed/test/e4.r#1 branch .. //depot/projects/firewire/bin/ed/test/e4.t#1 branch .. //depot/projects/firewire/bin/ed/test/f1.err#1 branch .. //depot/projects/firewire/bin/ed/test/f2.err#1 branch .. //depot/projects/firewire/bin/ed/test/g1.d#1 branch .. //depot/projects/firewire/bin/ed/test/g1.err#1 branch .. //depot/projects/firewire/bin/ed/test/g1.r#1 branch .. //depot/projects/firewire/bin/ed/test/g1.t#1 branch .. //depot/projects/firewire/bin/ed/test/g2.d#1 branch .. //depot/projects/firewire/bin/ed/test/g2.err#1 branch .. //depot/projects/firewire/bin/ed/test/g2.r#1 branch .. //depot/projects/firewire/bin/ed/test/g2.t#1 branch .. //depot/projects/firewire/bin/ed/test/g3.d#1 branch .. //depot/projects/firewire/bin/ed/test/g3.err#1 branch .. //depot/projects/firewire/bin/ed/test/g3.r#1 branch .. //depot/projects/firewire/bin/ed/test/g3.t#1 branch .. //depot/projects/firewire/bin/ed/test/g4.d#1 branch .. //depot/projects/firewire/bin/ed/test/g4.r#1 branch .. //depot/projects/firewire/bin/ed/test/g4.t#1 branch .. //depot/projects/firewire/bin/ed/test/g5.d#1 branch .. //depot/projects/firewire/bin/ed/test/g5.r#1 branch .. //depot/projects/firewire/bin/ed/test/g5.t#1 branch .. //depot/projects/firewire/bin/ed/test/h.err#1 branch .. //depot/projects/firewire/bin/ed/test/i.d#1 branch .. //depot/projects/firewire/bin/ed/test/i.r#1 branch .. //depot/projects/firewire/bin/ed/test/i.t#1 branch .. //depot/projects/firewire/bin/ed/test/i1.err#1 branch .. //depot/projects/firewire/bin/ed/test/i2.err#1 branch .. //depot/projects/firewire/bin/ed/test/i3.err#1 branch .. //depot/projects/firewire/bin/ed/test/j.d#1 branch .. //depot/projects/firewire/bin/ed/test/j.r#1 branch .. //depot/projects/firewire/bin/ed/test/j.t#1 branch .. //depot/projects/firewire/bin/ed/test/k.d#1 branch .. //depot/projects/firewire/bin/ed/test/k.r#1 branch .. //depot/projects/firewire/bin/ed/test/k.t#1 branch .. //depot/projects/firewire/bin/ed/test/k1.err#1 branch .. //depot/projects/firewire/bin/ed/test/k2.err#1 branch .. //depot/projects/firewire/bin/ed/test/k3.err#1 branch .. //depot/projects/firewire/bin/ed/test/k4.err#1 branch .. //depot/projects/firewire/bin/ed/test/l.d#1 branch .. //depot/projects/firewire/bin/ed/test/l.r#1 branch .. //depot/projects/firewire/bin/ed/test/l.t#1 branch .. //depot/projects/firewire/bin/ed/test/m.d#1 branch .. //depot/projects/firewire/bin/ed/test/m.err#1 branch .. //depot/projects/firewire/bin/ed/test/m.r#1 branch .. //depot/projects/firewire/bin/ed/test/m.t#1 branch .. //depot/projects/firewire/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/firewire/bin/ed/test/n.d#1 branch .. //depot/projects/firewire/bin/ed/test/n.r#1 branch .. //depot/projects/firewire/bin/ed/test/n.t#1 branch .. //depot/projects/firewire/bin/ed/test/nl.err#1 branch .. //depot/projects/firewire/bin/ed/test/nl1.d#1 branch .. //depot/projects/firewire/bin/ed/test/nl1.r#1 branch .. //depot/projects/firewire/bin/ed/test/nl1.t#1 branch .. //depot/projects/firewire/bin/ed/test/nl2.d#1 branch .. //depot/projects/firewire/bin/ed/test/nl2.r#1 branch .. //depot/projects/firewire/bin/ed/test/nl2.t#1 branch .. //depot/projects/firewire/bin/ed/test/p.d#1 branch .. //depot/projects/firewire/bin/ed/test/p.r#1 branch .. //depot/projects/firewire/bin/ed/test/p.t#1 branch .. //depot/projects/firewire/bin/ed/test/q.d#1 branch .. //depot/projects/firewire/bin/ed/test/q.r#1 branch .. //depot/projects/firewire/bin/ed/test/q.t#1 branch .. //depot/projects/firewire/bin/ed/test/q1.err#1 branch .. //depot/projects/firewire/bin/ed/test/r1.d#1 branch .. //depot/projects/firewire/bin/ed/test/r1.err#1 branch .. //depot/projects/firewire/bin/ed/test/r1.r#1 branch .. //depot/projects/firewire/bin/ed/test/r1.t#1 branch .. //depot/projects/firewire/bin/ed/test/r2.d#1 branch .. //depot/projects/firewire/bin/ed/test/r2.err#1 branch .. //depot/projects/firewire/bin/ed/test/r2.r#1 branch .. //depot/projects/firewire/bin/ed/test/r2.t#1 branch .. //depot/projects/firewire/bin/ed/test/r3.d#1 branch .. //depot/projects/firewire/bin/ed/test/r3.r#1 branch .. //depot/projects/firewire/bin/ed/test/r3.t#1 branch .. //depot/projects/firewire/bin/ed/test/s1.d#1 branch .. //depot/projects/firewire/bin/ed/test/s1.err#1 branch .. //depot/projects/firewire/bin/ed/test/s1.r#1 branch .. //depot/projects/firewire/bin/ed/test/s1.t#1 branch .. //depot/projects/firewire/bin/ed/test/s10.err#1 branch .. //depot/projects/firewire/bin/ed/test/s2.d#1 branch .. //depot/projects/firewire/bin/ed/test/s2.err#1 branch .. //depot/projects/firewire/bin/ed/test/s2.r#1 branch .. //depot/projects/firewire/bin/ed/test/s2.t#1 branch .. //depot/projects/firewire/bin/ed/test/s3.d#1 branch .. //depot/projects/firewire/bin/ed/test/s3.err#1 branch .. //depot/projects/firewire/bin/ed/test/s3.r#1 branch .. //depot/projects/firewire/bin/ed/test/s3.t#1 branch .. //depot/projects/firewire/bin/ed/test/s4.err#1 branch .. //depot/projects/firewire/bin/ed/test/s5.err#1 branch .. //depot/projects/firewire/bin/ed/test/s6.err#1 branch .. //depot/projects/firewire/bin/ed/test/s7.err#1 branch .. //depot/projects/firewire/bin/ed/test/s8.err#1 branch .. //depot/projects/firewire/bin/ed/test/s9.err#1 branch .. //depot/projects/firewire/bin/ed/test/t.d#1 branch .. //depot/projects/firewire/bin/ed/test/t.r#1 branch .. //depot/projects/firewire/bin/ed/test/t1.d#1 branch .. //depot/projects/firewire/bin/ed/test/t1.err#1 branch .. //depot/projects/firewire/bin/ed/test/t1.r#1 branch .. //depot/projects/firewire/bin/ed/test/t1.t#1 branch .. //depot/projects/firewire/bin/ed/test/t2.d#1 branch .. //depot/projects/firewire/bin/ed/test/t2.err#1 branch .. //depot/projects/firewire/bin/ed/test/t2.r#1 branch .. //depot/projects/firewire/bin/ed/test/t2.t#1 branch .. //depot/projects/firewire/bin/ed/test/u.d#1 branch .. //depot/projects/firewire/bin/ed/test/u.err#1 branch .. //depot/projects/firewire/bin/ed/test/u.r#1 branch .. //depot/projects/firewire/bin/ed/test/u.t#1 branch .. //depot/projects/firewire/bin/ed/test/v.d#1 branch .. //depot/projects/firewire/bin/ed/test/v.r#1 branch .. //depot/projects/firewire/bin/ed/test/v.t#1 branch .. //depot/projects/firewire/bin/ed/test/w.d#1 branch .. //depot/projects/firewire/bin/ed/test/w.r#1 branch .. //depot/projects/firewire/bin/ed/test/w.t#1 branch .. //depot/projects/firewire/bin/ed/test/w1.err#1 branch .. //depot/projects/firewire/bin/ed/test/w2.err#1 branch .. //depot/projects/firewire/bin/ed/test/w3.err#1 branch .. //depot/projects/firewire/bin/ed/test/x.err#1 branch .. //depot/projects/firewire/bin/ed/test/z.err#1 branch .. //depot/projects/firewire/bin/ed/undo.c#1 branch .. //depot/projects/firewire/bin/expr/Makefile#1 branch .. //depot/projects/firewire/bin/expr/expr.1#1 branch .. //depot/projects/firewire/bin/expr/expr.y#1 branch .. //depot/projects/firewire/bin/getfacl/Makefile#1 branch .. //depot/projects/firewire/bin/getfacl/getfacl.1#1 branch .. //depot/projects/firewire/bin/getfacl/getfacl.c#1 branch .. //depot/projects/firewire/bin/hostname/Makefile#1 branch .. //depot/projects/firewire/bin/hostname/hostname.1#1 branch .. //depot/projects/firewire/bin/hostname/hostname.c#1 branch .. //depot/projects/firewire/bin/kenv/Makefile#1 branch .. //depot/projects/firewire/bin/kenv/kenv.1#1 branch .. //depot/projects/firewire/bin/kenv/kenv.c#1 branch .. //depot/projects/firewire/bin/kill/Makefile#1 branch .. //depot/projects/firewire/bin/kill/kill.1#1 branch .. //depot/projects/firewire/bin/kill/kill.c#1 branch .. //depot/projects/firewire/bin/ln/Makefile#1 branch .. //depot/projects/firewire/bin/ln/ln.1#1 branch .. //depot/projects/firewire/bin/ln/ln.c#1 branch .. //depot/projects/firewire/bin/ln/symlink.7#1 branch .. //depot/projects/firewire/bin/ls/Makefile#1 branch .. //depot/projects/firewire/bin/ls/cmp.c#1 branch .. //depot/projects/firewire/bin/ls/extern.h#1 branch .. //depot/projects/firewire/bin/ls/ls.1#1 branch .. //depot/projects/firewire/bin/ls/ls.c#1 branch .. //depot/projects/firewire/bin/ls/ls.h#1 branch .. //depot/projects/firewire/bin/ls/print.c#1 branch .. //depot/projects/firewire/bin/ls/util.c#1 branch .. //depot/projects/firewire/bin/mkdir/Makefile#1 branch .. //depot/projects/firewire/bin/mkdir/mkdir.1#1 branch .. //depot/projects/firewire/bin/mkdir/mkdir.c#1 branch .. //depot/projects/firewire/bin/mv/Makefile#1 branch .. //depot/projects/firewire/bin/mv/mv.1#1 branch .. //depot/projects/firewire/bin/mv/mv.c#1 branch .. //depot/projects/firewire/bin/pax/Makefile#1 branch .. //depot/projects/firewire/bin/pax/ar_io.c#1 branch .. //depot/projects/firewire/bin/pax/ar_subs.c#1 branch .. //depot/projects/firewire/bin/pax/buf_subs.c#1 branch .. //depot/projects/firewire/bin/pax/cache.c#1 branch .. //depot/projects/firewire/bin/pax/cache.h#1 branch .. //depot/projects/firewire/bin/pax/cpio.1#1 branch .. //depot/projects/firewire/bin/pax/cpio.c#1 branch .. //depot/projects/firewire/bin/pax/cpio.h#1 branch .. //depot/projects/firewire/bin/pax/extern.h#1 branch .. //depot/projects/firewire/bin/pax/file_subs.c#1 branch .. //depot/projects/firewire/bin/pax/ftree.c#1 branch .. //depot/projects/firewire/bin/pax/ftree.h#1 branch .. //depot/projects/firewire/bin/pax/gen_subs.c#1 branch .. //depot/projects/firewire/bin/pax/getoldopt.c#1 branch .. //depot/projects/firewire/bin/pax/options.c#1 branch .. //depot/projects/firewire/bin/pax/options.h#1 branch .. //depot/projects/firewire/bin/pax/pat_rep.c#1 branch .. //depot/projects/firewire/bin/pax/pat_rep.h#1 branch .. //depot/projects/firewire/bin/pax/pax.1#1 branch .. //depot/projects/firewire/bin/pax/pax.c#1 branch .. //depot/projects/firewire/bin/pax/pax.h#1 branch .. //depot/projects/firewire/bin/pax/sel_subs.c#1 branch .. //depot/projects/firewire/bin/pax/sel_subs.h#1 branch .. //depot/projects/firewire/bin/pax/tables.c#1 branch .. //depot/projects/firewire/bin/pax/tables.h#1 branch .. //depot/projects/firewire/bin/pax/tar.1#1 branch .. //depot/projects/firewire/bin/pax/tar.c#1 branch .. //depot/projects/firewire/bin/pax/tar.h#1 branch .. //depot/projects/firewire/bin/pax/tty_subs.c#1 branch .. //depot/projects/firewire/bin/pkill/Makefile#1 branch .. //depot/projects/firewire/bin/pkill/pkill.1#1 branch .. //depot/projects/firewire/bin/pkill/pkill.c#1 branch .. //depot/projects/firewire/bin/ps/Makefile#1 branch .. //depot/projects/firewire/bin/ps/extern.h#1 branch .. //depot/projects/firewire/bin/ps/fmt.c#1 branch .. //depot/projects/firewire/bin/ps/keyword.c#1 branch .. //depot/projects/firewire/bin/ps/nlist.c#1 branch .. //depot/projects/firewire/bin/ps/print.c#1 branch .. //depot/projects/firewire/bin/ps/ps.1#1 branch .. //depot/projects/firewire/bin/ps/ps.c#1 branch .. //depot/projects/firewire/bin/ps/ps.h#1 branch .. //depot/projects/firewire/bin/pwd/Makefile#1 branch .. //depot/projects/firewire/bin/pwd/pwd.1#1 branch .. //depot/projects/firewire/bin/pwd/pwd.c#1 branch .. //depot/projects/firewire/bin/rcp/Makefile#1 branch .. //depot/projects/firewire/bin/rcp/extern.h#1 branch .. //depot/projects/firewire/bin/rcp/rcp.1#1 branch .. //depot/projects/firewire/bin/rcp/rcp.c#1 branch .. //depot/projects/firewire/bin/rcp/util.c#1 branch .. //depot/projects/firewire/bin/realpath/Makefile#1 branch .. //depot/projects/firewire/bin/realpath/realpath.1#1 branch .. //depot/projects/firewire/bin/realpath/realpath.c#1 branch .. //depot/projects/firewire/bin/rm/Makefile#1 branch .. //depot/projects/firewire/bin/rm/rm.1#1 branch .. //depot/projects/firewire/bin/rm/rm.c#1 branch .. //depot/projects/firewire/bin/rmail/Makefile#1 branch .. //depot/projects/firewire/bin/rmdir/Makefile#1 branch .. //depot/projects/firewire/bin/rmdir/rmdir.1#1 branch .. //depot/projects/firewire/bin/rmdir/rmdir.c#1 branch .. //depot/projects/firewire/bin/setfacl/Makefile#1 branch .. //depot/projects/firewire/bin/setfacl/file.c#1 branch .. //depot/projects/firewire/bin/setfacl/mask.c#1 branch .. //depot/projects/firewire/bin/setfacl/merge.c#1 branch .. //depot/projects/firewire/bin/setfacl/remove.c#1 branch .. //depot/projects/firewire/bin/setfacl/setfacl.1#1 branch .. //depot/projects/firewire/bin/setfacl/setfacl.c#1 branch .. //depot/projects/firewire/bin/setfacl/setfacl.h#1 branch .. //depot/projects/firewire/bin/setfacl/util.c#1 branch .. //depot/projects/firewire/bin/sh/Makefile#1 branch .. //depot/projects/firewire/bin/sh/TOUR#1 branch .. //depot/projects/firewire/bin/sh/alias.c#1 branch .. //depot/projects/firewire/bin/sh/alias.h#1 branch .. //depot/projects/firewire/bin/sh/arith.h#1 branch .. //depot/projects/firewire/bin/sh/arith.y#1 branch .. //depot/projects/firewire/bin/sh/arith_lex.l#1 branch .. //depot/projects/firewire/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/firewire/bin/sh/bltin/echo.1#1 branch .. //depot/projects/firewire/bin/sh/bltin/echo.c#1 branch .. //depot/projects/firewire/bin/sh/builtins.def#1 branch .. //depot/projects/firewire/bin/sh/cd.c#1 branch .. //depot/projects/firewire/bin/sh/cd.h#1 branch .. //depot/projects/firewire/bin/sh/error.c#1 branch .. //depot/projects/firewire/bin/sh/error.h#1 branch .. //depot/projects/firewire/bin/sh/eval.c#1 branch .. //depot/projects/firewire/bin/sh/eval.h#1 branch .. //depot/projects/firewire/bin/sh/exec.c#1 branch .. //depot/projects/firewire/bin/sh/exec.h#1 branch .. //depot/projects/firewire/bin/sh/expand.c#1 branch .. //depot/projects/firewire/bin/sh/expand.h#1 branch .. //depot/projects/firewire/bin/sh/funcs/cmv#1 branch .. //depot/projects/firewire/bin/sh/funcs/dirs#1 branch .. //depot/projects/firewire/bin/sh/funcs/kill#1 branch .. //depot/projects/firewire/bin/sh/funcs/login#1 branch .. //depot/projects/firewire/bin/sh/funcs/newgrp#1 branch .. //depot/projects/firewire/bin/sh/funcs/popd#1 branch .. //depot/projects/firewire/bin/sh/funcs/pushd#1 branch .. //depot/projects/firewire/bin/sh/funcs/suspend#1 branch .. //depot/projects/firewire/bin/sh/histedit.c#1 branch .. //depot/projects/firewire/bin/sh/init.h#1 branch .. //depot/projects/firewire/bin/sh/input.c#1 branch .. //depot/projects/firewire/bin/sh/input.h#1 branch .. //depot/projects/firewire/bin/sh/jobs.c#1 branch .. //depot/projects/firewire/bin/sh/jobs.h#1 branch .. //depot/projects/firewire/bin/sh/mail.c#1 branch .. //depot/projects/firewire/bin/sh/mail.h#1 branch .. //depot/projects/firewire/bin/sh/main.c#1 branch .. //depot/projects/firewire/bin/sh/main.h#1 branch .. //depot/projects/firewire/bin/sh/memalloc.c#1 branch .. //depot/projects/firewire/bin/sh/memalloc.h#1 branch .. //depot/projects/firewire/bin/sh/miscbltin.c#1 branch .. //depot/projects/firewire/bin/sh/mkbuiltins#1 branch .. //depot/projects/firewire/bin/sh/mkinit.c#1 branch .. //depot/projects/firewire/bin/sh/mknodes.c#1 branch .. //depot/projects/firewire/bin/sh/mksyntax.c#1 branch .. //depot/projects/firewire/bin/sh/mktokens#1 branch .. //depot/projects/firewire/bin/sh/myhistedit.h#1 branch .. //depot/projects/firewire/bin/sh/mystring.c#1 branch .. //depot/projects/firewire/bin/sh/mystring.h#1 branch .. //depot/projects/firewire/bin/sh/nodes.c.pat#1 branch .. //depot/projects/firewire/bin/sh/nodetypes#1 branch .. //depot/projects/firewire/bin/sh/options.c#1 branch .. //depot/projects/firewire/bin/sh/options.h#1 branch .. //depot/projects/firewire/bin/sh/output.c#1 branch .. //depot/projects/firewire/bin/sh/output.h#1 branch .. //depot/projects/firewire/bin/sh/parser.c#1 branch .. //depot/projects/firewire/bin/sh/parser.h#1 branch .. //depot/projects/firewire/bin/sh/redir.c#1 branch .. //depot/projects/firewire/bin/sh/redir.h#1 branch .. //depot/projects/firewire/bin/sh/sh.1#1 branch .. //depot/projects/firewire/bin/sh/shell.h#1 branch .. //depot/projects/firewire/bin/sh/show.c#1 branch .. //depot/projects/firewire/bin/sh/show.h#1 branch .. //depot/projects/firewire/bin/sh/trap.c#1 branch .. //depot/projects/firewire/bin/sh/trap.h#1 branch .. //depot/projects/firewire/bin/sh/var.c#1 branch .. //depot/projects/firewire/bin/sh/var.h#1 branch .. //depot/projects/firewire/bin/sleep/Makefile#1 branch .. //depot/projects/firewire/bin/sleep/sleep.1#1 branch .. //depot/projects/firewire/bin/sleep/sleep.c#1 branch .. //depot/projects/firewire/bin/stty/Makefile#1 branch .. //depot/projects/firewire/bin/stty/cchar.c#1 branch .. //depot/projects/firewire/bin/stty/extern.h#1 branch .. //depot/projects/firewire/bin/stty/gfmt.c#1 branch .. //depot/projects/firewire/bin/stty/key.c#1 branch .. //depot/projects/firewire/bin/stty/modes.c#1 branch .. //depot/projects/firewire/bin/stty/print.c#1 branch .. //depot/projects/firewire/bin/stty/stty.1#1 branch .. //depot/projects/firewire/bin/stty/stty.c#1 branch .. //depot/projects/firewire/bin/stty/stty.h#1 branch .. //depot/projects/firewire/bin/stty/util.c#1 branch .. //depot/projects/firewire/bin/sync/Makefile#1 branch .. //depot/projects/firewire/bin/sync/sync.8#1 branch .. //depot/projects/firewire/bin/sync/sync.c#1 branch .. //depot/projects/firewire/bin/test/Makefile#1 branch .. //depot/projects/firewire/bin/test/TEST.README#1 branch .. //depot/projects/firewire/bin/test/TEST.csh#1 branch .. //depot/projects/firewire/bin/test/TEST.sh#1 branch .. //depot/projects/firewire/bin/test/test.1#1 branch .. //depot/projects/firewire/bin/test/test.c#1 branch .. //depot/projects/firewire/bin/uuidgen/Makefile#1 branch .. //depot/projects/firewire/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/firewire/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/firewire/cddl/Makefile#1 branch .. //depot/projects/firewire/cddl/Makefile.inc#1 branch .. //depot/projects/firewire/cddl/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/firewire/cddl/compat/opensolaris/include/assert.h#1 branch .. //depot/projects/firewire/cddl/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/firewire/cddl/compat/opensolaris/include/dtrace.h#1 branch .. //depot/projects/firewire/cddl/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/firewire/cddl/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/firewire/cddl/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/firewire/cddl/compat/opensolaris/include/libproc.h#1 branch .. //depot/projects/firewire/cddl/compat/opensolaris/include/libshare.h#1 branch .. //depot/projects/firewire/cddl/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/firewire/cddl/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/firewire/cddl/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/firewire/cddl/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/firewire/cddl/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/firewire/cddl/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/firewire/cddl/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/firewire/cddl/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/firewire/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/firewire/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/firewire/cddl/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/firewire/cddl/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/firewire/cddl/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/firewire/cddl/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/firewire/cddl/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/firewire/cddl/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/README#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoa6badaddr.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoabadaddr.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadaddr.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadarg.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.badfreopen.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.bcopy.d#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.chill.ksh#1 branch .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 17 06:41:33 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D04B1065672; Thu, 17 Sep 2009 06:41: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 55388106566C for ; Thu, 17 Sep 2009 06:41:33 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 43CAE8FC08 for ; Thu, 17 Sep 2009 06:41:33 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8H6fWuO032069 for ; Thu, 17 Sep 2009 06:41:32 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8H6fWeT032067 for perforce@freebsd.org; Thu, 17 Sep 2009 06:41:32 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 17 Sep 2009 06:41:32 GMT Message-Id: <200909170641.n8H6fWeT032067@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 168602 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Sep 2009 06:41:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=168602 Change 168602 by hselasky@hselasky_laptop001 on 2009/09/17 06:40:53 USB network: - patch from Pyun YongHyeon to allow setting of MAC address for AXE based ethernet adapters. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#17 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#17 (text+ko) ==== @@ -982,10 +982,11 @@ /* Cancel pending I/O */ axe_stop(ue); -#ifdef notdef - /* Set MAC address */ - axe_mac(sc, IF_LLADDR(ifp), 1); -#endif + /* Set MAC address. */ + if (sc->sc_flags & (AXE_FLAG_178 | AXE_FLAG_772)) + axe_cmd(sc, AXE_178_CMD_WRITE_NODEID, 0, 0, IF_LLADDR(ifp)); + else + axe_cmd(sc, AXE_172_CMD_WRITE_NODEID, 0, 0, IF_LLADDR(ifp)); /* Set transmitter IPG values */ if (sc->sc_flags & (AXE_FLAG_178 | AXE_FLAG_772)) { From owner-p4-projects@FreeBSD.ORG Thu Sep 17 10:46:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 580E61065676; Thu, 17 Sep 2009 10:46: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 1B3AE1065670 for ; Thu, 17 Sep 2009 10:46:01 +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 0AE358FC0C for ; Thu, 17 Sep 2009 10:46:01 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8HAjx0O063864 for ; Thu, 17 Sep 2009 10:45:59 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8HAjxcn063862 for perforce@freebsd.org; Thu, 17 Sep 2009 10:45:59 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 17 Sep 2009 10:45:59 GMT Message-Id: <200909171045.n8HAjxcn063862@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 168603 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Sep 2009 10:46:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=168603 Change 168603 by hselasky@hselasky_laptop001 on 2009/09/17 10:45:21 USB serial: - add new ID's to uftdi driver. - reported by Arrigo Marchiori Affected files ... .. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#78 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#13 (text+ko) ==== @@ -241,6 +241,8 @@ {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_PCMSFU, UFTDI_TYPE_8U232AM)}, {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_EMCU2H, UFTDI_TYPE_8U232AM)}, {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MAXSTREAM, UFTDI_TYPE_8U232AM)}, + {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CTI_USB_NANO_485, UFTDI_TYPE_8U232AM)}, + {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CTI_USB_MINI_485, UFTDI_TYPE_8U232AM)}, {USB_VPI(USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_US2308, UFTDI_TYPE_8U232AM)}, {USB_VPI(USB_VENDOR_INTREPIDCS, USB_PRODUCT_INTREPIDCS_VALUECAN, UFTDI_TYPE_8U232AM)}, {USB_VPI(USB_VENDOR_INTREPIDCS, USB_PRODUCT_INTREPIDCS_NEOVI, UFTDI_TYPE_8U232AM)}, ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#78 (text+ko) ==== @@ -1336,6 +1336,9 @@ product FTDI CFA_631 0xfc0c Crystalfontz CFA-631 USB LCD product FTDI CFA_635 0xfc0d Crystalfontz CFA-635 USB LCD product FTDI SEMC_DSS20 0xfc82 SEMC DSS-20 SyncStation +/* Commerzielle und Technische Informationssysteme GmbH products */ +product FTDI CTI_USB_NANO_485 0xf60b CTI USB-Nano 485 +product FTDI CTI_USB_MINI_485 0xf608 CTI USB-Mini 485 /* Fuji photo products */ product FUJIPHOTO MASS0100 0x0100 Mass Storage From owner-p4-projects@FreeBSD.ORG Thu Sep 17 11:16:34 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D33B106568F; Thu, 17 Sep 2009 11:16: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 DD49C106566C for ; Thu, 17 Sep 2009 11:16:33 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C2D088FC1E for ; Thu, 17 Sep 2009 11:16:33 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8HBGX8K067134 for ; Thu, 17 Sep 2009 11:16:33 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8HBGXMH067132 for perforce@freebsd.org; Thu, 17 Sep 2009 11:16:33 GMT (envelope-from zec@fer.hr) Date: Thu, 17 Sep 2009 11:16:33 GMT Message-Id: <200909171116.n8HBGXMH067132@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 168604 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Sep 2009 11:16:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=168604 Change 168604 by zec@zec_tpx32 on 2009/09/17 11:15:37 Before a vnet can be safely shut down it must hold no ifnets of its own except lo0. ng_eiface and ng_iface are currently prone to leave ifnet instances behind, hence leading to panics on vnet destroy. This change introduces per-vnet lists of ng_eiface vnets, which is traversed and cleaned up early in vnet destroy sequence. So as an result we no longer get a panic on vnet destroy in vnet_ng_eiface_uninit(), but someplace else in mcast code, yeah! Affected files ... .. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#35 edit Differences ... ==== //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#35 (text+ko) ==== @@ -79,9 +79,20 @@ int unit; /* Interface unit number */ node_p node; /* Our netgraph node */ hook_p ether; /* Hook for ethernet stream */ + LIST_ENTRY(ng_eiface_private) le; /* All eiface nodes in a vnet */ }; typedef struct ng_eiface_private *priv_p; +#ifdef VIMAGE +/* Per-vnet list of eiface nodes */ +static VNET_DEFINE(LIST_HEAD(, ng_eiface_private), ng_eiface_list); +#define V_ng_eiface_list VNET(ng_eiface_list) + +static struct sx ng_eiface_list_sxlock; +#define NG_EIFACE_LIST_WLOCK() sx_xlock(&ng_eiface_list_sxlock); +#define NG_EIFACE_LIST_WUNLOCK() sx_xunlock(&ng_eiface_list_sxlock); +#endif + /* Interface methods */ static void ng_eiface_init(void *xsc); static void ng_eiface_start(struct ifnet *ifp); @@ -362,6 +373,11 @@ /* Link together node and private info */ NG_NODE_SET_PRIVATE(node, priv); priv->node = node; +#ifdef VIMAGE + NG_EIFACE_LIST_WLOCK(); + LIST_INSERT_HEAD(&V_ng_eiface_list, priv, le); + NG_EIFACE_LIST_WUNLOCK(); +#endif /* Initialize interface structure */ if_initname(ifp, NG_EIFACE_EIFACE_NAME, priv->unit); @@ -560,6 +576,11 @@ ether_ifdetach(ifp); if_free(ifp); CURVNET_RESTORE(); +#ifdef VIMAGE + NG_EIFACE_LIST_WLOCK(); + LIST_REMOVE(priv, le); + NG_EIFACE_LIST_WUNLOCK(); +#endif free_unr(V_ng_eiface_unit, priv->unit); free(priv, M_NETGRAPH); NG_NODE_SET_PRIVATE(node, NULL); @@ -589,7 +610,15 @@ switch (event) { case MOD_LOAD: +#ifdef VIMAGE + sx_init_flags(&ng_eiface_list_sxlock, "ng_eiface_sxlock", + SX_RECURSE); +#endif + break; case MOD_UNLOAD: +#ifdef VIMAGE + sx_destroy(&ng_eiface_list_sxlock); +#endif break; default: error = EOPNOTSUPP; @@ -602,6 +631,9 @@ vnet_ng_eiface_init(const void *unused) { +#ifdef VIMAGE + LIST_INIT(&V_ng_eiface_list); +#endif V_ng_eiface_unit = new_unrhdr(0, 0xffff, NULL); } VNET_SYSINIT(vnet_ng_eiface_init, SI_SUB_PSEUDO, SI_ORDER_ANY, @@ -610,19 +642,18 @@ static void vnet_ng_eiface_uninit(const void *unused) { -#ifdef VIMAGE_NOTYET - node_p node; +#ifdef VIMAGE + priv_p node_p, nnode_p; - do { - LIST_FOREACH(node, &V_ng_nodelist, nd_nodes) - if (node->nd_type == &typestruct) - break; - if (node != NULL) - ng_rmnode_self(node); - } while (node != NULL); + NG_EIFACE_LIST_WLOCK(); + LIST_FOREACH_SAFE(node_p, &V_ng_eiface_list, le, nnode_p) { + if (node_p->node->nd_type == &typestruct) + ng_rmnode_self(node_p->node); + } + NG_EIFACE_LIST_WUNLOCK(); #endif delete_unrhdr(V_ng_eiface_unit); } -VNET_SYSUNINIT(vnet_ng_eiface_uninit, SI_SUB_PSEUDO, SI_ORDER_ANY, +VNET_SYSUNINIT(vnet_ng_eiface_uninit, SI_SUB_PSEUDO, SI_ORDER_FIRST, vnet_ng_eiface_uninit, NULL); From owner-p4-projects@FreeBSD.ORG Thu Sep 17 13:43:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D27891065696; Thu, 17 Sep 2009 13:43:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 96C151065693 for ; Thu, 17 Sep 2009 13:43:14 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6B0B98FC12 for ; Thu, 17 Sep 2009 13:43:14 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8HDhE4Z091146 for ; Thu, 17 Sep 2009 13:43:14 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8HDhEuu091144 for perforce@freebsd.org; Thu, 17 Sep 2009 13:43:14 GMT (envelope-from stas@freebsd.org) Date: Thu, 17 Sep 2009 13:43:14 GMT Message-Id: <200909171343.n8HDhEuu091144@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Cc: Subject: PERFORCE change 168609 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Sep 2009 13:43:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=168609 Change 168609 by stas@stas_deglitch on 2009/09/17 13:42:50 - We don't support 4.x anyway, drop the suppression file. Affected files ... .. //depot/projects/valgrind/libc-4x.supp#4 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Sep 17 13:55:28 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43A54106568B; Thu, 17 Sep 2009 13:55:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 080EB1065670 for ; Thu, 17 Sep 2009 13:55:28 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D0E068FC0A for ; Thu, 17 Sep 2009 13:55:27 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8HDtRS9092118 for ; Thu, 17 Sep 2009 13:55:27 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8HDtRQg092116 for perforce@freebsd.org; Thu, 17 Sep 2009 13:55:27 GMT (envelope-from stas@freebsd.org) Date: Thu, 17 Sep 2009 13:55:27 GMT Message-Id: <200909171355.n8HDtRQg092116@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Cc: Subject: PERFORCE change 168610 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Sep 2009 13:55:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=168610 Change 168610 by stas@stas_deglitch on 2009/09/17 13:55:08 - Drop some gratuitous whitespace changes. Affected files ... .. //depot/projects/valgrind/Makefile.tool.am#7 edit .. //depot/projects/valgrind/VEX/pub/libvex_guest_amd64.h#5 edit .. //depot/projects/valgrind/configure.in#13 edit Differences ... ==== //depot/projects/valgrind/Makefile.tool.am#7 (text+ko) ==== @@ -25,6 +25,7 @@ $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@) $(TOOL_LDADD_COMMON) endif + TOOL_LDFLAGS_COMMON_LINUX = -static \ -Wl,-defsym,valt_load_address=@VALT_LOAD_ADDRESS@ \ -nodefaultlibs -nostartfiles -u _start ==== //depot/projects/valgrind/VEX/pub/libvex_guest_amd64.h#5 (text+ko) ==== @@ -191,7 +191,6 @@ extern ULong LibVEX_GuestAMD64_get_rflags ( /*IN*/VexGuestAMD64State* vex_state ); - /* Set the carry flag in the given state to 'new_carry_flag', which should be zero or one. */ extern @@ -199,6 +198,7 @@ LibVEX_GuestAMD64_put_rflag_c ( ULong new_carry_flag, /*MOD*/VexGuestAMD64State* vex_state ); + #if 0 /* Convert a saved x87 FPU image (as created by fsave) and write it into the supplied VexGuestX86State structure. The non-FP parts of @@ -214,6 +214,15 @@ void LibVEX_GuestX86_get_x87 ( /*IN*/VexGuestX86State* vex_state, /*OUT*/UChar* x87_state ); + +/* Given a 32-bit word containing native x86 %eflags values, set the + eflag-related fields in the supplied VexGuestX86State accordingly. + All other fields are left unchanged. */ + +extern +void LibVEX_GuestX86_put_eflags ( UInt eflags_native, + /*OUT*/VexGuestX86State* vex_state ); + #endif /* 0 */ #endif /* ndef __LIBVEX_PUB_GUEST_AMD64_H */ ==== //depot/projects/valgrind/configure.in#13 (text+ko) ==== @@ -73,6 +73,7 @@ AC_SUBST(ASFLAGS) ]) + # Check if 'diff' supports -u (universal diffs) and use it if possible. AC_MSG_CHECKING([for diff -u]) @@ -91,6 +92,7 @@ fi rm $tmpfile + # We don't want gcc < 3.0 AC_MSG_CHECKING([for a supported version of gcc]) From owner-p4-projects@FreeBSD.ORG Thu Sep 17 13:57:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 931E3106566C; Thu, 17 Sep 2009 13:57: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 5692410656AE for ; Thu, 17 Sep 2009 13:57:30 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2B6AC8FC1D for ; Thu, 17 Sep 2009 13:57:30 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8HDvUDI092244 for ; Thu, 17 Sep 2009 13:57:30 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8HDvU9Q092242 for perforce@freebsd.org; Thu, 17 Sep 2009 13:57:30 GMT (envelope-from stas@freebsd.org) Date: Thu, 17 Sep 2009 13:57:30 GMT Message-Id: <200909171357.n8HDvU9Q092242@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Cc: Subject: PERFORCE change 168611 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Sep 2009 13:57:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=168611 Change 168611 by stas@stas_deglitch on 2009/09/17 13:56:55 - Remove outdated code and comments. Affected files ... .. //depot/projects/valgrind/autogen.sh#10 edit Differences ... ==== //depot/projects/valgrind/autogen.sh#10 (text+kox) ==== @@ -11,12 +11,7 @@ fi } -# tested with automake 1.9 and autoconf 2.59 and 2.61, *with* -# autoconf-wrapper installed. Otherwise use explicit filenames. run aclocal run autoheader run automake -c -a run autoconf - -# hack for not running from svn. -#echo '"export"' > VEX/priv/main/vex_svnversion.h From owner-p4-projects@FreeBSD.ORG Thu Sep 17 13:58:31 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE6C41065670; Thu, 17 Sep 2009 13:58:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 72CB4106566B for ; Thu, 17 Sep 2009 13:58:31 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6076B8FC17 for ; Thu, 17 Sep 2009 13:58:31 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8HDwV3W092305 for ; Thu, 17 Sep 2009 13:58:31 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8HDwVxc092303 for perforce@freebsd.org; Thu, 17 Sep 2009 13:58:31 GMT (envelope-from stas@freebsd.org) Date: Thu, 17 Sep 2009 13:58:31 GMT Message-Id: <200909171358.n8HDwVxc092303@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Cc: Subject: PERFORCE change 168612 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Sep 2009 13:58:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=168612 Change 168612 by stas@stas_deglitch on 2009/09/17 13:58:26 - Remove outdated instructions. Affected files ... .. //depot/projects/valgrind/README_FREEBSD#5 edit Differences ... ==== //depot/projects/valgrind/README_FREEBSD#5 (text+ko) ==== @@ -1,17 +1,9 @@ -Build notes: -The wretched thing uses sed expressions that confuse ours. You have to -install ports/gsed. However, that confuses autoconf/automake etc. -autogen.sh adds a /usr/bin prefix before calling those. - -So, install ports for gsed, autoconf, automake and gmake. +So, install ports for autoconf, automake and gmake. $ sh autogen.sh $ ./configure --prefix=/where/ever $ gmake $ gmake install -Current status: -Thu Oct 23 13:55:53 PDT 2008: crashes at client startup. - Sun Aug 19 20:26:48 UTC 2007 PS_STRINGS Valgrind barfs all over the place on setproctitle. From owner-p4-projects@FreeBSD.ORG Thu Sep 17 14:03:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BDC410656A7; Thu, 17 Sep 2009 14:03: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 5066B10656A4 for ; Thu, 17 Sep 2009 14:03:37 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 09A868FC1B for ; Thu, 17 Sep 2009 14:03:37 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8HE3aaE093759 for ; Thu, 17 Sep 2009 14:03:36 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8HE3awf093757 for perforce@freebsd.org; Thu, 17 Sep 2009 14:03:36 GMT (envelope-from stas@freebsd.org) Date: Thu, 17 Sep 2009 14:03:36 GMT Message-Id: <200909171403.n8HE3awf093757@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Cc: Subject: PERFORCE change 168613 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Sep 2009 14:03:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=168613 Change 168613 by stas@stas_deglitch on 2009/09/17 14:03:23 - Remove freebsd-specific debug printf (not needed anymore). Affected files ... .. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-common.c#9 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-common.c#9 (text+ko) ==== @@ -378,7 +378,6 @@ if (bp >= eb || *kf->kf_path == '\0') return False; VG_(strncpy)( buf, kf->kf_path, nbuf ); - VG_(debugLog)(0, "aspacem", "Valgrind: found %s for %d\n", kf->kf_path, fd); return True; #elif defined(VGO_aix5) I_die_here; /* maybe just return False? */ From owner-p4-projects@FreeBSD.ORG Thu Sep 17 14:09:44 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5454B1065676; Thu, 17 Sep 2009 14:09:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 18D2D106566B for ; Thu, 17 Sep 2009 14:09:44 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E178B8FC16 for ; Thu, 17 Sep 2009 14:09:43 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8HE9hSa094213 for ; Thu, 17 Sep 2009 14:09:43 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8HE9hb4094211 for perforce@freebsd.org; Thu, 17 Sep 2009 14:09:43 GMT (envelope-from stas@freebsd.org) Date: Thu, 17 Sep 2009 14:09:43 GMT Message-Id: <200909171409.n8HE9hb4094211@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Cc: Subject: PERFORCE change 168615 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Sep 2009 14:09:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=168615 Change 168615 by stas@stas_deglitch on 2009/09/17 14:08:50 - Drop outstanding libc-4x.support reference. Affected files ... .. //depot/projects/valgrind/Makefile.am#13 edit Differences ... ==== //depot/projects/valgrind/Makefile.am#13 (text+ko) ==== @@ -56,7 +56,6 @@ glibc-2.2-LinuxThreads-helgrind.supp \ glibc-2.X-drd.supp \ exp-ptrcheck.supp \ - libc-4x.supp \ darwin9.supp \ freebsd.supp DEFAULT_SUPP_FILES = @DEFAULT_SUPP@ From owner-p4-projects@FreeBSD.ORG Thu Sep 17 14:41:19 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1470E10656AC; Thu, 17 Sep 2009 14:41:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AC51E1065697 for ; Thu, 17 Sep 2009 14:41:18 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9A7118FC1E for ; Thu, 17 Sep 2009 14:41:18 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8HEfIYQ096667 for ; Thu, 17 Sep 2009 14:41:18 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8HEfIBY096665 for perforce@freebsd.org; Thu, 17 Sep 2009 14:41:18 GMT (envelope-from stas@freebsd.org) Date: Thu, 17 Sep 2009 14:41:18 GMT Message-Id: <200909171441.n8HEfIBY096665@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Cc: Subject: PERFORCE change 168617 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Sep 2009 14:41:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=168617 Change 168617 by stas@stas_deglitch on 2009/09/17 14:41:13 - Do not check for freebsd version. Affected files ... .. //depot/projects/valgrind/configure.in#14 edit Differences ... ==== //depot/projects/valgrind/configure.in#14 (text+ko) ==== @@ -813,16 +813,6 @@ ;; esac ;; - freebsd) -AC_MSG_CHECKING([the libc version]) -libc="4x" -case "${libc}" in - 4x) - AC_MSG_RESULT(freebsd-4.x family) - AC_DEFINE([LIBC_4X], 1, [Define to 1 if you're using FreeBSD-4.x libc]) - DEFAULT_SUPP="libc-4x.supp ${DEFAULT_SUPP}" - ;; -esac esac AC_SUBST(GLIBC_VERSION) From owner-p4-projects@FreeBSD.ORG Thu Sep 17 14:52:31 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6744310656A5; Thu, 17 Sep 2009 14:52:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 24E5F1065696 for ; Thu, 17 Sep 2009 14:52:31 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ED4678FC13 for ; Thu, 17 Sep 2009 14:52:30 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8HEqU8t097398 for ; Thu, 17 Sep 2009 14:52:30 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8HEqUXP097396 for perforce@freebsd.org; Thu, 17 Sep 2009 14:52:30 GMT (envelope-from stas@freebsd.org) Date: Thu, 17 Sep 2009 14:52:30 GMT Message-Id: <200909171452.n8HEqUXP097396@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Cc: Subject: PERFORCE change 168618 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Sep 2009 14:52:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=168618 Change 168618 by stas@stas_deglitch on 2009/09/17 14:52:09 - Drop gratitous whitespace change. Affected files ... .. //depot/projects/valgrind/Makefile.am#14 edit Differences ... ==== //depot/projects/valgrind/Makefile.am#14 (text+ko) ==== @@ -114,3 +114,4 @@ clean-local: rm -rf $(inplacedir) + From owner-p4-projects@FreeBSD.ORG Thu Sep 17 14:57:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 280D21065676; Thu, 17 Sep 2009 14:57: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 E0889106566C for ; Thu, 17 Sep 2009 14:57:36 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B555D8FC1A for ; Thu, 17 Sep 2009 14:57:36 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8HEvadx097806 for ; Thu, 17 Sep 2009 14:57:36 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8HEvakd097804 for perforce@freebsd.org; Thu, 17 Sep 2009 14:57:36 GMT (envelope-from stas@freebsd.org) Date: Thu, 17 Sep 2009 14:57:36 GMT Message-Id: <200909171457.n8HEvakd097804@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Cc: Subject: PERFORCE change 168620 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Sep 2009 14:57:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=168620 Change 168620 by stas@stas_deglitch on 2009/09/17 14:57:24 - Drop another no-op change. Affected files ... .. //depot/projects/valgrind/none/Makefile.am#5 edit Differences ... ==== //depot/projects/valgrind/none/Makefile.am#5 (text+ko) ==== @@ -38,3 +38,4 @@ $(TOOL_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) endif + From owner-p4-projects@FreeBSD.ORG Thu Sep 17 14:59:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 790431065676; Thu, 17 Sep 2009 14:59: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 3D35B106566B for ; Thu, 17 Sep 2009 14:59:39 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1207C8FC19 for ; Thu, 17 Sep 2009 14:59:39 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8HExcq5097941 for ; Thu, 17 Sep 2009 14:59:38 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8HExcV7097939 for perforce@freebsd.org; Thu, 17 Sep 2009 14:59:38 GMT (envelope-from stas@freebsd.org) Date: Thu, 17 Sep 2009 14:59:38 GMT Message-Id: <200909171459.n8HExcV7097939@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Cc: Subject: PERFORCE change 168621 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Sep 2009 14:59:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=168621 Change 168621 by stas@stas_deglitch on 2009/09/17 14:58:38 - We don't use launcher-linux, so no point in changing it. Affected files ... .. //depot/projects/valgrind/coregrind/launcher-linux.c#5 edit Differences ... ==== //depot/projects/valgrind/coregrind/launcher-linux.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ #include #include #include -/* #include */ +#include #include #include "pub_core_debuglog.h" From owner-p4-projects@FreeBSD.ORG Thu Sep 17 16:30:18 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A6B031065698; Thu, 17 Sep 2009 16:30: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 6AFD61065694 for ; Thu, 17 Sep 2009 16:30:18 +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 5A6C18FC08 for ; Thu, 17 Sep 2009 16:30:18 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8HGUIbj007038 for ; Thu, 17 Sep 2009 16:30:18 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8HGUIAt007036 for perforce@freebsd.org; Thu, 17 Sep 2009 16:30:18 GMT (envelope-from gabor@freebsd.org) Date: Thu, 17 Sep 2009 16:30:18 GMT Message-Id: <200909171630.n8HGUIAt007036@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 168625 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Sep 2009 16:30:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=168625 Change 168625 by gabor@gabor_aspire on 2009/09/17 16:29:24 - Fix binary checking by eliminating an early free() Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/file.c#47 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#86 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/file.c#47 (text+ko) ==== @@ -243,7 +243,6 @@ BZ2_bzclose(f->bzf); break; } - free(f); /* Reset read buffer for the file we are closing */ binbufptr = NULL; ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#86 (text+ko) ==== @@ -196,6 +196,7 @@ /* Return if we need to skip a binary file */ if (f->binary && binbehave == BINFILE_SKIP) { grep_close(f); + free(f); return (0); } /* Process the file line-by-line */ @@ -229,6 +230,7 @@ binbehave == BINFILE_BIN && f->binary && !qflag) printf(getstr(9), fn); + free(f); return (c); } From owner-p4-projects@FreeBSD.ORG Thu Sep 17 16:31:20 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02238106568F; Thu, 17 Sep 2009 16:31:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BB03A106568B for ; Thu, 17 Sep 2009 16:31:19 +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 90E0B8FC08 for ; Thu, 17 Sep 2009 16:31:19 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8HGVJu3007103 for ; Thu, 17 Sep 2009 16:31:19 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8HGVJFl007101 for perforce@freebsd.org; Thu, 17 Sep 2009 16:31:19 GMT (envelope-from gabor@freebsd.org) Date: Thu, 17 Sep 2009 16:31:19 GMT Message-Id: <200909171631.n8HGVJFl007101@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 168626 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Sep 2009 16:31:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=168626 Change 168626 by gabor@gabor_aspire on 2009/09/17 16:30:39 - Fix typo in a comment Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/file.c#48 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/file.c#48 (text+ko) ==== @@ -52,7 +52,7 @@ #define MAXBUFSIZ (16 * 1024) #define PREREAD_M 0.2 -/* Some global variable for the buffering and reading. */ +/* Some global variables for the buffering and reading. */ static char *lnbuf; static size_t lnbuflen; static unsigned char *binbuf; From owner-p4-projects@FreeBSD.ORG Thu Sep 17 16:33:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51FBC1065679; Thu, 17 Sep 2009 16:33: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 16558106566B for ; Thu, 17 Sep 2009 16:33:22 +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 E02218FC17 for ; Thu, 17 Sep 2009 16:33:21 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8HGXL24007261 for ; Thu, 17 Sep 2009 16:33:21 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8HGXLDJ007259 for perforce@freebsd.org; Thu, 17 Sep 2009 16:33:21 GMT (envelope-from gabor@freebsd.org) Date: Thu, 17 Sep 2009 16:33:21 GMT Message-Id: <200909171633.n8HGXLDJ007259@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 168627 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Sep 2009 16:33:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=168627 Change 168627 by gabor@gabor_aspire on 2009/09/17 16:32:27 - Fix typo in manual page Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.1#14 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.1#14 (text+ko) ==== @@ -299,7 +299,7 @@ .Fl R is specified, all symbolic links are followed. The default is not to follow symbolic links. -.It Fl s , Fl Fl no-messaes +.It Fl s , Fl Fl no-messages Silent mode. Nonexistent and unreadable files are ignored (i.e. their error messages are suppressed). From owner-p4-projects@FreeBSD.ORG Thu Sep 17 18:50:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F198C106568D; Thu, 17 Sep 2009 18:50: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 B636310656A4 for ; Thu, 17 Sep 2009 18:50:52 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8C7BE8FC17 for ; Thu, 17 Sep 2009 18:50:52 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8HIoqdi029471 for ; Thu, 17 Sep 2009 18:50:52 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8HIoqeV029469 for perforce@freebsd.org; Thu, 17 Sep 2009 18:50:52 GMT (envelope-from jkim@freebsd.org) Date: Thu, 17 Sep 2009 18:50:52 GMT Message-Id: <200909171850.n8HIoqeV029469@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 168632 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Sep 2009 18:50:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=168632 Change 168632 by jkim@jkim_hammer on 2009/09/17 18:50:49 Add new fcntl(2) commands. Tested on 7.2 and -CURRENT. Affected files ... .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#40 edit .. //depot/projects/valgrind/include/vki/vki-freebsd.h#17 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#40 (text+ko) ==== @@ -3064,19 +3064,35 @@ case VKI_F_SETFD: case VKI_F_SETFL: case VKI_F_SETOWN: + case VKI_F_DUP2FD: PRINT("sys_fcntl[ARG3=='arg'] ( %ld, %ld, %ld )", ARG1,ARG2,ARG3); PRE_REG_READ3(long, "fcntl", unsigned int, fd, unsigned int, cmd, unsigned long, arg); break; + // These ones use ARG3 as "lock" - obsolete. + case VKI_F_OSETLKW: + *flags |= SfMayBlock; + /* FALLTHROUGH */ + case VKI_F_OGETLK: + case VKI_F_OSETLK: + PRINT("sys_fcntl[ARG3=='lock'] ( %ld, %ld, %#lx )", ARG1,ARG2,ARG3); + PRE_REG_READ3(long, "fcntl", + unsigned int, fd, unsigned int, cmd, + struct oflock *, lock); + break; + // These ones use ARG3 as "lock". + case VKI_F_SETLKW: + *flags |= SfMayBlock; + /* FALLTHROUGH */ case VKI_F_GETLK: case VKI_F_SETLK: - case VKI_F_SETLKW: + case VKI_F_SETLK_REMOTE: PRINT("sys_fcntl[ARG3=='lock'] ( %ld, %ld, %#lx )", ARG1,ARG2,ARG3); PRE_REG_READ3(long, "fcntl", unsigned int, fd, unsigned int, cmd, - struct flock64 *, lock); + struct flock *, lock); break; default: @@ -3084,8 +3100,6 @@ I_die_here; break; } - if (ARG2 == VKI_F_SETLKW) - *flags |= SfMayBlock; } POST(sys_fcntl) ==== //depot/projects/valgrind/include/vki/vki-freebsd.h#17 (text+ko) ==== @@ -1424,9 +1424,14 @@ #define VKI_F_SETFL 4 /* set file->f_flags */ #define VKI_F_SETOWN 5 /* for sockets. */ #define VKI_F_GETOWN 6 /* for sockets. */ -#define VKI_F_GETLK 7 -#define VKI_F_SETLK 8 -#define VKI_F_SETLKW 9 +#define VKI_F_OGETLK 7 /* get record locking information */ +#define VKI_F_OSETLK 8 /* set record locking information */ +#define VKI_F_OSETLKW 9 /* F_SETLK; wait if blocked */ +#define VKI_F_DUP2FD 10 /* duplicate file descriptor to arg */ +#define VKI_F_GETLK 11 /* get record locking information */ +#define VKI_F_SETLK 12 /* set record locking information */ +#define VKI_F_SETLKW 13 /* F_SETLK; wait if blocked */ +#define VKI_F_SETLK_REMOTE 14 /* debugging support for remote locks */ /* for F_[GET|SET]FL */ #define VKI_FD_CLOEXEC 1 /* actually anything with low bit set goes */ From owner-p4-projects@FreeBSD.ORG Thu Sep 17 19:27:33 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB5051065693; Thu, 17 Sep 2009 19:27: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 9F1F0106568B for ; Thu, 17 Sep 2009 19:27:32 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8F0FF8FC23 for ; Thu, 17 Sep 2009 19:27:32 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8HJRWf7033232 for ; Thu, 17 Sep 2009 19:27:32 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8HJRWhn033230 for perforce@freebsd.org; Thu, 17 Sep 2009 19:27:32 GMT (envelope-from jkim@freebsd.org) Date: Thu, 17 Sep 2009 19:27:32 GMT Message-Id: <200909171927.n8HJRWhn033230@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 168633 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Sep 2009 19:27:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=168633 Change 168633 by jkim@jkim_hammer on 2009/09/17 19:27:10 Improve syscall trace for fcntl(2) F_DUP2FD command. Affected files ... .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#41 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#41 (text+ko) ==== @@ -3064,7 +3064,6 @@ case VKI_F_SETFD: case VKI_F_SETFL: case VKI_F_SETOWN: - case VKI_F_DUP2FD: PRINT("sys_fcntl[ARG3=='arg'] ( %ld, %ld, %ld )", ARG1,ARG2,ARG3); PRE_REG_READ3(long, "fcntl", unsigned int, fd, unsigned int, cmd, unsigned long, arg); @@ -3082,6 +3081,15 @@ struct oflock *, lock); break; + // This one uses ARG3 as "oldd" and ARG4 as "newd". + case VKI_F_DUP2FD: + PRINT("sys_fcntl[ARG3=='oldd', ARG4=='newd'] ( %ld, %ld, %ld, %ld )", + ARG1,ARG2,ARG3,ARG4); + PRE_REG_READ4(long, "fcntl", + unsigned int, fd, unsigned int, cmd, + unsigned long, oldd, unsigned long, newd); + break; + // These ones use ARG3 as "lock". case VKI_F_SETLKW: *flags |= SfMayBlock; From owner-p4-projects@FreeBSD.ORG Thu Sep 17 21:00:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 30CEE106568F; Thu, 17 Sep 2009 21:00: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 C894E1065672 for ; Thu, 17 Sep 2009 21:00: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 B71118FC21 for ; Thu, 17 Sep 2009 21:00:53 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8HL0rAF051141 for ; Thu, 17 Sep 2009 21:00:53 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8HL0raT051139 for perforce@freebsd.org; Thu, 17 Sep 2009 21:00:53 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 17 Sep 2009 21:00:53 GMT Message-Id: <200909172100.n8HL0raT051139@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 168636 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Sep 2009 21:00:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=168636 Change 168636 by rene@rene_self on 2009/09/17 20:59:59 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#33 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#29 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#43 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#24 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#29 integrate .. //depot/projects/docproj_nl/share/pgpkeys/johans.key#2 integrate .. //depot/projects/docproj_nl/www/en/developers.sgml#22 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#50 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#33 (text+ko) ==== @@ -1,4 +1,4 @@ - + + @@ -811,15 +811,10 @@ Check the "Files" section in your /etc/X11/xorg.conf file. The following - lines must be added before any other + line must be added before any other FontPath entries: - FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/misc" -FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/75dpi" -FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/100dpi" - - If you use a high resolution video mode, swap the 75 dpi - and 100 dpi lines. + FontPath "/usr/local/lib/X11/fonts/cyrillic" See ports for more cyrillic fonts. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#43 (text+ko) ==== @@ -1,7 +1,7 @@ + 702106 + September 14, 2009 + 7.2-STABLE after MFC of the x86 PAT + enhancements and addition of d_mmap_single() and + the scatter/gather list VM object type. + + + 800000 October 11, 2007 8.0-CURRENT. Separating wide and single byte ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#24 (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.488 2009/08/10 16:50:10 fluffy Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.489 2009/09/16 14:58:25 wen Exp $ --> aaron@FreeBSD.org"> @@ -1152,6 +1152,8 @@ weongyo@FreeBSD.org"> +wen@FreeBSD.org"> + wes@FreeBSD.org"> wxs@FreeBSD.org"> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#29 (text+ko) ==== @@ -1,7 +1,7 @@ + uid Johan van Selst -uid Johan van Selst -uid Johan van Selst -uid Johan van Selst uid Johan van Selst -sub 2048g/EF1C75DD 2001-03-03 -sub 1024R/355F8408 2005-11-05 -sub 1024R/9AF7EE88 2005-11-05 +uid Johan van Selst (GSWoT:NL50) +sub 2048R/B002E38C 2009-09-01 +sub 2048R/1EBCAECB 2009-09-01 +sub 2048R/639A1446 2009-09-01 +sub 3072D/6F2708F4 2009-09-01 +sub 4096g/D6F89E83 2009-09-01 ]]> >> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 17 21:06:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF1431065694; Thu, 17 Sep 2009 21:05: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 B3A44106568F for ; Thu, 17 Sep 2009 21:05:59 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8A1358FC0C for ; Thu, 17 Sep 2009 21:05:59 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8HL5xSk052573 for ; Thu, 17 Sep 2009 21:05:59 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8HL5xW9052571 for perforce@freebsd.org; Thu, 17 Sep 2009 21:05:59 GMT (envelope-from jkim@freebsd.org) Date: Thu, 17 Sep 2009 21:05:59 GMT Message-Id: <200909172105.n8HL5xW9052571@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 168638 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Sep 2009 21:06:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=168638 Change 168638 by jkim@jkim_hammer on 2009/09/17 21:05:30 Implement kenv(2) support. Affected files ... .. //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#20 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#42 edit .. //depot/projects/valgrind/include/vki/vki-freebsd.h#18 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#20 (text+ko) ==== @@ -257,6 +257,7 @@ DECL_TEMPLATE(freebsd, sys_symlinkat); DECL_TEMPLATE(freebsd, sys_unlinkat); DECL_TEMPLATE(freebsd, sys_posix_openpt); +DECL_TEMPLATE(freebsd, sys_kenv); DECL_TEMPLATE(freebsd, sys_uuidgen); DECL_TEMPLATE(freebsd, sys_thr_new); DECL_TEMPLATE(freebsd, sys_thr_kill); ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#42 (text+ko) ==== @@ -2548,6 +2548,39 @@ PRE_REG_READ0(long, "lkmnosys8"); } +PRE(sys_kenv) +{ + PRINT("sys_kenv ( %ld, %#lx, %#lx, %ld )", ARG1,ARG2,ARG3,ARG4); + PRE_REG_READ4(long, "kenv", + int, action, const char *, name, char *, value, int, len); + switch (ARG1) { + case VKI_KENV_GET: + case VKI_KENV_SET: + case VKI_KENV_UNSET: + PRE_MEM_RASCIIZ("kenv(name)", ARG2); + /* FALLTHROUGH */ + case VKI_KENV_DUMP: + break; + default: + I_die_here; + } +} + +POST(sys_kenv) +{ + if (SUCCESS) { + switch (ARG1) { + case VKI_KENV_GET: + POST_MEM_WRITE(ARG3, ARG4); + break; + case VKI_KENV_DUMP: + if (ARG3 != (Addr)NULL) + POST_MEM_WRITE(ARG3, ARG4); + break; + } + } +} + PRE(sys_uuidgen) { PRINT("sys_uuidgen ( %#lx, %ld )", ARG1,ARG2); @@ -3667,7 +3700,7 @@ // __mac_set_fd 388 // __mac_set_file 389 - // kenv 390 + BSDXY(__NR_kenv, sys_kenv), // 390 // lchflags 391 BSDXY(__NR_uuidgen, sys_uuidgen), // 392 ==== //depot/projects/valgrind/include/vki/vki-freebsd.h#18 (text+ko) ==== @@ -1944,6 +1944,14 @@ #endif //---------------------------------------------------------------------- +// From sys/kenv.h +//---------------------------------------------------------------------- +#define VKI_KENV_GET 0 +#define VKI_KENV_SET 1 +#define VKI_KENV_UNSET 2 +#define VKI_KENV_DUMP 3 + +//---------------------------------------------------------------------- // From sys/sysctl.h (and related) //---------------------------------------------------------------------- From owner-p4-projects@FreeBSD.ORG Thu Sep 17 21:40:38 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AF401065696; Thu, 17 Sep 2009 21:40: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 C3A4F106568D for ; Thu, 17 Sep 2009 21:40:37 +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 B39F38FC15 for ; Thu, 17 Sep 2009 21:40:37 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8HLeb7G055650 for ; Thu, 17 Sep 2009 21:40:37 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8HLebS3055648 for perforce@freebsd.org; Thu, 17 Sep 2009 21:40:37 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 17 Sep 2009 21:40:37 GMT Message-Id: <200909172140.n8HLebS3055648@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 168641 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Sep 2009 21:40:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=168641 Change 168641 by rene@rene_self on 2009/09/17 21:40:27 MFen handbook/l10n 1.128 -> 1.129 Remove old $FreeBSDnl$ line Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/l10n/chapter.sgml#10 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/l10n/chapter.sgml#10 (text+ko) ==== @@ -2,10 +2,9 @@ The FreeBSD Dutch Documentation Project $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/l10n/chapter.sgml,v 1.12 2009/02/16 21:07:37 rene Exp $ - $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/l10n/chapter.sgml,v 1.34 2006/08/12 22:53:14 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/l10n/chapter.sgml - %SRCID% 1.128 + %SRCID% 1.129 --> @@ -927,20 +926,15 @@ Controleer de "Files" sectie in /etc/X11/xorg.conf bestand. Zorg - dat de volgende regels + dat de volgende regel vóór andere FontPath regels staan: - FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/misc" -FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/75dpi" -FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/100dpi" - - Er er een hoge resolutie videomodus wordt gebruikt - dan kunnen de 75dpi en 100dpi regels gewisseld - worden. - - Zie de Ports Collectie voor meer cyrillic - fonts. + FontPath "/usr/local/lib/X11/fonts/cyrillic" + + Zie de Ports Collectie voor meer cyrillic + fonts. + From owner-p4-projects@FreeBSD.ORG Thu Sep 17 22:59:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 248151065672; Thu, 17 Sep 2009 22:59: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 DD5581065679 for ; Thu, 17 Sep 2009 22:59: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 CCC808FC08 for ; Thu, 17 Sep 2009 22:59:03 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8HMx3fD062295 for ; Thu, 17 Sep 2009 22:59:03 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8HMx3OZ062293 for perforce@freebsd.org; Thu, 17 Sep 2009 22:59:03 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 17 Sep 2009 22:59:03 GMT Message-Id: <200909172259.n8HMx3OZ062293@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 168644 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Sep 2009 22:59:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=168644 Change 168644 by hselasky@hselasky_laptop001 on 2009/09/17 22:58:15 USB serial: - add new ID to UFTDI driver. - patch from Maks Verver PR: usb/138915 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#79 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#14 (text+ko) ==== @@ -247,6 +247,7 @@ {USB_VPI(USB_VENDOR_INTREPIDCS, USB_PRODUCT_INTREPIDCS_VALUECAN, UFTDI_TYPE_8U232AM)}, {USB_VPI(USB_VENDOR_INTREPIDCS, USB_PRODUCT_INTREPIDCS_NEOVI, UFTDI_TYPE_8U232AM)}, {USB_VPI(USB_VENDOR_BBELECTRONICS, USB_PRODUCT_BBELECTRONICS_USOTL4, UFTDI_TYPE_8U232AM)}, + {USB_VPI(USB_VENDOR_MARVELL, USB_PRODUCT_MARVELL_SHEEVAPLUG, UFTDI_TYPE_8U232AM)}, {USB_VPI(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_PCOPRS1, UFTDI_TYPE_8U232AM)}, }; ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#79 (text+ko) ==== @@ -659,6 +659,7 @@ vendor INTEL 0x8086 Intel vendor SITECOM2 0x9016 Sitecom vendor MOSCHIP 0x9710 MosChip Semiconductor +vendor MARVELL 0x9e88 Marvell Technology Group Ltd. vendor 3COM3 0xa727 3Com vendor HP2 0xf003 Hewlett Packard vendor USRP 0xfffe GNU Radio USRP @@ -1694,6 +1695,9 @@ /* Macally products */ product MACALLY MOUSE1 0x0101 mouse +/* Marvell Technology Group, Ltd. products */ +product MARVELL SHEEVAPLUG 0x9e8f SheevaPlug serial interface + /* MCT Corp. */ product MCT HUB0100 0x0100 Hub product MCT DU_H3SP_USB232 0x0200 D-Link DU-H3SP USB BAY Hub From owner-p4-projects@FreeBSD.ORG Fri Sep 18 03:28:59 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 041D51065695; Fri, 18 Sep 2009 03:28: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 91A271065679 for ; Fri, 18 Sep 2009 03:28:58 +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 7F4AB8FC25 for ; Fri, 18 Sep 2009 03:28:58 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8I3SwNO096828 for ; Fri, 18 Sep 2009 03:28:58 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8I3SwNa096826 for perforce@freebsd.org; Fri, 18 Sep 2009 03:28:58 GMT (envelope-from andrew@freebsd.org) Date: Fri, 18 Sep 2009 03:28:58 GMT Message-Id: <200909180328.n8I3SwNa096826@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 168646 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Sep 2009 03:28:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=168646 Change 168646 by andrew@andrew_bender on 2009/09/18 03:28:41 Update the S3C2xx0 code to be closer to my devel tree. Updated include: * Remove the NAND driver as it will be replaced with a more generic version * Map the OHCI registers. There is a forthcoming OHCI driver that will use these * Update the clock code to be closer to the NetBSD version. It now works and keeps the correct time to under 1s/hour * Update the register headers to include more s3c2440 registers Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/files.s3c2xx0#8 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410reg.h#9 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2440reg.h#3 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0.c#13 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_clk.c#5 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_machdep.c#6 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_nand.c#5 delete .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0reg.h#6 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0var.h#10 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/files.s3c2xx0#8 (text+ko) ==== @@ -6,7 +6,7 @@ arm/s3c2xx0/s3c2xx0_space.c standard arm/s3c2xx0/s3c24x0_clk.c standard arm/s3c2xx0/s3c24x0_mci.c optional mmc -arm/s3c2xx0/s3c24x0_nand.c optional nand arm/s3c2xx0/uart_bus_s3c2410.c optional uart arm/s3c2xx0/uart_cpu_s3c2410.c optional uart arm/s3c2xx0/uart_dev_s3c2410.c optional uart + ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410reg.h#9 (text+ko) ==== @@ -82,6 +82,7 @@ #define DCON_STOP (1<<14) /* Force the transfer to stop */ #define S3C2410_SDI_DAT 0x3c #define S3C2410_SDI_IMSK 0x40 /* Interrupt mask */ +#define S3C2410_SDI_IMASK_ALL 0x3ffdf /* ADC */ #define S3C2410_ADC_SIZE 0x14 ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2440reg.h#3 (text+ko) ==== @@ -83,6 +83,7 @@ #define S3C2410_SDI_SIZE 0x44 #define DCON_START (1<<14) /* Start the data transfer */ #define S3C2440_SDI_IMSK 0x3c /* Interrupt mask */ +#define S3C2440_SDI_IMASK_ALL 0x3C7C0 #define S3C2440_SDI_DAT 0x40 /* ADC */ ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0.c#13 (text+ko) ==== @@ -336,6 +336,10 @@ S3C24X0_TIMER_SIZE, 0, &sc->sc_timer_ioh)) panic("cannot map TIMER"); + if (bus_space_map(iot, S3C24X0_USBHC_BASE, + S3C24X0_USBHC_SIZE, 0, &sc->sc_sx.sc_ohci_ioh)) + panic("cannot map USB Host"); + /* * Identify the CPU */ @@ -395,6 +399,12 @@ S3C24X0_UART_BASE(i + 1) - S3C24X0_UART_BASE(i)); } + /* USB */ + child = s3c24x0_add_child(dev, 0, "ohci", -1); + bus_set_resource(child, SYS_RES_IRQ, 0, S3C24X0_INT_USBH, 1); + bus_set_resource(child, SYS_RES_IOPORT, 0, S3C24X0_USBHC_BASE, + S3C24X0_USBHC_SIZE); + bus_generic_probe(dev); bus_generic_attach(dev); @@ -544,7 +554,7 @@ int -arm_get_next_irq(void) +arm_get_next_irq(int last __unused) { uint32_t intpnd; int irq, subirq; ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_clk.c#5 (text+ko) ==== @@ -78,6 +78,7 @@ s3c24x0_timer_attach(device_t dev) { timer_softc.dev = dev; + return (0); } @@ -96,18 +97,12 @@ DRIVER_MODULE(s3c24x0timer, s3c24x0, s3c24x0_timer_driver, s3c24x0_timer_devclass, 0, 0); -#ifndef STATHZ -#define STATHZ 64 -#endif - -#define hardintr (void *)hardclock -#define statintr (void *)statclock - #define TIMER_FREQUENCY(pclk) ((pclk)/16) /* divider=1/16 */ static unsigned int timer4_reload_value; static unsigned int timer4_prescaler; static unsigned int timer4_mseccount; +static volatile uint32_t s3c24x0_base; #define usec_to_counter(t) \ ((timer4_mseccount*(t))/1000) @@ -132,9 +127,22 @@ s3c24x0_timer_get_timecount(struct timecounter *tc) { struct s3c24x0_softc *sc = (struct s3c24x0_softc *)s3c2xx0_softc; + int value; + + value = bus_space_read_2(sc->sc_sx.sc_iot, sc->sc_timer_ioh, + TIMER_TCNTO(4)); + return (s3c24x0_base - value); +} - return (bus_space_read_4(sc->sc_sx.sc_iot, sc->sc_timer_ioh, - TIMER_TCON)); +static int +clock_intr(void *arg) +{ + struct trapframe *fp = arg; + + atomic_add_32(&s3c24x0_base, timer4_reload_value); + + hardclock(TRAPF_USERMODE(fp), TRAPF_PC(fp)); + return (FILTER_HANDLED); } void @@ -145,16 +153,13 @@ struct resource *irq; int rid = 0; void *ihl; - int prescaler, h; + int err, prescaler; int pclk = s3c2xx0_softc->sc_pclk; bus_space_tag_t iot = sc->sc_sx.sc_iot; bus_space_handle_t ioh = sc->sc_timer_ioh; uint32_t reg; device_t dev = timer_softc.dev; - stathz = STATHZ; - profhz = stathz; - #define time_constant(hz) (TIMER_FREQUENCY(pclk) /(hz)/ prescaler) #define calc_time_constant(hz) \ do { \ @@ -172,8 +177,7 @@ bus_space_write_4(iot, ioh, TIMER_TCON, 0); /* calc suitable prescaler value */ - h = MIN(hz,stathz); - calc_time_constant(h); + calc_time_constant(hz); timer4_prescaler = prescaler; timer4_reload_value = TIMER_FREQUENCY(pclk) / hz / prescaler; @@ -182,45 +186,42 @@ bus_space_write_4(iot, ioh, TIMER_TCNTB(4), ((prescaler - 1) << 16) | (timer4_reload_value - 1)); - printf("clock: hz=%d stathz = %d PCLK=%d prescaler=%d tc=%ld\n", - hz, stathz, pclk, prescaler, tc); + printf("clock: hz=%d PCLK=%d prescaler=%d tc=%ld\n", + hz, pclk, prescaler, tc); - bus_space_write_4(iot, ioh, TIMER_TCNTB(3), - ((prescaler - 1) << 16) | (time_constant(stathz) - 1)); - irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, S3C24X0_INT_TIMER4, S3C24X0_INT_TIMER4, 1, RF_ACTIVE); if (!irq) + panic("Unable to allocate the clock irq handler.\n"); + + err = bus_setup_intr(dev, irq, INTR_TYPE_CLK | INTR_FAST, + clock_intr, NULL, NULL, &ihl); + if (err != 0) panic("Unable to setup the clock irq handler.\n"); - else - bus_setup_intr(dev, irq, INTR_TYPE_CLK | INTR_FAST, - hardintr, NULL, NULL, &ihl); /* set prescaler1 */ reg = bus_space_read_4(iot, ioh, TIMER_TCFG0); bus_space_write_4(iot, ioh, TIMER_TCFG0, (reg & ~0xff00) | ((prescaler-1) << 8)); - /* divider 1/16 for ch #3 and #4 */ + /* divider 1/16 for ch #4 */ reg = bus_space_read_4(iot, ioh, TIMER_TCFG1); bus_space_write_4(iot, ioh, TIMER_TCFG1, - (reg & ~(TCFG1_MUX_MASK(3)|TCFG1_MUX_MASK(4))) | - (TCFG1_MUX_DIV16 << TCFG1_MUX_SHIFT(3)) | + (reg & ~(TCFG1_MUX_MASK(4))) | (TCFG1_MUX_DIV16 << TCFG1_MUX_SHIFT(4)) ); /* start timers */ reg = bus_space_read_4(iot, ioh, TIMER_TCON); - reg &= ~(TCON_MASK(3)|TCON_MASK(4)); + reg &= ~(TCON_MASK(4)); /* load the time constant */ - bus_space_write_4(iot, ioh, TIMER_TCON, reg | - TCON_MANUALUPDATE(3) | TCON_MANUALUPDATE(4)); + bus_space_write_4(iot, ioh, TIMER_TCON, reg | TCON_MANUALUPDATE(4)); /* set auto reload and start */ bus_space_write_4(iot, ioh, TIMER_TCON, reg | - TCON_AUTORELOAD(3) | TCON_START(3) | TCON_AUTORELOAD(4) | TCON_START(4) ); + s3c24x0_timer_timecounter.tc_frequency = TIMER_FREQUENCY(pclk) / timer4_prescaler; tc_init(&s3c24x0_timer_timecounter); } ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_machdep.c#6 (text+ko) ==== @@ -198,6 +198,13 @@ PTE_NOCACHE, }, { + _A(S3C24X0_USBHC_BASE), + _A(S3C24X0_USBHC_BASE), + _S(S3C24X0_USBHC_SIZE), + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, + { 0, 0, 0, ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0reg.h#6 (text+ko) ==== @@ -391,7 +391,7 @@ #define CCON_CMD_START (1<<8) #define CCON_CMDINDEX_MASK (0x7F) /* Command number index */ #define SDI_CSTA 0x10 -#define CSTA_RSPFAIL (1<<12) +#define CSTA_RSPCRCFAIL (1<<12) #define CSTA_CMDSENT (1<<11) #define CSTA_CMDTOUT (1<<10) #define CSTA_RSPFIN (1<<9) @@ -516,9 +516,16 @@ #define GPIO_PDDOWN 0x38 /* 2442 */ #define GPIO_PECON 0x40 +#define PECON_INPUT(x) (0<<((x)*2)) /* Pin is used for input */ +#define PECON_OUTPUT(x) (1<<((x)*2)) /* Pin is used for output */ +#define PECON_FUNC_A(x) (2<<((x)*2)) /* Pin is used for function 'A' */ +#define PECON_FUNC_B(x) (3<<((x)*2)) /* Pin is used for function 'B' */ +#define PECON_MASK(x) (3<<((x)*2)) #define GPIO_PEDAT 0x44 #define GPIO_PEUP 0x48 /* 2410 & 2440 */ #define GPIO_PEDOWN 0x48 /* 2442 */ +#define PEUD_ENABLE(x) (~(1<<(x))) /* Enable the pull Up/Down */ +#define PEUD_DISABLE(x) (1<<(x)) /* Disable the pull Up/Down */ #define GPIO_PFCON 0x50 #define GPIO_PFDAT 0x54 ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0var.h#10 (text+ko) ==== @@ -58,6 +58,7 @@ bus_space_handle_t sc_rtc_ioh; /* real time clock */ bus_space_handle_t sc_mci_ioh; /* MMC/SD */ bus_space_handle_t sc_iic_ioh; /* IIC */ + bus_space_handle_t sc_ohci_ioh; /* USB/OHCI */ bus_dma_tag_t sc_dmat; From owner-p4-projects@FreeBSD.ORG Fri Sep 18 03:32:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 170B21065672; Fri, 18 Sep 2009 03:32: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 C6D2C106566B for ; Fri, 18 Sep 2009 03:32:01 +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 B55C78FC16 for ; Fri, 18 Sep 2009 03:32:01 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8I3W1Fw097066 for ; Fri, 18 Sep 2009 03:32:01 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8I3W1sj097064 for perforce@freebsd.org; Fri, 18 Sep 2009 03:32:01 GMT (envelope-from andrew@freebsd.org) Date: Fri, 18 Sep 2009 03:32:01 GMT Message-Id: <200909180332.n8I3W1sj097064@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 168647 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Sep 2009 03:32:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=168647 Change 168647 by andrew@andrew_bender on 2009/09/18 03:31:50 Update the LN2410SBC conf file for style and add USB support Affected files ... .. //depot/projects/arm/src/sys/arm/conf/LN2410SBC#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/LN2410SBC#2 (text+ko) ==== @@ -27,17 +27,17 @@ makeoptions MODULES_OVERRIDE="" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -options HZ=100 -options DDB -options KDB +options HZ=100 +options DDB +options KDB options SCHED_4BSD #4BSD scheduler options INET #InterNETworking options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem options MD_ROOT #MD is a potential root device -options MD_ROOT_SIZE=4096 # 4MB ram disk -options ROOTDEVNAME=\"ufs:md0\" +options MD_ROOT_SIZE=4096 # 4MB ram disk +options ROOTDEVNAME=\"ufs:md0\" options PSEUDOFS #Pseudo-filesystem framework options KTRACE #ktrace(1) support @@ -47,15 +47,17 @@ options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions options MUTEX_NOINLINE -options RWLOCK_NOINLINE -options SX_NOINLINE +options RWLOCK_NOINLINE +options SX_NOINLINE options NO_FFS_SNAPSHOT options NO_SWAPPING device random device pty + device loop device ether + device uart # Debugging for use in -current @@ -66,3 +68,9 @@ device md +device usb +device ohci +device umass +device scbus # SCSI bus (required for da) +device da # Direct Access (disks) + From owner-p4-projects@FreeBSD.ORG Fri Sep 18 03:40:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 318961065753; Fri, 18 Sep 2009 03:40: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 E9F391065743 for ; Fri, 18 Sep 2009 03:40:10 +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 C079B8FC18 for ; Fri, 18 Sep 2009 03:40:10 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8I3eAIh097739 for ; Fri, 18 Sep 2009 03:40:10 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8I3eAB3097731 for perforce@freebsd.org; Fri, 18 Sep 2009 03:40:10 GMT (envelope-from andrew@freebsd.org) Date: Fri, 18 Sep 2009 03:40:10 GMT Message-Id: <200909180340.n8I3eAB3097731@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 168648 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Sep 2009 03:40:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=168648 Change 168648 by andrew@andrew_bender on 2009/09/18 03:39:12 Add an ohci driver tested on an s3c2410 Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/files.s3c2xx0#9 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/ohci_s3c24x0.c#1 add Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/files.s3c2xx0#9 (text+ko) ==== @@ -10,3 +10,6 @@ arm/s3c2xx0/uart_cpu_s3c2410.c optional uart arm/s3c2xx0/uart_dev_s3c2410.c optional uart +# TODO: Move to dev/usb/controller with the rest of USB when added to SVN +arm/s3c2xx0/ohci_s3c24x0.c optional ohci + From owner-p4-projects@FreeBSD.ORG Fri Sep 18 13:24:41 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A31C31065693; Fri, 18 Sep 2009 13:24:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 67296106566B for ; Fri, 18 Sep 2009 13:24:41 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 544538FC20 for ; Fri, 18 Sep 2009 13:24:41 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8IDOfXZ080197 for ; Fri, 18 Sep 2009 13:24:41 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8IDOeVL080195 for perforce@freebsd.org; Fri, 18 Sep 2009 13:24:40 GMT (envelope-from stas@freebsd.org) Date: Fri, 18 Sep 2009 13:24:40 GMT Message-Id: <200909181324.n8IDOeVL080195@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Cc: Subject: PERFORCE change 168658 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Sep 2009 13:24:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=168658 Change 168658 by stas@stas_deglitch on 2009/09/18 13:24:03 - Make tests build. Affected files ... .. //depot/projects/valgrind/drd/tests/Makefile.am#3 edit .. //depot/projects/valgrind/exp-ptrcheck/tests/Makefile.am#3 edit .. //depot/projects/valgrind/helgrind/tests/tc17_sembar.c#3 edit .. //depot/projects/valgrind/helgrind/tests/tc23_bogus_condwait.c#3 edit .. //depot/projects/valgrind/helgrind/tests/tc24_nonzero_sem.c#3 edit .. //depot/projects/valgrind/memcheck/tests/amd64/int3-amd64.c#3 edit .. //depot/projects/valgrind/memcheck/tests/str_tester.c#5 edit .. //depot/projects/valgrind/memcheck/tests/x86/Makefile.am#5 edit .. //depot/projects/valgrind/none/tests/Makefile.am#6 edit .. //depot/projects/valgrind/none/tests/amd64/bug156404-amd64.c#3 edit .. //depot/projects/valgrind/none/tests/faultstatus.c#4 edit .. //depot/projects/valgrind/none/tests/pth_atfork1.c#4 edit .. //depot/projects/valgrind/tests/arch_test.c#2 edit .. //depot/projects/valgrind/tests/malloc.h#2 edit .. //depot/projects/valgrind/tests/os_test.c#2 edit .. //depot/projects/valgrind/tests/sys_mman.h#2 edit Differences ... ==== //depot/projects/valgrind/drd/tests/Makefile.am#3 (text+ko) ==== @@ -273,8 +273,10 @@ if HAVE_BUILTIN_ATOMIC check_PROGRAMS += annotate_rwlock atomic_var circular_buffer +if !VGCONF_OS_IS_FREEBSD check_PROGRAMS += tsan_unittest endif +endif if HAVE_OPENMP check_PROGRAMS += omp_matinv omp_prime omp_printf ==== //depot/projects/valgrind/exp-ptrcheck/tests/Makefile.am#3 (text+ko) ==== @@ -72,9 +72,11 @@ # DDD: not sure if these ones should work on Darwin or not... if not, should # be moved into x86-linux/. if ! VGCONF_OS_IS_DARWIN +if ! VGCONF_OS_IS_FREEBSD check_PROGRAMS += \ ccc endif +endif AM_CFLAGS += $(AM_FLAG_M3264_PRI) @@ -105,12 +107,17 @@ preen_invars_LDADD = -ldl preen_invars_LDFLAGS = $(AM_FLAG_M3264_PRI) else +if VGCONF_OS_IS_FREEBSD + preen_invars_LDFLAGS = $(AM_FLAG_M3264_PRI) \ + -Wl,-rpath,$(top_builddir)/memcheck/tests +else preen_invars_LDADD = -ldl preen_invars_LDFLAGS = $(AM_FLAG_M3264_PRI) \ -Wl,-rpath,$(top_builddir)/memcheck/tests endif endif endif +endif preen_invars_so_so_SOURCES = preen_invars_so.c # For automake-1.7. preen_invars_so_so_CFLAGS = $(AM_CFLAGS) -fpic ==== //depot/projects/valgrind/helgrind/tests/tc17_sembar.c#3 (text+ko) ==== @@ -4,6 +4,9 @@ #include #include #include +#if defined(VGO_freebsd) +# include +#endif /* This is really a test of semaphore handling (sem_{init,destroy,post,wait}). Using semaphores a barrier function is created. Helgrind-3.3 (p.k.a Thrcheck) does understand @@ -222,7 +225,7 @@ { #if defined(VGO_linux) return sem_init(s, pshared, count); -#elif defined(VGO_darwin) +#elif defined(VGO_darwin) || defined(VGO_freebsd) char name[100]; sem_t** fakeptr = (sem_t**)s; assert(sizeof(sem_t) >= sizeof(sem_t*)); @@ -244,7 +247,7 @@ { #if defined(VGO_linux) return sem_destroy(s); -#elif defined(VGO_darwin) +#elif defined(VGO_darwin) || defined(VGO_freebsd) sem_t** fakeptr = (sem_t**)s; return sem_close(*fakeptr); #else @@ -256,7 +259,7 @@ { #if defined(VGO_linux) return sem_wait(s); -#elif defined(VGO_darwin) +#elif defined(VGO_darwin) || defined(VGO_freebsd) return sem_wait( *(sem_t**)s ); #else # error "Unsupported OS" @@ -267,7 +270,7 @@ { #if defined(VGO_linux) return sem_post(s); -#elif defined(VGO_darwin) +#elif defined(VGO_darwin) || defined(VGO_freebsd) return sem_post( *(sem_t**)s ); #else # error "Unsupported OS" ==== //depot/projects/valgrind/helgrind/tests/tc23_bogus_condwait.c#3 (text+ko) ==== @@ -6,6 +6,9 @@ #include #include #include +#if defined(VGO_freebsd) +#include +#endif pthread_mutex_t mx[4]; pthread_cond_t cv; pthread_rwlock_t rwl; @@ -98,7 +101,7 @@ { #if defined(VGO_linux) return sem_init(s, pshared, count); -#elif defined(VGO_darwin) +#elif defined(VGO_darwin) || defined(VGO_freebsd) char name[100]; sem_t** fakeptr = (sem_t**)s; assert(sizeof(sem_t) >= sizeof(sem_t*)); @@ -120,7 +123,7 @@ { #if defined(VGO_linux) return sem_destroy(s); -#elif defined(VGO_darwin) +#elif defined(VGO_darwin) || defined(VGO_freebsd) sem_t** fakeptr = (sem_t**)s; return sem_close(*fakeptr); #else @@ -132,7 +135,7 @@ { #if defined(VGO_linux) return sem_wait(s); -#elif defined(VGO_darwin) +#elif defined(VGO_darwin) || defined(VGO_freebsd) return sem_wait( *(sem_t**)s ); #else # error "Unsupported OS" @@ -143,7 +146,7 @@ { #if defined(VGO_linux) return sem_post(s); -#elif defined(VGO_darwin) +#elif defined(VGO_darwin) || defined(VGO_freebsd) return sem_post( *(sem_t**)s ); #else # error "Unsupported OS" ==== //depot/projects/valgrind/helgrind/tests/tc24_nonzero_sem.c#3 (text+ko) ==== @@ -7,6 +7,9 @@ #include #include #include +#if defined(VGO_freebsd) +# include +#endif #define N_THREADS 3 static int my_sem_init(sem_t*, char*, int, unsigned); static int my_sem_destroy(sem_t*); @@ -45,7 +48,7 @@ { #if defined(VGO_linux) return sem_init(s, pshared, count); -#elif defined(VGO_darwin) +#elif defined(VGO_darwin) || defined(VGO_freebsd) char name[100]; sem_t** fakeptr = (sem_t**)s; assert(sizeof(sem_t) >= sizeof(sem_t*)); @@ -67,7 +70,7 @@ { #if defined(VGO_linux) return sem_destroy(s); -#elif defined(VGO_darwin) +#elif defined(VGO_darwin) || defined(VGO_freebsd) sem_t** fakeptr = (sem_t**)s; return sem_close(*fakeptr); #else @@ -79,7 +82,7 @@ { #if defined(VGO_linux) return sem_wait(s); -#elif defined(VGO_darwin) +#elif defined(VGO_darwin) || defined(VGO_freebsd) return sem_wait( *(sem_t**)s ); #else # error "Unsupported OS" ==== //depot/projects/valgrind/memcheck/tests/amd64/int3-amd64.c#3 (text+ko) ==== @@ -8,12 +8,17 @@ static char* rip_at_sig = NULL; + static void int_handler(int signum, siginfo_t *si, void *uc_arg) { ucontext_t *uc = (ucontext_t *)uc_arg; /* Note that uc->uc_mcontext is an embedded struct, not a pointer */ mcontext_t *mc = &(uc->uc_mcontext); +#if defined(__FreeBSD__) + void *pc = (void*)mc->mc_rip; +#else void *pc = (void*)mc->gregs[REG_RIP]; +#endif printf("in int_handler, RIP is ...\n"); rip_at_sig = pc; } ==== //depot/projects/valgrind/memcheck/tests/str_tester.c#5 (text+ko) ==== @@ -182,7 +182,6 @@ } } -#if !defined(__FreeBSD__) static void test_stpcpy (void) { @@ -266,7 +265,7 @@ } // DDD: better done by testing for the function. -#if !defined(__APPLE__) +#if !defined(__APPLE__) && !defined(__FreeBSD__) static void test_stpncpy (void) { @@ -505,7 +504,7 @@ #endif /* !defined(_AIX) */ // DDD: better done by testing for the function. -#if !defined(_AIX) && !defined(__APPLE__) +#if !defined(_AIX) && !defined(__APPLE__) && !defined(__FreeBSD__) static void test_rawmemchr (void) { @@ -902,9 +901,8 @@ equal(one+2, "b", 49); equal(one+4, "c", 50); -#if !defined(__FreeBSD__) { -# if !defined(_AIX) && !defined(__APPLE__) +# if !defined(_AIX) && !defined(__APPLE__) && !defined(__FreeBSD__) char text[] = "This,is,a,test"; char *list = strdupa (text); equal (strsep (&list, ","), "This", 51); @@ -914,7 +912,6 @@ check (strsep (&list, ",") == NULL, 55); # endif } -#endif cp = strcpy(one, "a,b, c,, ,d,"); equal(strsep(&cp, ","), "a", 56); /* Different separators. */ @@ -1387,11 +1384,10 @@ /* Test strcpy next because we need it to set up other tests. */ test_strcpy (); -#if !defined(__FreeBSD__) /* A closely related function is stpcpy. */ test_stpcpy (); -#if !defined(__APPLE__) +#if !defined(__APPLE__) && !defined(__FreeBSD__) /* stpncpy. */ test_stpncpy (); #endif ==== //depot/projects/valgrind/memcheck/tests/x86/Makefile.am#5 (text+ko) ==== @@ -34,7 +34,6 @@ pushfpopf \ pushfw_x86 \ pushpopmem \ - sse_memory \ tronical \ xor-undef-x86 ==== //depot/projects/valgrind/none/tests/Makefile.am#6 (text+ko) ==== @@ -220,9 +220,13 @@ if VGCONF_OS_IS_AIX5 res_search_LDADD = -lpthread else +if VGCONF_OS_IS_FREEBSD + res_search_LDADD = -lpthread +else res_search_LDADD = -lresolv -lpthread resolv_LDADD = -lresolv -lpthread endif +endif semlimit_LDADD = -lpthread thread_exits_LDADD = -lpthread threaded_fork_LDADD = -lpthread ==== //depot/projects/valgrind/none/tests/amd64/bug156404-amd64.c#3 (text+ko) ==== @@ -14,6 +14,10 @@ #define VG_STRINGIFZ(__str) #__str #define VG_STRINGIFY(__str) VG_STRINGIFZ(__str) +#if defined(__FreeBSD__) +# define __NR_readlink 58 +#endif + #define __NR_READLINK VG_STRINGIFY(__NR_readlink) extern long my_readlink ( const char* path ); ==== //depot/projects/valgrind/none/tests/faultstatus.c#4 (text+ko) ==== @@ -138,7 +138,6 @@ { const struct test tests[] = { #define T(n, sig, code, addr) { test##n, sig, code, addr } -#if !defined(__FreeBSD__) || __FreeBSD__ >= 5 T(1, SIGSEGV, SEGV_MAPERR, BADADDR), T(2, SIGSEGV, SEGV_ACCERR, mapping), T(3, SIGBUS, BUS_ADRERR, &mapping[FILESIZE+10]), ==== //depot/projects/valgrind/none/tests/pth_atfork1.c#4 (text+ko) ==== @@ -18,7 +18,7 @@ Boston, MA 02111-1307, USA. */ #include -#if !defined(_AIX) && !defined(__APPLE__) +#if !defined(_AIX) && !defined(__APPLE__) && !defined(__FreeBSD__) # include #endif #include @@ -27,7 +27,7 @@ #include #include -#if defined(_AIX) || defined(__APPLE__) +#if defined(_AIX) || defined(__APPLE__) || defined(__FreeBSD__) #include /* strerror */ static void error (int status, int errnum, char* msg) { ==== //depot/projects/valgrind/tests/arch_test.c#2 (text+ko) ==== @@ -32,10 +32,10 @@ static Bool go(char* arch) { -#if defined(VGP_x86_linux) || defined(VGP_x86_darwin) +#if defined(VGP_x86_linux) || defined(VGP_x86_darwin) || defined(VGP_x86_freebsd) if ( 0 == strcmp( arch, "x86" ) ) return True; -#elif defined(VGP_amd64_linux) || defined(VGP_amd64_darwin) +#elif defined(VGP_amd64_linux) || defined(VGP_amd64_darwin) || defined(VGP_amd64_freebsd) if ( 0 == strcmp( arch, "x86" ) ) return True; if ( 0 == strcmp( arch, "amd64" ) ) return True; ==== //depot/projects/valgrind/tests/malloc.h#2 (text+ko) ==== @@ -3,6 +3,8 @@ #include #if defined(VGO_darwin) # include +#elif defined(VGO_freebsd) +# include #else # include #endif @@ -14,7 +16,7 @@ static void* memalign16(size_t szB) { void* x; -#if defined(VGO_darwin) +#if defined(VGO_darwin) || defined(VGO_freebsd) // Darwin lacks memalign, but its malloc is always 16-aligned anyway. x = malloc(szB); #else ==== //depot/projects/valgrind/tests/os_test.c#2 (text+ko) ==== @@ -23,6 +23,7 @@ "linux", "aix5", "darwin", + "freebsd", NULL }; @@ -37,6 +38,9 @@ #elif defined(VGO_darwin) if ( 0 == strcmp( OS, "darwin" ) ) return True; +#elif defined(VGO_freebsd) + if ( 0 == strcmp( OS, "darwin" ) ) return True; + #else # error Unknown OS #endif // VGO_* ==== //depot/projects/valgrind/tests/sys_mman.h#2 (text+ko) ==== @@ -2,7 +2,7 @@ #include -#if defined(VGO_darwin) +#if defined(VGO_darwin) || defined(VGO_freebsd) # define MAP_ANONYMOUS MAP_ANON #endif From owner-p4-projects@FreeBSD.ORG Fri Sep 18 14:05:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 578FF1065693; Fri, 18 Sep 2009 14:05:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1BA5D106568D for ; Fri, 18 Sep 2009 14:05:26 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0488A8FC1E for ; Fri, 18 Sep 2009 14:05:26 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8IE5PVd084261 for ; Fri, 18 Sep 2009 14:05:25 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8IE5PaP084259 for perforce@freebsd.org; Fri, 18 Sep 2009 14:05:25 GMT (envelope-from stas@freebsd.org) Date: Fri, 18 Sep 2009 14:05:25 GMT Message-Id: <200909181405.n8IE5PaP084259@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Cc: Subject: PERFORCE change 168660 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Sep 2009 14:05:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=168660 Change 168660 by stas@stas_deglitch on 2009/09/18 14:05:04 - Mark filters executable. Affected files ... .. //depot/projects/valgrind/cachegrind/tests/filter_cachesim_discards#3 edit .. //depot/projects/valgrind/cachegrind/tests/filter_stderr#4 edit .. //depot/projects/valgrind/cachegrind/tests/x86/filter_stderr#3 edit .. //depot/projects/valgrind/callgrind/tests/filter_stderr#3 edit .. //depot/projects/valgrind/drd/tests/filter_error_summary#3 edit .. //depot/projects/valgrind/drd/tests/filter_stderr#3 edit .. //depot/projects/valgrind/drd/tests/filter_stderr_and_thread_no#2 edit .. //depot/projects/valgrind/drd/tests/run_openmp_test#3 edit .. //depot/projects/valgrind/drd/tests/supported_libpthread#3 edit .. //depot/projects/valgrind/drd/tests/supported_sem_init#2 edit .. //depot/projects/valgrind/exp-bbv/tests/amd64-linux/filter_stderr#2 edit .. //depot/projects/valgrind/exp-bbv/tests/filter_bb#2 edit .. //depot/projects/valgrind/exp-bbv/tests/filter_stderr#2 edit .. //depot/projects/valgrind/exp-bbv/tests/ppc32-linux/filter_stderr#2 edit .. //depot/projects/valgrind/exp-bbv/tests/x86-linux/filter_stderr#2 edit .. //depot/projects/valgrind/exp-bbv/tests/x86/filter_stderr#2 edit .. //depot/projects/valgrind/exp-ptrcheck/tests/filter_add#3 edit .. //depot/projects/valgrind/exp-ptrcheck/tests/filter_stderr#3 edit .. //depot/projects/valgrind/exp-ptrcheck/tests/filter_suppgen#3 edit .. //depot/projects/valgrind/helgrind/tests/filter_stderr#4 edit .. //depot/projects/valgrind/lackey/tests/filter_stderr#3 edit .. //depot/projects/valgrind/massif/tests/filter_stderr#4 edit .. //depot/projects/valgrind/massif/tests/filter_verbose#3 edit .. //depot/projects/valgrind/memcheck/tests/amd64/filter_defcfaexpr#3 edit .. //depot/projects/valgrind/memcheck/tests/amd64/filter_stderr#3 edit .. //depot/projects/valgrind/memcheck/tests/darwin/filter_stderr#2 edit .. //depot/projects/valgrind/memcheck/tests/filter_addressable#2 edit .. //depot/projects/valgrind/memcheck/tests/filter_allocs#4 edit .. //depot/projects/valgrind/memcheck/tests/filter_stderr#4 edit .. //depot/projects/valgrind/memcheck/tests/filter_varinfo3#3 edit .. //depot/projects/valgrind/memcheck/tests/filter_xml#3 edit .. //depot/projects/valgrind/memcheck/tests/linux/filter_stderr#2 edit .. //depot/projects/valgrind/memcheck/tests/x86-linux/filter_scalar_exit_group#2 edit .. //depot/projects/valgrind/memcheck/tests/x86-linux/filter_stderr#2 edit .. //depot/projects/valgrind/memcheck/tests/x86/filter_pushfpopf#3 edit .. //depot/projects/valgrind/memcheck/tests/x86/filter_stderr#3 edit .. //depot/projects/valgrind/memcheck/tests/x86/filter_tronical#3 edit .. //depot/projects/valgrind/none/tests/amd64/filter_cpuid#3 edit .. //depot/projects/valgrind/none/tests/amd64/filter_int#3 edit .. //depot/projects/valgrind/none/tests/amd64/filter_stderr#3 edit .. //depot/projects/valgrind/none/tests/darwin/filter_stderr#2 edit .. //depot/projects/valgrind/none/tests/filter_cmdline0#3 edit .. //depot/projects/valgrind/none/tests/filter_cmdline1#2 edit .. //depot/projects/valgrind/none/tests/filter_fdleak#3 edit .. //depot/projects/valgrind/none/tests/filter_linenos#3 edit .. //depot/projects/valgrind/none/tests/filter_none_discards#3 edit .. //depot/projects/valgrind/none/tests/filter_stderr#3 edit .. //depot/projects/valgrind/none/tests/filter_timestamp#2 edit .. //depot/projects/valgrind/none/tests/linux/filter_stderr#2 edit .. //depot/projects/valgrind/none/tests/ppc32/filter_stderr#3 edit .. //depot/projects/valgrind/none/tests/ppc64/filter_stderr#3 edit .. //depot/projects/valgrind/none/tests/x86-linux/filter_stderr#2 edit .. //depot/projects/valgrind/none/tests/x86/filter_cpuid#3 edit .. //depot/projects/valgrind/none/tests/x86/filter_int#3 edit .. //depot/projects/valgrind/none/tests/x86/filter_stderr#3 edit .. //depot/projects/valgrind/tests/filter_addresses#4 edit .. //depot/projects/valgrind/tests/filter_discards#4 edit .. //depot/projects/valgrind/tests/filter_libc#3 edit .. //depot/projects/valgrind/tests/filter_numbers#4 edit .. //depot/projects/valgrind/tests/filter_sink#3 edit .. //depot/projects/valgrind/tests/filter_stderr_basic#6 edit Differences ... ==== //depot/projects/valgrind/cachegrind/tests/filter_cachesim_discards#3 (text+kox) ==== ==== //depot/projects/valgrind/cachegrind/tests/filter_stderr#4 (text+kox) ==== ==== //depot/projects/valgrind/cachegrind/tests/x86/filter_stderr#3 (text+kox) ==== ==== //depot/projects/valgrind/callgrind/tests/filter_stderr#3 (text+kox) ==== ==== //depot/projects/valgrind/drd/tests/filter_error_summary#3 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/drd/tests/filter_stderr#3 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/drd/tests/filter_stderr_and_thread_no#2 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/drd/tests/run_openmp_test#3 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/drd/tests/supported_libpthread#3 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/drd/tests/supported_sem_init#2 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/exp-bbv/tests/amd64-linux/filter_stderr#2 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/exp-bbv/tests/filter_bb#2 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/exp-bbv/tests/filter_stderr#2 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/exp-bbv/tests/ppc32-linux/filter_stderr#2 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/exp-bbv/tests/x86-linux/filter_stderr#2 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/exp-bbv/tests/x86/filter_stderr#2 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/exp-ptrcheck/tests/filter_add#3 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/exp-ptrcheck/tests/filter_stderr#3 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/exp-ptrcheck/tests/filter_suppgen#3 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/helgrind/tests/filter_stderr#4 (text+kox) ==== ==== //depot/projects/valgrind/lackey/tests/filter_stderr#3 (text+kox) ==== ==== //depot/projects/valgrind/massif/tests/filter_stderr#4 (text+kox) ==== ==== //depot/projects/valgrind/massif/tests/filter_verbose#3 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/memcheck/tests/amd64/filter_defcfaexpr#3 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/memcheck/tests/amd64/filter_stderr#3 (text+kox) ==== ==== //depot/projects/valgrind/memcheck/tests/darwin/filter_stderr#2 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/memcheck/tests/filter_addressable#2 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/memcheck/tests/filter_allocs#4 (text+kox) ==== ==== //depot/projects/valgrind/memcheck/tests/filter_stderr#4 (text+kox) ==== ==== //depot/projects/valgrind/memcheck/tests/filter_varinfo3#3 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/memcheck/tests/filter_xml#3 (text+kox) ==== ==== //depot/projects/valgrind/memcheck/tests/linux/filter_stderr#2 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/memcheck/tests/x86-linux/filter_scalar_exit_group#2 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/memcheck/tests/x86-linux/filter_stderr#2 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/memcheck/tests/x86/filter_pushfpopf#3 (text+kox) ==== ==== //depot/projects/valgrind/memcheck/tests/x86/filter_stderr#3 (text+kox) ==== ==== //depot/projects/valgrind/memcheck/tests/x86/filter_tronical#3 (text+kox) ==== ==== //depot/projects/valgrind/none/tests/amd64/filter_cpuid#3 (text+kox) ==== ==== //depot/projects/valgrind/none/tests/amd64/filter_int#3 (text+kox) ==== ==== //depot/projects/valgrind/none/tests/amd64/filter_stderr#3 (text+kox) ==== ==== //depot/projects/valgrind/none/tests/darwin/filter_stderr#2 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/none/tests/filter_cmdline0#3 (text+kox) ==== ==== //depot/projects/valgrind/none/tests/filter_cmdline1#2 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/none/tests/filter_fdleak#3 (text+kox) ==== ==== //depot/projects/valgrind/none/tests/filter_linenos#3 (text+kox) ==== ==== //depot/projects/valgrind/none/tests/filter_none_discards#3 (text+kox) ==== ==== //depot/projects/valgrind/none/tests/filter_stderr#3 (text+kox) ==== ==== //depot/projects/valgrind/none/tests/filter_timestamp#2 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/none/tests/linux/filter_stderr#2 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/none/tests/ppc32/filter_stderr#3 (text+kox) ==== ==== //depot/projects/valgrind/none/tests/ppc64/filter_stderr#3 (text+kox) ==== ==== //depot/projects/valgrind/none/tests/x86-linux/filter_stderr#2 (text+kox/text+ko) ==== ==== //depot/projects/valgrind/none/tests/x86/filter_cpuid#3 (text+kox) ==== ==== //depot/projects/valgrind/none/tests/x86/filter_int#3 (text+kox) ==== ==== //depot/projects/valgrind/none/tests/x86/filter_stderr#3 (text+kox) ==== ==== //depot/projects/valgrind/tests/filter_addresses#4 (text+kox) ==== ==== //depot/projects/valgrind/tests/filter_discards#4 (text+kox) ==== ==== //depot/projects/valgrind/tests/filter_libc#3 (text+kox) ==== ==== //depot/projects/valgrind/tests/filter_numbers#4 (text+kox) ==== ==== //depot/projects/valgrind/tests/filter_sink#3 (text+kox) ==== ==== //depot/projects/valgrind/tests/filter_stderr_basic#6 (text+kox) ==== From owner-p4-projects@FreeBSD.ORG Fri Sep 18 16:13:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 138AA1065693; Fri, 18 Sep 2009 16:13:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CC309106568D for ; Fri, 18 Sep 2009 16:13:46 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BAD7A8FC18 for ; Fri, 18 Sep 2009 16:13:46 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8IGDk9R095889 for ; Fri, 18 Sep 2009 16:13:46 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8IGDkjV095887 for perforce@freebsd.org; Fri, 18 Sep 2009 16:13:46 GMT (envelope-from truncs@FreeBSD.org) Date: Fri, 18 Sep 2009 16:13:46 GMT Message-Id: <200909181613.n8IGDkjV095887@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to truncs@FreeBSD.org using -f From: Aditya Sarawgi To: Perforce Change Reviews Cc: Subject: PERFORCE change 168669 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Sep 2009 16:13:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=168669 Change 168669 by truncs@aditya on 2009/09/18 16:13:21 Remove unused functions and misleading comments. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_alloc.c#6 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_extern.h#3 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_alloc.c#6 (text+ko) ==== @@ -319,8 +319,6 @@ /* * Allocate an inode in the file system. * - * we leave the actual allocation strategy to the (modified) - * ext2_new_inode(), to make sure we get the policies right */ int ext2_valloc(pvp, mode, cred, vpp) @@ -672,7 +670,6 @@ /* * Free a block or fragment. * - * pass on to the Linux code */ void ext2_blkfree(ip, bno, size) @@ -717,7 +714,6 @@ /* * Free an inode. * - * the maintenance of the actual bitmaps is again up to the linux code */ int ext2_vfree(pvp, ino, mode) ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_extern.h#3 (text+ko) ==== @@ -80,13 +80,6 @@ int ext2_checkpath(struct inode *, struct inode *, struct ucred *); int cg_has_sb(int i); int ext2_inactive(struct vop_inactive_args *); -int ext2_new_block(struct mount * mp, unsigned long goal, - u_int32_t *prealloc_count, u_int32_t *prealloc_block); -ino_t ext2_new_inode(const struct inode * dir, int mode); -unsigned long ext2_count_free(struct buf *map, unsigned int numchars); -void ext2_free_blocks(struct mount *mp, unsigned long block, - unsigned long count); -void ext2_free_inode(struct inode * inode); /* Flags to low-level allocation routines. */ #define B_CLRBUF 0x01 /* Request allocated buffer be cleared. */ From owner-p4-projects@FreeBSD.ORG Fri Sep 18 17:37:18 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D7751065676; Fri, 18 Sep 2009 17:37: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 31D1D1065670 for ; Fri, 18 Sep 2009 17:37:18 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 218388FC12 for ; Fri, 18 Sep 2009 17:37:18 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8IHbI8r013177 for ; Fri, 18 Sep 2009 17:37:18 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8IHbHrf013175 for perforce@freebsd.org; Fri, 18 Sep 2009 17:37:18 GMT (envelope-from gk@FreeBSD.org) Date: Fri, 18 Sep 2009 17:37:18 GMT Message-Id: <200909181737.n8IHbHrf013175@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gk@FreeBSD.org using -f From: Gleb Kurtsou To: Perforce Change Reviews Cc: Subject: PERFORCE change 168671 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Sep 2009 17:37:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=168671 Change 168671 by gk@gk_h1 on 2009/09/18 17:37:04 fix mouting on top of ufs: fix incorrect readdir result parsing pefs_name_{ntop,pton}: return error on empty result fix sbin/pefs incorrect fs root Affected files ... .. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.c#6 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_crypto.c#10 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#15 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_xbase64.c#4 edit Differences ... ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.c#6 (text+ko) ==== @@ -119,7 +119,7 @@ } if (fsroot != NULL) - strlcpy(fsroot, fs.f_mntfromname, size); + strlcpy(fsroot, fs.f_mntonname, size); return (0); } ==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_crypto.c#10 (text+ko) ==== @@ -437,6 +437,7 @@ { size_t psize; + MPASS(namelen > PEFS_NAME_CSUM_SIZE && namelen < MAXNAMLEN + 1); psize = namelen - PEFS_NAME_CSUM_SIZE; psize = PEFS_NAME_CSUM_SIZE + PEFS_BLOCK_ROUND(PEFS_CSUM_BLOCK_SIZE, psize); @@ -517,6 +518,9 @@ enc[0] = '.'; r = pefs_name_ntop(buf, size, enc + 1, enc_size - 1); + if (r <= 0) + return (r); + r++; return (r); } @@ -542,7 +546,7 @@ if (PEFS_NAME_PTON_SIZE(enc_len) <= PEFS_TWEAK_SIZE + PEFS_NAME_CSUM_SIZE) return (-EINVAL); r = pefs_name_pton(enc, enc_len, plain, plain_size); - if (r < 0) { + if (r <= 0) { PEFSDEBUG("pefs_name_decrypt: error: r=%d\n", r); return (-EINVAL); } ==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#15 (text+ko) ==== @@ -68,6 +68,8 @@ #include +#define DIRENT_MINSIZE (sizeof(struct dirent) - (MAXNAMLEN + 1)) + static int pefs_bug_bypass = 0; /* for debugging: enables bypass printf'ing */ SYSCTL_INT(_debug, OID_AUTO, pefs_bug_bypass, CTLFLAG_RW, &pefs_bug_bypass, 0, ""); @@ -193,14 +195,15 @@ struct dirent *de; char buf[MAXNAMLEN + 1]; int d_namelen; - int de_len; PEFSDEBUG("pefs_enccn_lookup_dirent: lookup %.*s\n", (int)namelen, name); ctx = pefs_ctx_get(); - for (de = (struct dirent*) mem; sz > 0; - sz -= de_len, - de = (struct dirent *)(((caddr_t)de) + de_len)) { - de_len = GENERIC_DIRSIZ(de); + for (de = (struct dirent*) mem; sz > DIRENT_MINSIZE; + sz -= de->d_reclen, + de = (struct dirent *)(((caddr_t)de) + de->d_reclen)) { + MPASS(de->d_reclen <= sz); + if (de->d_type == DT_WHT) + continue; if (pefs_name_skip(de->d_name, de->d_namlen)) continue; d_namelen = pefs_name_decrypt(ctx, pk, ptk, de->d_name, @@ -552,18 +555,31 @@ if (!nokey_lookup) { error = pefs_enccn_lookup(&enccn, dvp, cnp); if (error == ENOENT && (cnp->cn_flags & ISLASTCN) && - (cnp->cn_nameiop == CREATE || cnp->cn_nameiop == RENAME)) { - PEFSDEBUG("pefs_lookup: just return %.*s\n", - (int)cnp->cn_namelen, cnp->cn_nameptr); - error = EJUSTRETURN; + (cnp->cn_nameiop == CREATE || cnp->cn_nameiop == RENAME || + (cnp->cn_nameiop == DELETE && + (cnp->cn_flags & DOWHITEOUT) && + (cnp->cn_flags & ISWHITEOUT)))) { + /* + * Some filesystems (like ufs) update internal inode + * fields during VOP_LOOKUP which are later used by + * VOP_CREATE, VOP_MKDIR, etc. That's why we can't + * return EJUSTRETURN here and have to perform + * VOP_LOOKUP(ldvp). + * Attention should also be paid not to unlock dvp. + * + * XXX We also need to have a valid encrypted cnp. Real + * encrypted cnp will be created anyway, encrypted name + * length should just be the same here. + */ + pefs_enccn_create_node(&enccn, dvp, cnp); + error = 0; } if (error == 0) { error = VOP_LOOKUP(ldvp, &lvp, &enccn.pec_cn); if (error == 0 || error == EJUSTRETURN) { - /* XXX only SAVENAME can be changed ?? */ - cnp->cn_flags = (enccn.pec_cn.cn_flags & - ~HASBUF) | (cnp->cn_flags & HASBUF); + cnp->cn_flags = (cnp->cn_flags & HASBUF) | + (enccn.pec_cn.cn_flags & ~HASBUF); } if (error != 0) PEFSDEBUG("pefs_lookup: lower error = %d\n", error); @@ -1170,14 +1186,15 @@ char buf[MAXNAMLEN + 1]; size_t sz; int d_namelen; - int de_len; ctx = pefs_ctx_get(); - for (de = (struct dirent*) mem, sz = *psize; sz > 0; de = de_next) { - de_len = GENERIC_DIRSIZ(de); - MPASS(sz >= de_len); - sz -= de_len; - de_next = (struct dirent *)(((caddr_t)de) + de_len); + for (de = (struct dirent*) mem, sz = *psize; sz > DIRENT_MINSIZE; + de = de_next) { + MPASS(de->d_reclen <= sz); + sz -= de->d_reclen; + de_next = (struct dirent *)(((caddr_t)de) + de->d_reclen); + if (de->d_type == DT_WHT) + continue; if (pefs_name_skip(de->d_name, de->d_namlen)) continue; @@ -1187,8 +1204,8 @@ strlcpy(de->d_name, buf, de->d_namlen + 1); de->d_namlen = d_namelen; } else if (dflags & PN_HASKEY) { + *psize -= de->d_reclen; memcpy(de, de_next, sz); - *psize -= de_len; de_next = de; } } @@ -1247,7 +1264,7 @@ uio->uio_offset = puio->uio_offset; /* Finish if there is no need to merge cookies */ - if ((*eofflag || uio->uio_resid < sizeof(struct dirent)) && + if ((*eofflag || uio->uio_resid <= DIRENT_MINSIZE) && (a_cookies == NULL || r_cookies == NULL)) break; @@ -1256,7 +1273,7 @@ if (r_cookies == NULL) { /* Allocate buffer of maximum possible size */ r_ncookies_max = uio->uio_resid / - (sizeof(struct dirent) - MAXNAMLEN); + DIRENT_MINSIZE; r_ncookies_max += ncookies; r_cookies = malloc(r_ncookies_max * sizeof(u_long), M_TEMP, M_WAITOK); @@ -1273,7 +1290,7 @@ cookies = NULL; } - if (*eofflag || uio->uio_resid < sizeof(struct dirent)) + if (*eofflag || uio->uio_resid <= DIRENT_MINSIZE) break; pefs_chunk_restore(&pc); ==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_xbase64.c#4 (text+ko) ==== @@ -119,7 +119,7 @@ target[datalength++] = Base64[output[2]]; } } - if (datalength >= targsize) + if (datalength >= targsize || datalength == 0) return (-1); target[datalength] = '\0'; /* Returned value doesn't count \0. */ return (datalength); @@ -181,5 +181,7 @@ } } + if (tarindex == 0) + return (-1); return (tarindex); } From owner-p4-projects@FreeBSD.ORG Sat Sep 19 12:08:52 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E50BD1065679; Sat, 19 Sep 2009 12:08:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A7632106566B for ; Sat, 19 Sep 2009 12:08:51 +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 95B468FC1B for ; Sat, 19 Sep 2009 12:08:51 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8JC8pxE053941 for ; Sat, 19 Sep 2009 12:08:51 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8JC8puW053939 for perforce@freebsd.org; Sat, 19 Sep 2009 12:08:51 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 19 Sep 2009 12:08:51 GMT Message-Id: <200909191208.n8JC8puW053939@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 168678 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Sep 2009 12:08:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=168678 Change 168678 by pgj@beehive on 2009/09/19 12:07:57 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#37 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/johans.key#2 integrate .. //depot/projects/docproj_hu/doc/share/sgml/freebsd.ent#11 integrate .. //depot/projects/docproj_hu/doc/share/sgml/mirrors.xml#9 integrate .. //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#14 integrate .. //depot/projects/docproj_hu/www/en/developers.sgml#31 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#49 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#68 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#37 (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.488 2009/08/10 16:50:10 fluffy Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.489 2009/09/16 14:58:25 wen Exp $ --> aaron@FreeBSD.org"> @@ -1152,6 +1152,8 @@ weongyo@FreeBSD.org"> +wen@FreeBSD.org"> + wes@FreeBSD.org"> wxs@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/share/pgpkeys/johans.key#2 (text+ko) ==== @@ -1,1542 +1,637 @@ - + uid Johan van Selst -uid Johan van Selst -uid Johan van Selst -uid Johan van Selst uid Johan van Selst -sub 2048g/EF1C75DD 2001-03-03 -sub 1024R/355F8408 2005-11-05 -sub 1024R/9AF7EE88 2005-11-05 +uid Johan van Selst (GSWoT:NL50) +sub 2048R/B002E38C 2009-09-01 +sub 2048R/1EBCAECB 2009-09-01 +sub 2048R/639A1446 2009-09-01 +sub 3072D/6F2708F4 2009-09-01 +sub 4096g/D6F89E83 2009-09-01 ]]> >> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Sep 19 12:18:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B079106566C; Sat, 19 Sep 2009 12:18: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 C3CDE1065672 for ; Sat, 19 Sep 2009 12:18:01 +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 B2DEB8FC13 for ; Sat, 19 Sep 2009 12:18:01 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8JCI1AD054716 for ; Sat, 19 Sep 2009 12:18:01 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8JCI1Ht054714 for perforce@freebsd.org; Sat, 19 Sep 2009 12:18:01 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 19 Sep 2009 12:18:01 GMT Message-Id: <200909191218.n8JCI1Ht054714@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 168679 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Sep 2009 12:18:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=168679 Change 168679 by pgj@beehive on 2009/09/19 12:17:27 MFen (www): 1.268 -> 1.270 hu/share/sgml/news.xml Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#50 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#50 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -22,6 +22,15 @@ 9 + 15 + + +

Új tag: Wen + Heping (ports)

+ + + + 7 From owner-p4-projects@FreeBSD.ORG Sat Sep 19 13:43:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C60B71065693; Sat, 19 Sep 2009 13:43: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 70F06106568D for ; Sat, 19 Sep 2009 13:43:35 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5F7ED8FC17 for ; Sat, 19 Sep 2009 13:43:35 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8JDhZHf072271 for ; Sat, 19 Sep 2009 13:43:35 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8JDhYmc072269 for perforce@freebsd.org; Sat, 19 Sep 2009 13:43:34 GMT (envelope-from truncs@FreeBSD.org) Date: Sat, 19 Sep 2009 13:43:34 GMT Message-Id: <200909191343.n8JDhYmc072269@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to truncs@FreeBSD.org using -f From: Aditya Sarawgi To: Perforce Change Reviews Cc: Subject: PERFORCE change 168680 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Sep 2009 13:43:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=168680 Change 168680 by truncs@aditya on 2009/09/19 13:43:32 WIP - Orlov block allocator for ext2fs. It will restrict many directories to be in the same group. This will result in other directories having sufficient space for their sub-directories and file. It also allows spreading of directories in the root directory. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_alloc.c#7 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2fs.h#2 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_alloc.c#7 (text+ko) ==== @@ -52,7 +52,7 @@ #include static daddr_t ext2_alloccg(struct inode *, int, daddr_t, int); -static u_long ext2_dirpref(struct m_ext2fs *); +static u_long ext2_dirpref(struct inode *); static void ext2_fserr(struct m_ext2fs *, u_int, char *); static u_long ext2_hashalloc(struct inode *, int, long, int, daddr_t (*)(struct inode *, int, daddr_t, @@ -344,7 +344,7 @@ * inode. */ if((mode & IFMT) == IFDIR) - cg = ext2_dirpref(fs); + cg = ext2_dirpref(pip); else cg = ino_to_cg(fs, pip->i_number); ipref = cg * fs->e2fs->e2fs_ipg + 1; @@ -393,26 +393,61 @@ /* * Find a cylinder to place a directory. * - * The policy implemented by this algorithm is to select from - * among those cylinder groups with above the average number of - * free inodes, the one with the smallest number of directories. + * The policy implemented by this algorithm is to allocate a + * directory inode in the same cylinder group as its parent + * directory, but also to reserve space for its files inodes + * and data. Restrict the number of directories which may be + * allocated one after another in the same cylinder group + * without intervening allocation of files. + * + * If we allocate a first level directory then force allocation + * in another cylinder group. + * */ static u_long -ext2_dirpref(struct m_ext2fs *fs) +ext2_dirpref(struct inode *pip) { - int cg, maxspace, mincg, avgifree; - avgifree = fs->e2fs->e2fs_ficount / fs->e2fs_gcount; - maxspace = 0; - mincg = -1; - for (cg = 0; cg < fs->e2fs_gcount; cg++) { - if ( fs->e2fs_gd[cg].ext2bgd_nifree >= avgifree) { - if (mincg == -1 || fs->e2fs_gd[cg].ext2bgd_nbfree > maxspace) { + struct m_ext2fs *fs; + int cg, prefcg, dirsize, cgsize; + int avgifree, avgbfree, avgndir, curdirsize; + int minifree, minbfree, maxndir; + int mincg, minndir; + int maxcontigdirs; + + fs = pip->i_e2fs; + + avgifree = fs->e2fs->e2fs_ficount / fs->e2fs_gcount; + avgbfree = fs->e2fs->e2fs_fbcount / fs->e2fs_gcount; + avgndir = fs->e2fs_total_dir / e2fs->e2fs_gcount; + + /* + * Force allocation in another cg if creating a first level dir. + */ + ASSERT_VOP_LOCKED(ITOV(pip), "ext2fs_dirpref"); + if (ITOV(pip)->v_vflag & VV_ROOT) { + prefcg = arc4random() % fs->e2fs_gcount; + mincg = prefcg; + minndir = fs->e2fs_ipg; + for (cg = prefcg; cg < fs->e2fs_gcount; cg++) + if (fs->e2fs_gd[cg].ext2bgd_ndirs < minndir && + fs->e2fs_gd[cg].ext2bgd_nifree >= avgifree && + fs->e2fs_gd[cg].ext2bgd_nbfree >= avgbfree) { + mincg = cg; + minndir = fs->e2fs_gd[cg].ext2bgd_ndirs; + } + for (cg = 0; cg < prefcg; cg++) + if (fs->e2fs_gd[cg].ext2bgd_ndirs < minndir && + fs->e2fs_gd[cg].ext2bgd_nifree >= avgifree && + fs->e2fs_gd[cg].ext2bgd_nbfree >= avgbfree) { mincg = cg; - maxspace = fs->e2fs_gd[cg].ext2bgd_nbfree; + minndir = fs->e2fs_gd[cg].ext2bgd_ndirs; } - } + + return (mincg); } - return mincg; + + + } /* ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2fs.h#2 (text+ko) ==== @@ -187,6 +187,7 @@ int32_t e2fs_isize; /* Size of inode */ uint32_t e2fs_mount_opt; uint32_t e2fs_blocksize_bits; + uint32_t e2fs_total_dir; /* Total number of directories */ char e2fs_wasvalid; /* valid at mount time */ off_t e2fs_maxfilesize; struct ext2_gd *e2fs_gd; /* Group Descriptors */ From owner-p4-projects@FreeBSD.ORG Sat Sep 19 13:51:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D6741065679; Sat, 19 Sep 2009 13:51:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6FCBB106566B for ; Sat, 19 Sep 2009 13:51:44 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5E7F68FC0C for ; Sat, 19 Sep 2009 13:51:44 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8JDpiY9072878 for ; Sat, 19 Sep 2009 13:51:44 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8JDpiZx072876 for perforce@freebsd.org; Sat, 19 Sep 2009 13:51:44 GMT (envelope-from truncs@FreeBSD.org) Date: Sat, 19 Sep 2009 13:51:44 GMT Message-Id: <200909191351.n8JDpiZx072876@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to truncs@FreeBSD.org using -f From: Aditya Sarawgi To: Perforce Change Reviews Cc: Subject: PERFORCE change 168681 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Sep 2009 13:51:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=168681 Change 168681 by truncs@aditya on 2009/09/19 13:50:47 Orlov block allocator requires total no. of directories in a given file system as in-core superblock doesn't provide this information directly, a new variable called e2fs_total_dir has been added to in-memory superblock which will add the no. of directories in the individual groups at the time of mounting. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vfsops.c#6 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vfsops.c#6 (text+ko) ==== @@ -381,6 +381,11 @@ brelse(bp); bp = NULL; } + fs->e2fs_total_dir = 0; + for (i=0; i < fs->e2fs_gcount; i++){ + fs->e2fs_total_dir += fs->e2fs_gd[i].ext2bgd_ndirs; + } + uprintf("Total dirs %d", fs->e2fs_total_dir); if (es->e2fs_rev == E2FS_REV0 || (es->e2fs_features_rocompat & EXT2F_ROCOMPAT_LARGEFILE) == 0) fs->e2fs_maxfilesize = 0x7fffffff; From owner-p4-projects@FreeBSD.ORG Sat Sep 19 21:47:25 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2269F106568D; Sat, 19 Sep 2009 21:47:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DB137106566C for ; Sat, 19 Sep 2009 21:47:24 +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 CA6D18FC1E for ; Sat, 19 Sep 2009 21:47:24 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8JLlOLM037442 for ; Sat, 19 Sep 2009 21:47:24 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8JLlO77037440 for perforce@freebsd.org; Sat, 19 Sep 2009 21:47:24 GMT (envelope-from gabor@freebsd.org) Date: Sat, 19 Sep 2009 21:47:24 GMT Message-Id: <200909192147.n8JLlO77037440@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 168694 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Sep 2009 21:47:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=168694 Change 168694 by gabor@gabor_aspire on 2009/09/19 21:47:05 - Update manpage with missing options Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.1#15 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.1#15 (text+ko) ==== @@ -29,7 +29,7 @@ .\" .\" @(#)grep.1 8.3 (Berkeley) 4/18/94 .\" -.Dd 8 Jul, 2008 +.Dd 19 September, 2009 .Dt GREP 1 .Os .Sh NAME @@ -185,6 +185,16 @@ options are used to specify multiple patterns, or when a pattern begins with a dash .Pq Sq - . +.It Fl Fl exclude +If +.Fl R +is specified, it excludes files matching the given +filename pattern. +.It Fl Fl exclude-dir +If +.Fl R +is specified, it excludes directories matching the +given filename pattern. .It Fl F , Fl Fl fixed-strings Interpret .Ar pattern @@ -227,6 +237,16 @@ By default, .Nm grep is case sensitive. +.It Fl Fl include +If +.Fl R +is specified, it includes the files matching the +given filename pattern. +.It Fl Fl include-dir +If +.Fl R +is specified, it includes the directories matching the +given filename pattern. .It Fl J, Fl Fl bz2decompress Decompress the .Xr bzip2 1 From owner-p4-projects@FreeBSD.ORG Sat Sep 19 22:54:38 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C18581065676; Sat, 19 Sep 2009 22:54: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 6DBBB106566B for ; Sat, 19 Sep 2009 22:54:38 +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 5C9478FC19 for ; Sat, 19 Sep 2009 22:54:38 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8JMscG1043729 for ; Sat, 19 Sep 2009 22:54:38 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8JMscBw043727 for perforce@freebsd.org; Sat, 19 Sep 2009 22:54:38 GMT (envelope-from gabor@freebsd.org) Date: Sat, 19 Sep 2009 22:54:38 GMT Message-Id: <200909192254.n8JMscBw043727@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 168696 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Sep 2009 22:54:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=168696 Change 168696 by gabor@gabor_aspire on 2009/09/19 22:53:58 - More readable code by simplifications concerning fflag and rflag - Some changes to -g and -n Affected files ... .. //depot/projects/soc2008/gabor_textproc/newsort/coll.c#4 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/newsort/coll.c#4 (text+ko) ==== @@ -36,6 +36,7 @@ static wchar_t **months; +static inline int _wcscoll(const wchar_t *, const wchar_t *); static int gnumcoll(const wchar_t *, const wchar_t *); static int monthcoll(const wchar_t *, const wchar_t *); static int numcoll(const wchar_t *, const wchar_t *); @@ -151,16 +152,26 @@ ps1 = preproc(s1); ps2 = preproc(s2); + if (rflag) { + wchar_t *tmp = ps1; + + ps1 = ps2; + ps2 = tmp; + } if (nflag) - return (rflag ? numcoll(ps2, ps1) : numcoll(ps1, ps2)); + return (numcoll(ps1, ps2)); else if (gflag) - return (rflag ? gnumcoll(ps2, ps1) : gnumcoll(ps1, ps2)); + return (gnumcoll(ps1, ps2)); else if (Mflag) - return (rflag ? monthcoll(ps2, ps1) : monthcoll(ps1, ps2)); + return (monthcoll(ps1, ps2)); else - return (fflag ? - (rflag ? wcscasecoll(ps2, ps1) : wcscasecoll(ps1, ps2)) : - (rflag ? wcscoll(ps2, ps1) : wcscoll(ps1, ps2))); + return (_wcscoll(s1, s2)); +} + +static inline int +_wcscoll(const wchar_t *s1, const wchar_t *s2) { + + return (fflag ? wcscasecoll(s1, s2) : wcscoll(s1, s2)); } /* @@ -187,32 +198,47 @@ return (wcscoll(ss1, ss2)); } +#define NUMCHECK_COMMON(a, b) \ + double d1, d2; \ + errno = 0; \ + d1 = wcstod(#a, &ep1); \ +\ + if ((errno == ERANGE) && (d1 == HUGE_VAL)) \ + return (1); \ +\ + d2 = wcstod(#b, &ep2); \ +\ + if ((errno == ERANGE) && (d2 == HUGE_VAL)) \ + return (-1); + /* * Implements numeric sort (-n). */ static int numcoll(const wchar_t *s1, const wchar_t *s2) { - int n1 = 0, n2 = 0; + int n1, n2; + wchar_t *ns1, *ns2, *ep1 = NULL, *ep2 = NULL; + + if (s1[0] == L'-') + s1++; + + if (s2[0] == L'-') + s2++; + + n1 = wcsspn(s1, L".0123456789"); + n2 = wcsspn(s2, L".0123456789"); + + ns1 = sort_malloc((n1 + 1) * sizeof(wint_t)); + ns2 = sort_malloc((n2 + 1) * sizeof(wint_t)); - while (iswdigit(s1[n1])) - n1++; + wcslcpy(ns1, s1, n1); + wcslcpy(ns2, s2, n2); - while (iswdigit(s2[n2])) - n2++; + NUMCHECK_COMMON(ns1, ns2); - if (n1 > n2) - return (n2 = 0 ? -1 : 1); - else if (n2 > n1) - return (n1 = 0 ? 1 : -1); - else if ((n1 == 0) && (n2 == 0)) { - if (fflag) - return (wcscasecoll(&s1[n1], &s2[n2])); - else - return (wcscoll(&s1[n1], &s2[n2])); - } else { - /* TODO */ - return (0); - } + if (d1 == d2) + return (_wcscoll(ep1, ep2)); + return (d1 > d2 ? 1 : -1); } /* @@ -220,12 +246,11 @@ */ static int gnumcoll(const wchar_t *s1, const wchar_t *s2) { - double d1, d2; wchar_t *ep1 = NULL, *ep2 = NULL; + /* XXX: what if - (minus sign) comes first? */ if (iswalpha(s1[0]) && iswalpha(s2[0])) - return (fflag ? wcscasecoll(s1, s2) : - wcscoll(s1, s2)); + return (_wcscoll(s1, s2)); if (!iswnumber(s1[0]) && !iswnumber(s2[0])) return (0); @@ -234,18 +259,10 @@ else if (iswnumber(s1[0]) && !iswnumber(s2[0])) return (1); - d1 = wcstod(s1, &ep1); - d2 = wcstod(s2, &ep2); - - if ((errno == ERANGE) && (d1 == HUGE_VAL)) - return (1); - - if ((errno == ERANGE) && (d2 == HUGE_VAL)) - return (-1); + NUMCHECK_COMMON(s1, s2); if (d1 == d2) - return (fflag ? wcscasecoll(ep1, ep2) : - wcscoll(ep1, ep2)); + return (_wcscoll(ep1, ep2)); else if ((d1 == NAN) && (d2 != NAN)) return (-1); else if ((d1 != NAN) && (d2 == NAN)) @@ -315,10 +332,7 @@ if ((val = month_score(s1)) == month_score(s2)) { val = (val < 0) ? 0 : wcslen(months[val]); - if (fflag) - return (wcscasecoll(&s1[val], &s2[val])); - else - return (wcscoll(&s1[val], &s2[val])); + return (_wcscoll(&s1[val], &s2[val])); } else { return (month_score(s1) > month_score(s2) ? 1 : -1); } From owner-p4-projects@FreeBSD.ORG Sat Sep 19 23:28:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 512301065679; Sat, 19 Sep 2009 23:28:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 14F5E106566B for ; Sat, 19 Sep 2009 23:28:15 +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 024C08FC12 for ; Sat, 19 Sep 2009 23:28:15 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8JNSEmk047139 for ; Sat, 19 Sep 2009 23:28:14 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8JNSE65047137 for perforce@freebsd.org; Sat, 19 Sep 2009 23:28:14 GMT (envelope-from gabor@freebsd.org) Date: Sat, 19 Sep 2009 23:28:14 GMT Message-Id: <200909192328.n8JNSE65047137@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 168697 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Sep 2009 23:28:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=168697 Change 168697 by gabor@gabor_server on 2009/09/19 23:27:50 - Add a simple regression test to verify GNU compatibility Affected files ... .. //depot/projects/soc2008/gabor_textproc/newsort/regression/Makefile#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/cmp.sh#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/data/test01#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/data/test02#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/data/test03#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/data/test04#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/data/test05#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/data/test06#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/data/test07#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/data/test08#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/data/test09#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/data/test10#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/data/test11#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/data/test12#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/data/test13#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/data/test14#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/data/test15#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/data/test16#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/data/test17#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test01#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test01M#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test01Mr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test01b#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test01bd#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test01f#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test01fr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test01g#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test01gr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test01i#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test01ir#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test01n#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test01nr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test01r#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test02#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test02M#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test02Mr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test02b#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test02bd#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test02f#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test02fr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test02g#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test02gr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test02i#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test02ir#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test02n#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test02nr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test02r#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test03#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test03M#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test03Mr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test03b#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test03bd#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test03f#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test03fr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test03g#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test03gr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test03i#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test03ir#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test03n#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test03nr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test03r#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test04#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test04M#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test04Mr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test04b#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test04bd#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test04f#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test04fr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test04g#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test04gr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test04i#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test04ir#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test04n#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test04nr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test04r#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test05#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test05M#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test05Mr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test05b#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test05bd#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test05f#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test05fr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test05g#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test05gr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test05i#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test05ir#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test05n#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test05nr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test05r#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test06#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test06M#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test06Mr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test06b#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test06bd#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test06f#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test06fr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test06g#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test06gr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test06i#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test06ir#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test06n#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test06nr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test06r#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test07#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test07M#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test07Mr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test07b#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test07bd#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test07f#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test07fr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test07g#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test07gr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test07i#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test07ir#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test07n#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test07nr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test07r#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test08#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test08M#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test08Mr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test08b#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test08bd#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test08f#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test08fr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test08g#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test08gr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test08i#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test08ir#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test08n#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test08nr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test08r#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test09#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test09M#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test09Mr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test09b#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test09bd#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test09f#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test09fr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test09g#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test09gr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test09i#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test09ir#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test09n#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test09nr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test09r#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test10#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test10M#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test10Mr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test10b#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test10bd#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test10f#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test10fr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test10g#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test10gr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test10i#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test10ir#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test10n#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test10nr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test10r#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test11#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test11M#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test11Mr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test11b#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test11bd#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test11f#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test11fr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test11g#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test11gr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test11i#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test11ir#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test11n#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test11nr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test11r#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test12#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test12M#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test12Mr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test12b#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test12bd#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test12f#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test12fr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test12g#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test12gr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test12i#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test12ir#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test12n#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test12nr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test12r#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test13#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test13M#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test13Mr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test13b#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test13bd#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test13f#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test13fr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test13g#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test13gr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test13i#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test13ir#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test13n#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test13nr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test13r#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test14#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test14M#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test14Mr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test14b#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test14bd#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test14f#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test14fr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test14g#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test14gr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test14i#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test14ir#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test14n#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test14nr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test14r#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test15#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test15M#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test15Mr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test15b#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test15bd#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test15f#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test15fr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test15g#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test15gr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test15i#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test15ir#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test15n#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test15nr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test15r#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test16#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test16M#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test16Mr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test16b#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test16bd#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test16f#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test16fr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test16g#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test16gr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test16i#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test16ir#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test16n#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test16nr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test16r#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test17#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test17M#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test17Mr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test17b#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test17bd#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test17f#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test17fr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test17g#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test17gr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test17i#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test17ir#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test17n#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test17nr#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/regression/ref/test17r#1 add Differences ...