From owner-svn-src-stable-7@FreeBSD.ORG Mon Nov 9 11:32:35 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1DCA11065719; Mon, 9 Nov 2009 11:32:35 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DA3AE8FC17; Mon, 9 Nov 2009 11:32:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA9BWYsB019690; Mon, 9 Nov 2009 11:32:34 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA9BWYdG019687; Mon, 9 Nov 2009 11:32:34 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <200911091132.nA9BWYdG019687@svn.freebsd.org> From: Edwin Groothuis Date: Mon, 9 Nov 2009 11:32:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199078 - stable/7/usr.sbin/zic X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Nov 2009 11:32:35 -0000 Author: edwin Date: Mon Nov 9 11:32:34 2009 New Revision: 199078 URL: http://svn.freebsd.org/changeset/base/199078 Log: MFC of 198831, tzcode2009q - Cleanup unnecessary local variables in zdump. - Fix man-page Modified: stable/7/usr.sbin/zic/zdump.c stable/7/usr.sbin/zic/zic.8 Directory Properties: stable/7/usr.sbin/zic/ (props changed) Modified: stable/7/usr.sbin/zic/zdump.c ============================================================================== --- stable/7/usr.sbin/zic/zdump.c Mon Nov 9 11:32:18 2009 (r199077) +++ stable/7/usr.sbin/zic/zdump.c Mon Nov 9 11:32:34 2009 (r199078) @@ -6,7 +6,7 @@ #ifndef lint static const char rcsid[] = "$FreeBSD$"; -static char elsieid[] = "@(#)zdump.c 8.9"; +static char elsieid[] = "@(#)zdump.c 8.10"; #endif /* not lint */ /* @@ -152,7 +152,7 @@ static size_t longest; static char * progname; static int warned; -static void usage(const char *progname, FILE *stream, int status); +static void usage(FILE *stream, int status); static char * abbr(struct tm * tmp); static void abbrok(const char * abbrp, const char * zone); static long delta(struct tm * newp, struct tm * oldp); @@ -273,7 +273,7 @@ char * argv[]; if (strcmp(argv[i], "--version") == 0) { errx(EXIT_SUCCESS, "%s", elsieid); } else if (strcmp(argv[i], "--help") == 0) { - usage(progname, stdout, EXIT_SUCCESS); + usage(stdout, EXIT_SUCCESS); } vflag = 0; cutarg = NULL; @@ -283,7 +283,7 @@ char * argv[]; else cutarg = optarg; if ((c != EOF && c != -1) || (optind == argc - 1 && strcmp(argv[optind], "=") == 0)) { - usage(progname, stderr, EXIT_FAILURE); + usage(stderr, EXIT_FAILURE); } if (vflag) { if (cutarg != NULL) { @@ -468,7 +468,7 @@ const long y; } static void -usage(const char *progname, FILE *stream, int status) +usage(FILE *stream, int status) { fprintf(stream, _("usage: %s [--version] [-v] [--help] [-c [loyear,]hiyear] zonename ...\n\ Modified: stable/7/usr.sbin/zic/zic.8 ============================================================================== --- stable/7/usr.sbin/zic/zic.8 Mon Nov 9 11:32:18 2009 (r199077) +++ stable/7/usr.sbin/zic/zic.8 Mon Nov 9 11:32:34 2009 (r199078) @@ -260,7 +260,7 @@ the variable part is null. .El .Pp A zone line has the form: -.Dl "Zone NAME GMTOFF RULES/SAVE FORMAT [UNTILYEAR [MONTH [DAY [TIME]]]] +.Dl "Zone NAME GMTOFF RULES/SAVE FORMAT [UNTILYEAR [MONTH [DAY [TIME]]]]" For example: .Dl "Zone Australia/Adelaide 9:30 Aus CST 1971 Oct 31 2:00 The fields that make up a zone line are: From owner-svn-src-stable-7@FreeBSD.ORG Tue Nov 10 01:12:01 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 47EB2106566C; Tue, 10 Nov 2009 01:12:01 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1B87F8FC0C; Tue, 10 Nov 2009 01:12:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAA1C0jK041337; Tue, 10 Nov 2009 01:12:01 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAA1C0BZ041334; Tue, 10 Nov 2009 01:12:00 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <200911100112.nAA1C0BZ041334@svn.freebsd.org> From: Xin LI Date: Tue, 10 Nov 2009 01:12:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199126 - stable/7/sys/dev/arcmsr X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Nov 2009 01:12:01 -0000 Author: delphij Date: Tue Nov 10 01:12:00 2009 New Revision: 199126 URL: http://svn.freebsd.org/changeset/base/199126 Log: MFC revision 199069: Initialize the whole message unit's DMA buffer to zero, this fixes a panic during boot when ARC1200 is being used with certain motherboard models. This commit brings the driver to the same state of vendor's 1.20.00.16 release. Many thanks to Areca for their continued support to FreeBSD. Modified: stable/7/sys/dev/arcmsr/arcmsr.c stable/7/sys/dev/arcmsr/arcmsr.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/arcmsr/arcmsr.c ============================================================================== --- stable/7/sys/dev/arcmsr/arcmsr.c Tue Nov 10 00:55:00 2009 (r199125) +++ stable/7/sys/dev/arcmsr/arcmsr.c Tue Nov 10 01:12:00 2009 (r199126) @@ -55,6 +55,8 @@ ** 1.20.00.14 02/05/2007 Erich Chen bug fix for incorrect ccb_h.status report ** and cause g_vfs_done() read write error ** 1.20.00.15 10/10/2007 Erich Chen support new RAID adapter type ARC120x +** 1.20.00.16 10/10/2009 Erich Chen Bug fix for RAID adapter type ARC120x +** bus_dmamem_alloc() with BUS_DMA_ZERO ****************************************************************************************** * $FreeBSD$ */ @@ -2903,7 +2905,7 @@ static u_int32_t arcmsr_initialize(devic } /* Allocation for our srbs */ if(bus_dmamem_alloc(acb->srb_dmat, (void **)&acb->uncacheptr - , BUS_DMA_WAITOK | BUS_DMA_COHERENT, &acb->srb_dmamap) != 0) { + , BUS_DMA_WAITOK | BUS_DMA_COHERENT | BUS_DMA_ZERO, &acb->srb_dmamap) != 0) { bus_dma_tag_destroy(acb->srb_dmat); bus_dma_tag_destroy(acb->dm_segs_dmat); bus_dma_tag_destroy(acb->parent_dmat); Modified: stable/7/sys/dev/arcmsr/arcmsr.h ============================================================================== --- stable/7/sys/dev/arcmsr/arcmsr.h Tue Nov 10 00:55:00 2009 (r199125) +++ stable/7/sys/dev/arcmsr/arcmsr.h Tue Nov 10 01:12:00 2009 (r199126) @@ -37,7 +37,7 @@ ************************************************************************** * $FreeBSD$ */ -#define ARCMSR_DRIVER_VERSION "Driver Version 1.20.00.15 2007-10-07" +#define ARCMSR_DRIVER_VERSION "Driver Version 1.20.00.16 2009-10-10" #define ARCMSR_SCSI_INITIATOR_ID 255 #define ARCMSR_DEV_SECTOR_SIZE 512 #define ARCMSR_MAX_XFER_SECTORS 4096 From owner-svn-src-stable-7@FreeBSD.ORG Tue Nov 10 22:56:06 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F400F106566B; Tue, 10 Nov 2009 22:56:05 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E25358FC1A; Tue, 10 Nov 2009 22:56:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAAMu5XA074399; Tue, 10 Nov 2009 22:56:05 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAAMu5VG074391; Tue, 10 Nov 2009 22:56:05 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <200911102256.nAAMu5VG074391@svn.freebsd.org> From: Alexander Motin Date: Tue, 10 Nov 2009 22:56:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199159 - in stable/7/sys: conf dev/ata X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Nov 2009 22:56:06 -0000 Author: mav Date: Tue Nov 10 22:56:05 2009 New Revision: 199159 URL: http://svn.freebsd.org/changeset/base/199159 Log: MFC r188740, r198486, r199050: Increase ATA command timeouts. Introduce define and kernel option ATA_REQUEST_TIMEOUT to control it. PR: kern/111023 Modified: stable/7/sys/conf/NOTES stable/7/sys/conf/options stable/7/sys/dev/ata/ata-all.h stable/7/sys/dev/ata/ata-disk.c stable/7/sys/dev/ata/ata-queue.c stable/7/sys/dev/ata/ata-raid.c stable/7/sys/dev/ata/atapi-cd.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/conf/NOTES ============================================================================== --- stable/7/sys/conf/NOTES Tue Nov 10 22:37:44 2009 (r199158) +++ stable/7/sys/conf/NOTES Tue Nov 10 22:56:05 2009 (r199159) @@ -1621,8 +1621,11 @@ hint.ata.1.irq="15" # # ATA_STATIC_ID: controller numbering is static ie depends on location # else the device numbers are dynamically allocated. +# ATA_REQUEST_TIMEOUT: the number of seconds to wait for an ATA request +# before timing out. options ATA_STATIC_ID +#options ATA_REQUEST_TIMEOUT=10 # # Standard floppy disk controllers and floppy tapes, supports Modified: stable/7/sys/conf/options ============================================================================== --- stable/7/sys/conf/options Tue Nov 10 22:37:44 2009 (r199158) +++ stable/7/sys/conf/options Tue Nov 10 22:56:05 2009 (r199159) @@ -338,6 +338,7 @@ ISCSI_INITIATOR_DEBUG opt_iscsi_initiato # Options used in the 'ata' ATA/ATAPI driver ATA_STATIC_ID opt_ata.h ATA_NOPCI opt_ata.h +ATA_REQUEST_TIMEOUT opt_ata.h # Net stuff. ACCEPT_FILTER_DATA Modified: stable/7/sys/dev/ata/ata-all.h ============================================================================== --- stable/7/sys/dev/ata/ata-all.h Tue Nov 10 22:37:44 2009 (r199158) +++ stable/7/sys/dev/ata/ata-all.h Tue Nov 10 22:56:05 2009 (r199159) @@ -308,6 +308,10 @@ struct ata_ahci_cmd_list { #define ATA_OP_FINISHED 1 #define ATA_MAX_28BIT_LBA 268435455UL +#ifndef ATA_REQUEST_TIMEOUT +#define ATA_REQUEST_TIMEOUT 10 +#endif + /* structure used for composite atomic operations */ #define MAX_COMPOSITES 32 /* u_int32_t bits */ struct ata_composite { Modified: stable/7/sys/dev/ata/ata-disk.c ============================================================================== --- stable/7/sys/dev/ata/ata-disk.c Tue Nov 10 22:37:44 2009 (r199158) +++ stable/7/sys/dev/ata/ata-disk.c Tue Nov 10 22:56:05 2009 (r199159) @@ -259,7 +259,7 @@ ad_spindown(void *priv) } request->flags = ATA_R_CONTROL; request->dev = dev; - request->timeout = 5; + request->timeout = ATA_REQUEST_TIMEOUT; request->retries = 1; request->callback = ad_power_callback; request->u.ata.command = ATA_STANDBY_IMMEDIATE; @@ -291,9 +291,9 @@ ad_strategy(struct bio *bp) if (atadev->spindown_state) { device_printf(dev, "request while spun down, starting.\n"); atadev->spindown_state = 0; - request->timeout = 31; + request->timeout = MAX(ATA_REQUEST_TIMEOUT, 31); } else { - request->timeout = 5; + request->timeout = ATA_REQUEST_TIMEOUT; } request->retries = 2; request->data = bp->bio_data; Modified: stable/7/sys/dev/ata/ata-queue.c ============================================================================== --- stable/7/sys/dev/ata/ata-queue.c Tue Nov 10 22:37:44 2009 (r199158) +++ stable/7/sys/dev/ata/ata-queue.c Tue Nov 10 22:56:05 2009 (r199159) @@ -119,6 +119,7 @@ int ata_controlcmd(device_t dev, u_int8_t command, u_int16_t feature, u_int64_t lba, u_int16_t count) { + struct ata_device *atadev = device_get_softc(dev); struct ata_request *request = ata_alloc_request(); int error = ENOMEM; @@ -129,7 +130,13 @@ ata_controlcmd(device_t dev, u_int8_t co request->u.ata.count = count; request->u.ata.feature = feature; request->flags = ATA_R_CONTROL; - request->timeout = 1; + if (atadev->spindown_state) { + device_printf(dev, "request while spun down, starting.\n"); + atadev->spindown_state = 0; + request->timeout = MAX(ATA_REQUEST_TIMEOUT, 31); + } else { + request->timeout = ATA_REQUEST_TIMEOUT; + } request->retries = 0; ata_queue_request(request); error = request->result; @@ -389,7 +396,7 @@ ata_completed(void *context, int dummy) request->bytecount = sizeof(struct atapi_sense); request->donecount = 0; request->transfersize = sizeof(struct atapi_sense); - request->timeout = 5; + request->timeout = ATA_REQUEST_TIMEOUT; request->flags &= (ATA_R_ATAPI | ATA_R_QUIET | ATA_R_DEBUG); request->flags |= (ATA_R_READ | ATA_R_AT_HEAD | ATA_R_REQUEUE); ATA_DEBUG_RQ(request, "autoissue request sense"); Modified: stable/7/sys/dev/ata/ata-raid.c ============================================================================== --- stable/7/sys/dev/ata/ata-raid.c Tue Nov 10 22:37:44 2009 (r199158) +++ stable/7/sys/dev/ata/ata-raid.c Tue Nov 10 22:56:05 2009 (r199159) @@ -273,7 +273,7 @@ ata_raid_flush(struct bio *bp) request->u.ata.lba = 0; request->u.ata.count = 0; request->u.ata.feature = 0; - request->timeout = 1; + request->timeout = ATA_REQUEST_TIMEOUT; request->retries = 0; request->flags |= ATA_R_ORDERED | ATA_R_DIRECT; ata_queue_request(request); @@ -4358,7 +4358,7 @@ ata_raid_init_request(struct ar_softc *r printf("FAILURE - out of memory in ata_raid_init_request\n"); return NULL; } - request->timeout = 5; + request->timeout = ATA_REQUEST_TIMEOUT; request->retries = 2; request->callback = ata_raid_done; request->driver = rdp; @@ -4432,7 +4432,7 @@ ata_raid_rw(device_t dev, u_int64_t lba, /* setup request */ request->dev = dev; - request->timeout = 10; + request->timeout = ATA_REQUEST_TIMEOUT; request->retries = 0; request->data = data; request->bytecount = bcount; Modified: stable/7/sys/dev/ata/atapi-cd.c ============================================================================== --- stable/7/sys/dev/ata/atapi-cd.c Tue Nov 10 22:37:44 2009 (r199158) +++ stable/7/sys/dev/ata/atapi-cd.c Tue Nov 10 22:56:05 2009 (r199159) @@ -703,7 +703,7 @@ acd_geom_access(struct g_provider *pp, i request->dev = dev; bcopy(ccb, request->u.atapi.ccb, 16); request->flags = ATA_R_ATAPI; - request->timeout = 5; + request->timeout = ATA_REQUEST_TIMEOUT; ata_queue_request(request); if (!request->error && (request->u.atapi.sense.key == 2 || From owner-svn-src-stable-7@FreeBSD.ORG Tue Nov 10 23:03:51 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E0BF106566C; Tue, 10 Nov 2009 23:03:51 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6D90A8FC24; Tue, 10 Nov 2009 23:03:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAAN3pNv074613; Tue, 10 Nov 2009 23:03:51 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAAN3peE074611; Tue, 10 Nov 2009 23:03:51 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <200911102303.nAAN3peE074611@svn.freebsd.org> From: Alexander Motin Date: Tue, 10 Nov 2009 23:03:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199160 - stable/7/sys/dev/ata X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Nov 2009 23:03:51 -0000 Author: mav Date: Tue Nov 10 23:03:51 2009 New Revision: 199160 URL: http://svn.freebsd.org/changeset/base/199160 Log: MFC r198488: Report SATA speeds to CAM, to not confuse users with low numbers logged. Modified: stable/7/sys/dev/ata/atapi-cam.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/ata/atapi-cam.c ============================================================================== --- stable/7/sys/dev/ata/atapi-cam.c Tue Nov 10 22:56:05 2009 (r199159) +++ stable/7/sys/dev/ata/atapi-cam.c Tue Nov 10 23:03:51 2009 (r199160) @@ -414,6 +414,12 @@ atapi_action(struct cam_sim *sim, union case ATA_UDMA6: cpi->base_transfer_speed = 133000; break; + case ATA_SA150: + cpi->base_transfer_speed = 150000; + break; + case ATA_SA300: + cpi->base_transfer_speed = 300000; + break; default: break; } From owner-svn-src-stable-7@FreeBSD.ORG Wed Nov 11 19:00:12 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A5A141065670; Wed, 11 Nov 2009 19:00:12 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 93E2B8FC1A; Wed, 11 Nov 2009 19:00:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nABJ0C29003915; Wed, 11 Nov 2009 19:00:12 GMT (envelope-from np@svn.freebsd.org) Received: (from np@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nABJ0CEq003913; Wed, 11 Nov 2009 19:00:12 GMT (envelope-from np@svn.freebsd.org) Message-Id: <200911111900.nABJ0CEq003913@svn.freebsd.org> From: Navdeep Parhar Date: Wed, 11 Nov 2009 19:00:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199191 - stable/7/lib/libdwarf X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Nov 2009 19:00:12 -0000 Author: np Date: Wed Nov 11 19:00:12 2009 New Revision: 199191 URL: http://svn.freebsd.org/changeset/base/199191 Log: MFC r195747 Modified: stable/7/lib/libdwarf/dwarf_loc.c Directory Properties: stable/7/lib/libdwarf/ (props changed) Modified: stable/7/lib/libdwarf/dwarf_loc.c ============================================================================== --- stable/7/lib/libdwarf/dwarf_loc.c Wed Nov 11 18:28:12 2009 (r199190) +++ stable/7/lib/libdwarf/dwarf_loc.c Wed Nov 11 19:00:12 2009 (r199191) @@ -236,7 +236,7 @@ dwarf_op_num(uint8_t pointer_size, uint8 case DW_OP_plus_uconst: case DW_OP_regx: case DW_OP_piece: - uval = dwarf_decode_sleb128(&p); + uval = dwarf_decode_uleb128(&p); break; /* Operations with a signed LEB128 operand. */ @@ -458,7 +458,7 @@ dwarf_loc_fill(Dwarf_Locdesc *lbuf, uint case DW_OP_plus_uconst: case DW_OP_regx: case DW_OP_piece: - operand1 = dwarf_decode_sleb128(&p); + operand1 = dwarf_decode_uleb128(&p); break; /* Operations with a signed LEB128 operand. */ From owner-svn-src-stable-7@FreeBSD.ORG Thu Nov 12 10:44:26 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1CE6C1065696; Thu, 12 Nov 2009 10:44:26 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0AF6D8FC08; Thu, 12 Nov 2009 10:44:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nACAiPdq028084; Thu, 12 Nov 2009 10:44:25 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nACAiP7E028082; Thu, 12 Nov 2009 10:44:25 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <200911121044.nACAiP7E028082@svn.freebsd.org> From: Edwin Groothuis Date: Thu, 12 Nov 2009 10:44:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199217 - stable/7/share/zoneinfo X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Nov 2009 10:44:26 -0000 Author: edwin Date: Thu Nov 12 10:44:25 2009 New Revision: 199217 URL: http://svn.freebsd.org/changeset/base/199217 Log: MFC of r199107, tzdata2009r: - Three Australian stations in Antarctica have changed their time zone: Casey moved from UTC+8 to UTC+11 Davis moved from UTC+7 to UTC+5 Mawson moved from UTC+6 to UTC+5 The changes occurred on 2009-10-18 at 02:00 (local times). Modified: stable/7/share/zoneinfo/antarctica Directory Properties: stable/7/share/zoneinfo/ (props changed) Modified: stable/7/share/zoneinfo/antarctica ============================================================================== --- stable/7/share/zoneinfo/antarctica Thu Nov 12 10:44:18 2009 (r199216) +++ stable/7/share/zoneinfo/antarctica Thu Nov 12 10:44:25 2009 (r199217) @@ -1,5 +1,5 @@ # 
-# @(#)antarctica	8.5
+# @(#)antarctica	8.6
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -80,15 +80,38 @@ Rule	ChileAQ	2000	max	-	Mar	Sun>=9	3:00u
 # Davis, Vestfold Hills, -6835+07759, since 1957-01-13
 #	(except 1964-11 - 1969-02)
 # Mawson, Holme Bay, -6736+06253, since 1954-02-13
+
+# From Steffen Thorsen (2009-03-11):
+# Three Australian stations in Antarctica have changed their time zone:
+# Casey moved from UTC+8 to UTC+11
+# Davis moved from UTC+7 to UTC+5
+# Mawson moved from UTC+6 to UTC+5
+# The changes occurred on 2009-10-18 at 02:00 (local times).
+#
+# Government source: (Australian Antarctic Division)
+# 
+# http://www.aad.gov.au/default.asp?casid=37079
+# 
+#
+# We have more background information here:
+# 
+# http://www.timeanddate.com/news/time/antarctica-new-times.html
+# 
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Antarctica/Casey	0	-	zzz	1969
-			8:00	-	WST	# Western (Aus) Standard Time
+			8:00	-	WST	2009 Oct 18 2:00
+						# Western (Aus) Standard Time
+			11:00	-	CAST	# Casey Time
 Zone Antarctica/Davis	0	-	zzz	1957 Jan 13
 			7:00	-	DAVT	1964 Nov # Davis Time
 			0	-	zzz	1969 Feb
-			7:00	-	DAVT
+			7:00	-	DAVT	2009 Oct 18 2:0
+			5:00	-	DAVT
 Zone Antarctica/Mawson	0	-	zzz	1954 Feb 13
-			6:00	-	MAWT	# Mawson Time
+			6:00	-	MAWT	2009 Oct 18 2:00
+						# Mawson Time
+			5:00	-	MAWT
 # References:
 # 
 # Casey Weather (1998-02-26)

From owner-svn-src-stable-7@FreeBSD.ORG  Thu Nov 12 14:27:10 2009
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 297711065694;
	Thu, 12 Nov 2009 14:27:10 +0000 (UTC)
	(envelope-from netchild@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 17BA38FC16;
	Thu, 12 Nov 2009 14:27:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nACER9R9032829;
	Thu, 12 Nov 2009 14:27:09 GMT
	(envelope-from netchild@svn.freebsd.org)
Received: (from netchild@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nACER93X032827;
	Thu, 12 Nov 2009 14:27:09 GMT
	(envelope-from netchild@svn.freebsd.org)
Message-Id: <200911121427.nACER93X032827@svn.freebsd.org>
From: Alexander Leidinger 
Date: Thu, 12 Nov 2009 14:27:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199224 - stable/7/sys/compat/linux
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 12 Nov 2009 14:27:10 -0000

Author: netchild
Date: Thu Nov 12 14:27:09 2009
New Revision: 199224
URL: http://svn.freebsd.org/changeset/base/199224

Log:
  MFC r198945:
    Fix typo in kernel message. The fix is based upon the patch in the PR.
  
    PR:		kern/140279
    Submitted by:	Alexander Best 

Modified:
  stable/7/sys/compat/linux/linux_ipc.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/compat/linux/linux_ipc.c
==============================================================================
--- stable/7/sys/compat/linux/linux_ipc.c	Thu Nov 12 14:22:12 2009	(r199223)
+++ stable/7/sys/compat/linux/linux_ipc.c	Thu Nov 12 14:27:09 2009	(r199224)
@@ -856,7 +856,7 @@ linux_shmctl(struct thread *td, struct l
     case LINUX_SHM_LOCK:
     case LINUX_SHM_UNLOCK:
     default:
-	linux_msg(td, "ipc typ=%d not implemented", args->cmd & ~LINUX_IPC_64);
+	linux_msg(td, "ipc type %d not implemented", args->cmd & ~LINUX_IPC_64);
 	return EINVAL;
     }
 }

From owner-svn-src-stable-7@FreeBSD.ORG  Sat Nov 14 18:53:44 2009
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C32A71065670;
	Sat, 14 Nov 2009 18:53:44 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B1A4A8FC12;
	Sat, 14 Nov 2009 18:53:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAEIriLE010423;
	Sat, 14 Nov 2009 18:53:44 GMT (envelope-from rnoland@svn.freebsd.org)
Received: (from rnoland@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAEIriJA010422;
	Sat, 14 Nov 2009 18:53:44 GMT (envelope-from rnoland@svn.freebsd.org)
Message-Id: <200911141853.nAEIriJA010422@svn.freebsd.org>
From: Robert Noland 
Date: Sat, 14 Nov 2009 18:53:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199276 - stable/7/sys/cddl/boot/zfs
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Sat, 14 Nov 2009 18:53:44 -0000

Author: rnoland
Date: Sat Nov 14 18:53:44 2009
New Revision: 199276
URL: http://svn.freebsd.org/changeset/base/199276

Log:
  MFC r199241
  
  This patch addresses an overflow in the the zfs boot code and allows
  users to boot from zfs raidz volumes.  This has been tested by a number
  of users and does not impact those which are not booting from zfs raidz
  volumes.
  
  Submitted by:	Matt Reimer 

Modified:
  stable/7/sys/cddl/boot/zfs/zfssubr.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/cddl/boot/zfs/zfssubr.c
==============================================================================
--- stable/7/sys/cddl/boot/zfs/zfssubr.c	Sat Nov 14 18:42:09 2009	(r199275)
+++ stable/7/sys/cddl/boot/zfs/zfssubr.c	Sat Nov 14 18:53:44 2009	(r199276)
@@ -550,7 +550,8 @@ vdev_raidz_read(vdev_t *vdev, const blkp
 	uint64_t s = psize >> unit_shift;
 	uint64_t f = b % dcols;
 	uint64_t o = (b / dcols) << unit_shift;
-	int q, r, c, c1, bc, col, acols, coff, devidx, asize, n;
+	uint64_t q, r, coff;
+	int c, c1, bc, col, acols, devidx, asize, n;
 	static raidz_col_t cols[16];
 	raidz_col_t *rc, *rc1;