svn commit: r199314 - stable/8/lib/libc/gen
Author: brueffer Date: Mon Nov 16 08:26:56 2009 New Revision: 199314 URL: http://svn.freebsd.org/changeset/base/199314 Log: MFC: r199046 Fix a copy+paste error by checking the correct variable against MM_NULLACT. Modified: stable/8/lib/libc/gen/fmtmsg.c Directory Properties: stable/8/lib/libc/ (props changed) stable/8/lib/libc/stdtime/ (props changed) Modified: stable/8/lib/libc/gen/fmtmsg.c == --- stable/8/lib/libc/gen/fmtmsg.c Mon Nov 16 06:12:49 2009 (r199313) +++ stable/8/lib/libc/gen/fmtmsg.c Mon Nov 16 08:26:56 2009 (r199314) @@ -128,7 +128,7 @@ printfmt(char *msgverb, long class, cons size += strlen(sevname); if (text != MM_NULLTXT) size += strlen(text); - if (text != MM_NULLACT) + if (act != MM_NULLACT) size += strlen(act); if (tag != MM_NULLTAG) size += strlen(tag); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r199315 - stable/7/lib/libc/gen
Author: brueffer Date: Mon Nov 16 08:27:54 2009 New Revision: 199315 URL: http://svn.freebsd.org/changeset/base/199315 Log: MFC: r199046 Fix a copy+paste error by checking the correct variable against MM_NULLACT. Modified: stable/7/lib/libc/gen/fmtmsg.c Directory Properties: stable/7/lib/libc/ (props changed) Modified: stable/7/lib/libc/gen/fmtmsg.c == --- stable/7/lib/libc/gen/fmtmsg.c Mon Nov 16 08:26:56 2009 (r199314) +++ stable/7/lib/libc/gen/fmtmsg.c Mon Nov 16 08:27:54 2009 (r199315) @@ -128,7 +128,7 @@ printfmt(char *msgverb, long class, cons size += strlen(sevname); if (text != MM_NULLTXT) size += strlen(text); - if (text != MM_NULLACT) + if (act != MM_NULLACT) size += strlen(act); if (tag != MM_NULLTAG) size += strlen(tag); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r199316 - stable/6/lib/libc/gen
Author: brueffer Date: Mon Nov 16 08:32:13 2009 New Revision: 199316 URL: http://svn.freebsd.org/changeset/base/199316 Log: MFC: r199046 Fix a copy+paste error by checking the correct variable against MM_NULLACT. Modified: stable/6/lib/libc/gen/fmtmsg.c Directory Properties: stable/6/lib/libc/ (props changed) Modified: stable/6/lib/libc/gen/fmtmsg.c == --- stable/6/lib/libc/gen/fmtmsg.c Mon Nov 16 08:27:54 2009 (r199315) +++ stable/6/lib/libc/gen/fmtmsg.c Mon Nov 16 08:32:13 2009 (r199316) @@ -128,7 +128,7 @@ printfmt(char *msgverb, long class, cons size += strlen(sevname); if (text != MM_NULLTXT) size += strlen(text); - if (text != MM_NULLACT) + if (act != MM_NULLACT) size += strlen(act); if (tag != MM_NULLTAG) size += strlen(tag); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r199317 - head/lib/libc/posix1e
Author: brueffer Date: Mon Nov 16 09:28:22 2009 New Revision: 199317 URL: http://svn.freebsd.org/changeset/base/199317 Log: Fix a memory leak in acl_from_text() in case the conversion succeeded. Submitted by: Jim Wilcoxson MFC after:1 week Modified: head/lib/libc/posix1e/acl_from_text.c Modified: head/lib/libc/posix1e/acl_from_text.c == --- head/lib/libc/posix1e/acl_from_text.c Mon Nov 16 08:32:13 2009 (r199316) +++ head/lib/libc/posix1e/acl_from_text.c Mon Nov 16 09:28:22 2009 (r199317) @@ -257,6 +257,7 @@ acl_from_text(const char *buf_p) } #endif + free(mybuf_p); return(acl); error_label: ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r199319 - head/sys/amd64/include
Author: phk Date: Mon Nov 16 10:53:04 2009 New Revision: 199319 URL: http://svn.freebsd.org/changeset/base/199319 Log: Uppercase the UL suffix on a constant, so Flexelint doesn't worry that 'u1' might have been intended. No, that does not make sense and yes I have told them. Modified: head/sys/amd64/include/param.h Modified: head/sys/amd64/include/param.h == --- head/sys/amd64/include/param.h Mon Nov 16 09:37:30 2009 (r199318) +++ head/sys/amd64/include/param.h Mon Nov 16 10:53:04 2009 (r199319) @@ -105,7 +105,7 @@ #defineNPML4EPG(PAGE_SIZE/(sizeof (pml4_entry_t))) #defineNPML4EPGSHIFT 9 /* LOG2(NPML4EPG) */ #definePML4SHIFT 39 /* LOG2(NBPML4) */ -#defineNBPML4 (1ul
svn commit: r199320 - head/lib/libc/locale
Author: brueffer Date: Mon Nov 16 14:33:31 2009 New Revision: 199320 URL: http://svn.freebsd.org/changeset/base/199320 Log: Fix grammar. PR: 140459 Submitted by: Jeremy Huddleston MFC after:1 week Modified: head/lib/libc/locale/nl_langinfo.3 Modified: head/lib/libc/locale/nl_langinfo.3 == --- head/lib/libc/locale/nl_langinfo.3 Mon Nov 16 10:53:04 2009 (r199319) +++ head/lib/libc/locale/nl_langinfo.3 Mon Nov 16 14:33:31 2009 (r199320) @@ -53,7 +53,7 @@ with a category corresponding to the cat or to the category .Dv LC_ALL , -may overwrite buffer pointed by the return value. +may overwrite the buffer pointed to by the return value. .Sh RETURN VALUES In a locale where langinfo data is not defined, .Fn nl_langinfo ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r199321 - head/sys/cam/ata
Author: mav
Date: Mon Nov 16 15:18:02 2009
New Revision: 199321
URL: http://svn.freebsd.org/changeset/base/199321
Log:
Disable PortMultiplier Async Notifications for time of ports reset.
They are useless at that time, but confuse Marvell AHCI.
Add quirk for SiI57XX Port Multipliers, to hide extra port.
Modified:
head/sys/cam/ata/ata_pmp.c
Modified: head/sys/cam/ata/ata_pmp.c
==
--- head/sys/cam/ata/ata_pmp.c Mon Nov 16 14:33:31 2009(r199320)
+++ head/sys/cam/ata/ata_pmp.c Mon Nov 16 15:18:02 2009(r199321)
@@ -63,11 +63,12 @@ __FBSDID("$FreeBSD$");
typedef enum {
PMP_STATE_NORMAL,
PMP_STATE_PORTS,
- PMP_STATE_CONFIG,
+ PMP_STATE_PRECONFIG,
PMP_STATE_RESET,
PMP_STATE_CONNECT,
PMP_STATE_CHECK,
PMP_STATE_CLEAR,
+ PMP_STATE_CONFIG,
PMP_STATE_SCAN
} pmp_state;
@@ -436,7 +437,7 @@ pmpstart(struct cam_periph *periph, unio
pmp_default_timeout * 1000);
ata_pm_read_cmd(ataio, 2, 15);
break;
- case PMP_STATE_CONFIG:
+ case PMP_STATE_PRECONFIG:
cam_fill_ataio(ataio,
pmp_retry_count,
pmpdone,
@@ -445,7 +446,7 @@ pmpstart(struct cam_periph *periph, unio
/*data_ptr*/NULL,
/*dxfer_len*/0,
pmp_default_timeout * 1000);
- ata_pm_write_cmd(ataio, 0x60, 15, 0xf);
+ ata_pm_write_cmd(ataio, 0x60, 15, 0x0);
break;
case PMP_STATE_RESET:
cam_fill_ataio(ataio,
@@ -495,6 +496,17 @@ printf("PM RESET %d%s\n", softc->pm_step
pmp_default_timeout * 1000);
ata_pm_write_cmd(ataio, 1, softc->pm_step, 0x);
break;
+ case PMP_STATE_CONFIG:
+ cam_fill_ataio(ataio,
+ pmp_retry_count,
+ pmpdone,
+ /*flags*/CAM_DIR_NONE,
+ 0,
+ /*data_ptr*/NULL,
+ /*dxfer_len*/0,
+ pmp_default_timeout * 1000);
+ ata_pm_write_cmd(ataio, 0x60, 15, 0xf);
+ break;
default:
break;
}
@@ -554,24 +566,29 @@ pmpdone(struct cam_periph *periph, union
(done_ccb->ataio.res.lba_mid << 16) +
(done_ccb->ataio.res.lba_low << 8) +
done_ccb->ataio.res.sector_count;
- /* This PM declares 6 ports, while only 5 of them are real.
+ /* This PMP declares 6 ports, while only 5 of them are real.
* Port 5 is enclosure management bridge port, which has
implementation
* problems, causing probe faults. Hide it for now. */
if (softc->pm_pid == 0x37261095 && softc->pm_ports == 6)
softc->pm_ports = 5;
- /* This PM declares 7 ports, while only 5 of them are real.
+ /* This PMP declares 7 ports, while only 5 of them are real.
* Port 5 is some fake "Config Disk" with 640 sectors size,
* port 6 is enclosure management bridge port.
* Both fake ports has implementation problems, causing
* probe faults. Hide them for now. */
if (softc->pm_pid == 0x47261095 && softc->pm_ports == 7)
softc->pm_ports = 5;
+ /* These PMPs declare one more port then actually have,
+* for configuration purposes. Hide it for now. */
+ if (softc->pm_pid == 0x57231095 || softc->pm_pid == 0x57331095
||
+ softc->pm_pid == 0x57341095 || softc->pm_pid == 0x57441095)
+ softc->pm_ports--;
printf("PM ports: %d\n", softc->pm_ports);
- softc->state = PMP_STATE_CONFIG;
+ softc->state = PMP_STATE_PRECONFIG;
xpt_release_ccb(done_ccb);
xpt_schedule(periph, priority);
return;
- case PMP_STATE_CONFIG:
+ case PMP_STATE_PRECONFIG:
softc->pm_step = 0;
softc->state = PMP_STATE_RESET;
softc->reset |= ~softc->found;
@@ -658,11 +675,15 @@ pmpdone(struct cam_periph *periph, union
return;
case PMP_STATE_CLEAR:
softc->pm_step++;
- if (softc->pm_step < softc->pm_ports) {
- xpt_release_ccb(done_ccb);
- xpt_schedule(periph, priority);
- return;
- } else if (softc->found) {
+ if (softc->pm_step >= softc->pm_ports) {
+ softc->state = PMP_STATE_CONFIG;
+ softc->pm_step = 0;
+ }
+ xpt_release_ccb(done_ccb);
svn commit: r199322 - in head/sys/dev: ahci ata ata/chipsets
Author: mav
Date: Mon Nov 16 15:38:27 2009
New Revision: 199322
URL: http://svn.freebsd.org/changeset/base/199322
Log:
Change the way in which AHCI+PATA combined controllers, such as JMicron
and Marvell handled. Instead of trying to attach two different drivers to
single device, wrapping each call, make one of them (atajmicron, atamarvell)
attach do device solely, but create child device for AHCI driver,
passing it all required resources. It is quite easy, as none of
resources are shared, except IRQ.
As result, it:
- makes drivers operation more independent and straitforward,
- allows to use new ahci(4) driver with such devices, adding support for
new features, such as PMP and NCQ, same time keeping legacy PATA support,
- will allow to just drop old ataahci driver, when it's time come.
Modified:
head/sys/dev/ahci/ahci.c
head/sys/dev/ahci/ahci.h
head/sys/dev/ata/ata-pci.c
head/sys/dev/ata/ata-pci.h
head/sys/dev/ata/chipsets/ata-ahci.c
head/sys/dev/ata/chipsets/ata-jmicron.c
head/sys/dev/ata/chipsets/ata-marvell.c
Modified: head/sys/dev/ahci/ahci.c
==
--- head/sys/dev/ahci/ahci.cMon Nov 16 15:18:02 2009(r199321)
+++ head/sys/dev/ahci/ahci.cMon Nov 16 15:38:27 2009(r199322)
@@ -99,7 +99,14 @@ MALLOC_DEFINE(M_AHCI, "AHCI driver", "AH
static struct {
uint32_tid;
const char *name;
- int flags;
+ int quirks;
+#define AHCI_Q_NOFORCE 1
+#define AHCI_Q_NOPMP 2
+#define AHCI_Q_NONCQ 4
+#define AHCI_Q_1CH 8
+#define AHCI_Q_2CH 16
+#define AHCI_Q_4CH 32
+#define AHCI_Q_EDGEIS 64
} ahci_ids[] = {
{0x43801002, "ATI IXP600", 0},
{0x43901002, "ATI IXP700", 0},
@@ -145,6 +152,15 @@ static struct {
{0x3b2b8086, "Intel PCH", 0},
{0x3b2c8086, "Intel PCH", 0},
{0x3b2f8086, "Intel PCH", 0},
+ {0x2361197b, "JMicron JMB361", AHCI_Q_NOFORCE},
+ {0x2363197b, "JMicron JMB363", AHCI_Q_NOFORCE},
+ {0x2365197b, "JMicron JMB365", AHCI_Q_NOFORCE},
+ {0x2366197b, "JMicron JMB366", AHCI_Q_NOFORCE},
+ {0x2368197b, "JMicron JMB368", AHCI_Q_NOFORCE},
+ {0x61ab, "Marvell 88SX6111",
AHCI_Q_NOFORCE|AHCI_Q_1CH|AHCI_Q_EDGEIS},
+ {0x612111ab, "Marvell 88SX6121",
AHCI_Q_NOFORCE|AHCI_Q_2CH|AHCI_Q_EDGEIS},
+ {0x614111ab, "Marvell 88SX6141",
AHCI_Q_NOFORCE|AHCI_Q_4CH|AHCI_Q_EDGEIS},
+ {0x614511ab, "Marvell 88SX6145",
AHCI_Q_NOFORCE|AHCI_Q_4CH|AHCI_Q_EDGEIS},
{0x044c10de, "NVIDIA MCP65",0},
{0x044d10de, "NVIDIA MCP65",0},
{0x044e10de, "NVIDIA MCP65",0},
@@ -226,9 +242,39 @@ static int
ahci_probe(device_t dev)
{
char buf[64];
+ int i, valid = 0;
+ uint32_t devid = pci_get_devid(dev);
+
+ /* Is this a possible AHCI candidate? */
+ if (pci_get_class(dev) == PCIC_STORAGE &&
+ pci_get_subclass(dev) == PCIS_STORAGE_SATA &&
+ pci_get_progif(dev) == PCIP_STORAGE_SATA_AHCI_1_0)
+ valid = 1;
+ /* Is this a known AHCI chip? */
+ for (i = 0; ahci_ids[i].id != 0; i++) {
+ if (ahci_ids[i].id == devid &&
+ (valid || !(ahci_ids[i].quirks & AHCI_Q_NOFORCE))) {
+ snprintf(buf, sizeof(buf), "%s AHCI SATA controller",
+ ahci_ids[i].name);
+ device_set_desc_copy(dev, buf);
+ return (BUS_PROBE_VENDOR);
+ }
+ }
+ if (!valid)
+ return (ENXIO);
+ device_set_desc_copy(dev, "AHCI SATA controller");
+ return (BUS_PROBE_VENDOR);
+}
+
+static int
+ahci_ata_probe(device_t dev)
+{
+ char buf[64];
int i;
uint32_t devid = pci_get_devid(dev);
+ if ((intptr_t)device_get_ivars(dev) >= 0)
+ return (ENXIO);
/* Is this a known AHCI chip? */
for (i = 0; ahci_ids[i].id != 0; i++) {
if (ahci_ids[i].id == devid) {
@@ -238,11 +284,6 @@ ahci_probe(device_t dev)
return (BUS_PROBE_VENDOR);
}
}
- /* Is this a possible AHCI candidate? */
- if (pci_get_class(dev) != PCIC_STORAGE ||
- pci_get_subclass(dev) != PCIS_STORAGE_SATA ||
- pci_get_progif(dev) != PCIP_STORAGE_SATA_AHCI_1_0)
- return (ENXIO);
device_set_desc_copy(dev, "AHCI SATA controller");
return (BUS_PROBE_VENDOR);
}
@@ -252,10 +293,15 @@ ahci_attach(device_t dev)
{
struct ahci_controller *ctlr = device_get_softc(dev);
device_t child;
- int error, unit, speed;
+ int error, unit, speed, i;
+ uint32_t devid = pci_get_devid(dev);
u_int32_t version;
ctlr->dev = dev;
+ i = 0;
+ while (ahci_ids[i].id != 0 && ahci_ids[i].id != devid)
+ i++;
+
svn commit: r199323 - in vendor-sys/acpica/dist: . compiler debugger dispatcher events executer include namespace parser tools/acpiexec tools/acpisrc tools/acpixtract utilities
Author: jkim Date: Mon Nov 16 18:28:41 2009 New Revision: 199323 URL: http://svn.freebsd.org/changeset/base/199323 Log: Import ACPICA 20091112. Added: vendor-sys/acpica/dist/namespace/nsrepair2.c (contents, props changed) Modified: vendor-sys/acpica/dist/changes.txt vendor-sys/acpica/dist/compiler/aslcompile.c vendor-sys/acpica/dist/compiler/aslerror.c vendor-sys/acpica/dist/compiler/asllookup.c vendor-sys/acpica/dist/compiler/asloperands.c vendor-sys/acpica/dist/compiler/asltransform.c vendor-sys/acpica/dist/compiler/asltypes.h vendor-sys/acpica/dist/debugger/dbcmds.c vendor-sys/acpica/dist/debugger/dbexec.c vendor-sys/acpica/dist/debugger/dbstats.c vendor-sys/acpica/dist/dispatcher/dsinit.c vendor-sys/acpica/dist/dispatcher/dsmthdat.c vendor-sys/acpica/dist/dispatcher/dsobject.c vendor-sys/acpica/dist/events/evgpeblk.c vendor-sys/acpica/dist/events/evregion.c vendor-sys/acpica/dist/executer/exconfig.c vendor-sys/acpica/dist/executer/exconvrt.c vendor-sys/acpica/dist/executer/exfield.c vendor-sys/acpica/dist/executer/exoparg1.c vendor-sys/acpica/dist/executer/exoparg6.c vendor-sys/acpica/dist/executer/exregion.c vendor-sys/acpica/dist/include/acconfig.h vendor-sys/acpica/dist/include/acmacros.h vendor-sys/acpica/dist/include/acnamesp.h vendor-sys/acpica/dist/include/acpixf.h vendor-sys/acpica/dist/include/acutils.h vendor-sys/acpica/dist/namespace/nsdump.c vendor-sys/acpica/dist/namespace/nsdumpdv.c vendor-sys/acpica/dist/namespace/nseval.c vendor-sys/acpica/dist/namespace/nsinit.c vendor-sys/acpica/dist/namespace/nspredef.c vendor-sys/acpica/dist/namespace/nsrepair.c vendor-sys/acpica/dist/namespace/nswalk.c vendor-sys/acpica/dist/namespace/nsxfeval.c vendor-sys/acpica/dist/parser/psloop.c vendor-sys/acpica/dist/parser/psparse.c vendor-sys/acpica/dist/parser/psxface.c vendor-sys/acpica/dist/tools/acpiexec/Makefile vendor-sys/acpica/dist/tools/acpisrc/astable.c vendor-sys/acpica/dist/tools/acpixtract/acpixtract.c vendor-sys/acpica/dist/utilities/utmisc.c vendor-sys/acpica/dist/utilities/utobject.c Modified: vendor-sys/acpica/dist/changes.txt == --- vendor-sys/acpica/dist/changes.txt Mon Nov 16 15:38:27 2009 (r199322) +++ vendor-sys/acpica/dist/changes.txt Mon Nov 16 18:28:41 2009 (r199323) @@ -1,4 +1,77 @@ +12 November 2009. Summary of changes for version 20091112: + +This release is available at www.acpica.org/downloads + +1) ACPI CA Core Subsystem: + +Implemented a post-order callback to AcpiWalkNamespace. The existing +interface only has a pre-order callback. This change adds an additional +parameter for a post-order callback which will be more useful for bus scans. +ACPICA BZ 779. Lin Ming. Updated the ACPICA Programmer Reference. + +Modified the behavior of the operation region memory mapping cache for +SystemMemory. Ensure that the memory mappings created for operation regions +do not cross 4K page boundaries. Crossing a page boundary while mapping +regions can cause kernel warnings on some hosts if the pages have different +attributes. Such regions are probably BIOS bugs, and this is the workaround. +Linux BZ 14445. Lin Ming. + +Implemented an automatic repair for predefined methods that must return +sorted lists. This change will repair (by sorting) packages returned by _ALR, +_PSS, and _TSS. Drivers can now assume that the packages are correctly sorted +and do not contain NULL package elements. Adds one new file, +namespace/nsrepair2.c. ACPICA BZ 784. Lin Ming, Bob Moore. + +Fixed a possible fault during predefined name validation if a return Package +object contains NULL elements. Also adds a warning if a NULL element is +followed by any non-null elements. ACPICA BZ 813, 814. Future enhancement may +include repair or removal of all such NULL elements where possible. + +Implemented additional module-level executable AML code support. This change +will execute module-level code that is not at the root of the namespace +(under a Device object, etc.) at table load time. Module-level executable AML +code has been illegal since ACPI 2.0. ACPICA BZ 762. Lin Ming. + +Implemented a new internal function to create Integer objects. This function +simplifies miscellaneous object creation code. ACPICA BZ 823. + +Reduced the severity of predefined repair messages, Warning to Info. Since +the object was successfully repaired, a warning is too severe. Reduced to an +info message for now. These messages may eventually be changed to debug-only. +ACPICA BZ 812. + +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: 8
svn commit: r199324 - vendor-sys/acpica/20091112
Author: jkim Date: Mon Nov 16 18:29:52 2009 New Revision: 199324 URL: http://svn.freebsd.org/changeset/base/199324 Log: Tag ACPICA 20091112. Added: vendor-sys/acpica/20091112/ - copied from r199323, vendor-sys/acpica/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r199325 - releng/8.0/sys/dev/e1000
Author: jfv Date: Mon Nov 16 18:46:33 2009 New Revision: 199325 URL: http://svn.freebsd.org/changeset/base/199325 Log: On a 32 bit kernel the igb driver may cause a page fault panic due to a failed bounce page allocation during RX mbuf setup. The large demand on bounce pages is due to the alignment requirement in the tag, the ixgbe driver has demonstrated this to be unnecessary and so it is being removed here to fix this problem. Note that ultimately there needs to be a more elegant handling of the failure case here. Approved by: re Modified: releng/8.0/sys/dev/e1000/if_igb.c Directory Properties: releng/8.0/sys/ (props changed) releng/8.0/sys/amd64/include/xen/ (props changed) releng/8.0/sys/cddl/contrib/opensolaris/ (props changed) releng/8.0/sys/contrib/dev/acpica/ (props changed) releng/8.0/sys/contrib/pf/ (props changed) releng/8.0/sys/dev/xen/xenpci/ (props changed) Modified: releng/8.0/sys/dev/e1000/if_igb.c == --- releng/8.0/sys/dev/e1000/if_igb.c Mon Nov 16 18:29:52 2009 (r199324) +++ releng/8.0/sys/dev/e1000/if_igb.c Mon Nov 16 18:46:33 2009 (r199325) @@ -2654,7 +2654,7 @@ igb_dma_malloc(struct adapter *adapter, int error; error = bus_dma_tag_create(bus_get_dma_tag(adapter->dev), /* parent */ - IGB_DBA_ALIGN, 0, /* alignment, bounds */ + 1, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ @@ -2867,7 +2867,7 @@ igb_allocate_transmit_buffers(struct tx_ * Setup DMA descriptor areas. */ if ((error = bus_dma_tag_create(NULL, /* parent */ - PAGE_SIZE, 0,/* alignment, bounds */ + 1, 0,/* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ @@ -3554,7 +3554,7 @@ igb_allocate_receive_buffers(struct rx_r ** it may not always use this. */ if ((error = bus_dma_tag_create(NULL, /* parent */ - PAGE_SIZE, 0,/* alignment, bounds */ + 1, 0,/* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r199327 - stable/8/sys/dev/e1000
Author: jfv Date: Mon Nov 16 18:58:45 2009 New Revision: 199327 URL: http://svn.freebsd.org/changeset/base/199327 Log: On a 32 bit kernel the igb driver may cause a page fault panic due to a failed bounce page allocation during RX mbuf setup. The large demand on bounce pages is due to the alignment requirement in the tag. This restriction was removed in the ixgbe driver with no ill effects and so is being removed here also. Modified: stable/8/sys/dev/e1000/if_igb.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) stable/8/sys/netinet6/ (props changed) Modified: stable/8/sys/dev/e1000/if_igb.c == --- stable/8/sys/dev/e1000/if_igb.c Mon Nov 16 18:50:51 2009 (r199326) +++ stable/8/sys/dev/e1000/if_igb.c Mon Nov 16 18:58:45 2009 (r199327) @@ -2654,7 +2654,7 @@ igb_dma_malloc(struct adapter *adapter, int error; error = bus_dma_tag_create(bus_get_dma_tag(adapter->dev), /* parent */ - IGB_DBA_ALIGN, 0, /* alignment, bounds */ + 1, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ @@ -2867,7 +2867,7 @@ igb_allocate_transmit_buffers(struct tx_ * Setup DMA descriptor areas. */ if ((error = bus_dma_tag_create(NULL, /* parent */ - PAGE_SIZE, 0,/* alignment, bounds */ + 1, 0,/* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ @@ -3554,7 +3554,7 @@ igb_allocate_receive_buffers(struct rx_r ** it may not always use this. */ if ((error = bus_dma_tag_create(NULL, /* parent */ - PAGE_SIZE, 0,/* alignment, bounds */ + 1, 0,/* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r199329 - head/lib/libc/nls
Author: jkim Date: Mon Nov 16 19:10:09 2009 New Revision: 199329 URL: http://svn.freebsd.org/changeset/base/199329 Log: Sync with C.msg r199083. Modified: head/lib/libc/nls/ko_KR.UTF-8.msg (contents, props changed) head/lib/libc/nls/ko_KR.eucKR.msg (contents, props changed) Modified: head/lib/libc/nls/ko_KR.UTF-8.msg == --- head/lib/libc/nls/ko_KR.UTF-8.msg Mon Nov 16 18:59:04 2009 (r199328) +++ head/lib/libc/nls/ko_KR.UTF-8.msg Mon Nov 16 19:10:09 2009 (r199329) @@ -181,6 +181,16 @@ $ ENOATTR 87 속성을 찾을 수 없습니다 $ EDOOFUS 88 프로그램상 오류입니다 +$ EBADMSG +89 잘못된 메시지입니다 +$ EMULTIHOP +90 멀티홉이 시도되었습니다 +$ ENOLINK +91 연결이 끊겼습니다 +$ EPROTO +92 프로토콜이 잘못되었습니다 +$ ENOTCAPABLE +93 접근 능력이 충분치 않습니다 $ $ strsignal() support catalog $ @@ -230,7 +240,7 @@ $ SIGTTIN $ SIGTTOU 22 정지 (터미널 출력) $ SIGIO -23 I/O possible +23 I/O 가능 $ SIGXCPU 24 CPU 사용 시간 초과 $ SIGXFSZ @@ -247,3 +257,39 @@ $ SIGUSR1 30 사용자 정의 시그널 1 $ SIGUSR2 31 사용자 정의 시그널 2 +$ +$ gai_strerror() support catalog +$ +$set 3 +$ 1 (obsolete) +1 호스트 이름이 지원하지 않는 주소군입니다 +$ EAI_AGAIN +2 주소 변환에 일시적으로 실패했습니다 +$ EAI_BADFLAGS +3 잘못된 ai_flags입니다 +$ EAI_FAIL +4 주소 변환에 완전히 실패했습니다 +$ EAI_FAMILY +5 지원되지 않는 ai_family입니다 +$ EAI_MEMORY +6 메모리 할당에 실패했습니다 +$ 7 (obsolete) +7 호스트 이름과 일치하는 주소가 없습니다 +$ EAI_NONAME +8 호스트 이름 또는 서비스 이름이 지정되지 않았거나 알 수 없습니다 +$ EAI_SERVICE +9 서비스 이름은 ai_socktype에서 지원되지 않습니다 +$ EAI_SOCKTYPE +10 지원되지 않는 ai_socktype입니다 +$ EAI_SYSTEM +11 시스템 오류가 errno에 반환되었습니다 +$ EAI_BADHINTS +12 잘못된 hints입니다 +$ EAI_PROTOCOL +13 알 수 없는 프로토콜이 변환되었습니다 +$ EAI_OVERFLOW +14 인자 버퍼 공간이 모자랍니다 +$ 0 +32766 성공 +$ NL_MSGMAX +32767 알 수 없는 오류 Modified: head/lib/libc/nls/ko_KR.eucKR.msg == --- head/lib/libc/nls/ko_KR.eucKR.msg Mon Nov 16 18:59:04 2009 (r199328) +++ head/lib/libc/nls/ko_KR.eucKR.msg Mon Nov 16 19:10:09 2009 (r199329) @@ -181,6 +181,16 @@ $ ENOATTR 87 �Ӽ��� ã�� �� �ϴ� $ EDOOFUS 88 ���α��� �Դϴ� +$ EBADMSG +89 �߸��� �Դϴ� +$ EMULTIHOP +90 ��Ƽȩ�� �õ��Ǿϴ� +$ ENOLINK +91 �� ���ϴ� +$ EPROTO +92 �� �߸��Ǿϴ� +$ ENOTCAPABLE +93 �ɷ��� ġ �ʽ��ϴ� $ $ strsignal() support catalog $ @@ -230,7 +240,7 @@ $ SIGTTIN $ SIGTTOU 22 (�̳� ) $ SIGIO -23 I/O possible +23 I/O $ SIGXCPU 24 CPU �ð� �ʰ� $ SIGXFSZ @@ -247,3 +257,39 @@ $ SIGUSR1 30 �� �ñ׳� 1 $ SIGUSR2 31 �� �ñ׳� 2 +$ +$ gai_strerror() support catalog +$ +$set 3 +$ 1 (obsolete) +1 ȣ��Ʈ �̸��� �ʴ� �ּұ��Դϴ� +$ EAI_AGAIN +2 �ּ� ��ȯ�� �Ͻ��� �߽��ϴ� +$ EAI_BADFLAGS +3 �߸��� ai_flags�Դϴ� +$ EAI_FAIL +4 �ּ� ��ȯ�� �� �߽��ϴ� +$ EAI_FAMILY +5 �ʴ� ai_family�Դϴ� +$ EAI_MEMORY +6 ���� �Ҵ翡 �߽��ϴ� +$ 7 (obsolete) +7 ȣ��Ʈ �̸��� ��ġ�ϴ� �ּҰ� �ϴ� +$ EAI_NONAME +8 ȣ��Ʈ �̸� �Ǵ� �� �̸��� �ʾҰų� �� �� �ϴ� +$ EAI_SERVICE +9 �� �̸��� ai_socktype �ʽ��ϴ� +$ EAI_SOCKTYPE +10 �ʴ� ai_socktype�Դϴ� +$ EAI_SYSTEM +11 �ý��� �� errno�� ��ȯ�Ǿϴ� +$ EAI_BADHINTS +12 �߸��� hints�Դϴ� +$ EAI_PROTOCOL +13 �� �� �� ��ȯ�Ǿϴ� +$ EAI_OVERFLOW +14 �� ���ڶ��ϴ� +$ 0 +32766 +$ NL_MSGMAX +32767 �� �� ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r199330 - stable/7/sys/compat/pecoff
Author: bz
Date: Mon Nov 16 20:34:53 2009
New Revision: 199330
URL: http://svn.freebsd.org/changeset/base/199330
Log:
As we pass the 'offset' unvalidated to vn_rdwr() make sure
that it is unsigned rather than possibly set to something negative
by a malicious binary.
This is just the immediate fix to the problem mentioned in
PR kern/80742 and by http://milw0rm.com/exploits/9206 but does
not fix all possible problems imgact_pecoff has.
As this feature does not work and is not compiled in by default,
the security team considers this vulnerability to be of low risk
to the user population and will not be issuing an advisory.
Note that this is a direct commit to stable/7 as pecoff support has
been removed from head and stable/8 already.
PR: kern/80742
Reported by: Oliver Pinter (oliver.pntr gmail.com) via freebsd-security
Help reproducing and testing by: Damian Weber (dweber htw-saarland.de)
MFC After:3 days
Modified:
stable/7/sys/compat/pecoff/imgact_pecoff.c
Modified: stable/7/sys/compat/pecoff/imgact_pecoff.c
==
--- stable/7/sys/compat/pecoff/imgact_pecoff.c Mon Nov 16 19:10:09 2009
(r199329)
+++ stable/7/sys/compat/pecoff/imgact_pecoff.c Mon Nov 16 20:34:53 2009
(r199330)
@@ -136,7 +136,7 @@ exec_pecoff_coff_makecmds(struct image_p
struct coff_filehdr *, int);
static int pecoff_signature(struct thread *, struct vnode *, const struct
pecoff_dos_filehdr *);
-static int pecoff_read_from(struct thread *, struct vnode *, int,
caddr_t, int);
+static int pecoff_read_from(struct thread *, struct vnode *, unsigned
int, caddr_t, int);
static int
pecoff_load_section(struct thread * td,
struct vmspace * vmspace, struct vnode * vp,
@@ -292,7 +292,7 @@ pecoff_load_file(struct thread * td, con
struct vmspace *vmspace = td->td_proc->p_vmspace;
struct vattrattr;
struct image_params image_params, *imgp;
- int peofs;
+ unsigned int peofs;
int error, i, scnsiz;
imgp = &image_params;
@@ -554,7 +554,7 @@ int
pecoff_read_from(td, vp, pos, buf, siz)
struct thread *td;
struct vnode *vp;
- int pos;
+ unsigned intpos;
caddr_t buf;
int siz;
{
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r199331 - in head/sys/dev/usb: . serial
Author: thompsa
Date: Mon Nov 16 20:35:16 2009
New Revision: 199331
URL: http://svn.freebsd.org/changeset/base/199331
Log:
Add the Curitel UM175 3g device.
Modified:
head/sys/dev/usb/serial/u3g.c
head/sys/dev/usb/usbdevs
Modified: head/sys/dev/usb/serial/u3g.c
==
--- head/sys/dev/usb/serial/u3g.c Mon Nov 16 20:34:53 2009
(r199330)
+++ head/sys/dev/usb/serial/u3g.c Mon Nov 16 20:35:16 2009
(r199331)
@@ -173,6 +173,7 @@ MODULE_DEPEND(u3g, usb, 1, 1, 1);
static const struct usb_device_id u3g_devs[] = {
#defineU3G_DEV(v,p,i) { USB_VPI(USB_VENDOR_##v, USB_PRODUCT_##v##_##p,
i) }
+ U3G_DEV(CURITEL, UM175, 0),
/* OEM: Option */
U3G_DEV(OPTION, GT3G, 0),
U3G_DEV(OPTION, GT3GQUAD, 0),
Modified: head/sys/dev/usb/usbdevs
==
--- head/sys/dev/usb/usbdevsMon Nov 16 20:34:53 2009(r199330)
+++ head/sys/dev/usb/usbdevsMon Nov 16 20:35:16 2009(r199331)
@@ -1116,6 +1116,7 @@ product CTX EX13000x Ex1300 hub
product CURITEL HX550C 0x1101 CDMA 2000 1xRTT USB modem (HX-550C)
product CURITEL HX57XB 0x2101 CDMA 2000 1xRTT USB modem
(HX-570/575B/PR-600)
product CURITEL PC5740 0x3701 Broadband Wireless modem
+product CURITEL UM175 0x3714 EVDO modem
/* CyberPower products */
product CYBERPOWER 1500CAVRLCD 0x0501 1500CAVRLCD
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r199332 - head/sys/dev/usb/serial
Author: thompsa
Date: Mon Nov 16 20:36:43 2009
New Revision: 199332
URL: http://svn.freebsd.org/changeset/base/199332
Log:
Sort ID list by vendor.
Modified:
head/sys/dev/usb/serial/u3g.c
Modified: head/sys/dev/usb/serial/u3g.c
==
--- head/sys/dev/usb/serial/u3g.c Mon Nov 16 20:35:16 2009
(r199331)
+++ head/sys/dev/usb/serial/u3g.c Mon Nov 16 20:36:43 2009
(r199332)
@@ -174,6 +174,10 @@ MODULE_DEPEND(u3g, usb, 1, 1, 1);
static const struct usb_device_id u3g_devs[] = {
#defineU3G_DEV(v,p,i) { USB_VPI(USB_VENDOR_##v, USB_PRODUCT_##v##_##p,
i) }
U3G_DEV(CURITEL, UM175, 0),
+ /* OEM: Huawei */
+ U3G_DEV(HUAWEI, MOBILE, U3GFL_HUAWEI_INIT),
+ U3G_DEV(HUAWEI, E180V, U3GFL_HUAWEI_INIT),
+ U3G_DEV(HUAWEI, E220, U3GFL_HUAWEI_INIT),
/* OEM: Option */
U3G_DEV(OPTION, GT3G, 0),
U3G_DEV(OPTION, GT3GQUAD, 0),
@@ -187,10 +191,8 @@ static const struct usb_device_id u3g_de
/* OEM: Qualcomm, Inc. */
U3G_DEV(QUALCOMMINC, ZTE_STOR, U3GFL_SCSI_EJECT),
U3G_DEV(QUALCOMMINC, CDMA_MSM, U3GFL_SCSI_EJECT),
- /* OEM: Huawei */
- U3G_DEV(HUAWEI, MOBILE, U3GFL_HUAWEI_INIT),
- U3G_DEV(HUAWEI, E180V, U3GFL_HUAWEI_INIT),
- U3G_DEV(HUAWEI, E220, U3GFL_HUAWEI_INIT),
+ /* OEM: Merlin */
+ U3G_DEV(MERLIN, V620, 0),
/* OEM: Novatel */
U3G_DEV(NOVATEL, CDMA_MODEM, 0),
U3G_DEV(NOVATEL, ES620, 0),
@@ -209,8 +211,6 @@ static const struct usb_device_id u3g_de
U3G_DEV(NOVATEL, ZEROCD, U3GFL_SCSI_EJECT),
U3G_DEV(NOVATEL, U760, U3GFL_SCSI_EJECT),
U3G_DEV(DELL, U740, 0),
- /* OEM: Merlin */
- U3G_DEV(MERLIN, V620, 0),
/* OEM: Sierra Wireless: */
U3G_DEV(SIERRA, AIRCARD580, 0),
U3G_DEV(SIERRA, AIRCARD595, 0),
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r199333 - head/sys/dev/siis
Author: mav Date: Mon Nov 16 20:54:47 2009 New Revision: 199333 URL: http://svn.freebsd.org/changeset/base/199333 Log: Do not require payload data to be aligned. It is not mentioned in datasheet and works fine in practice. Modified: head/sys/dev/siis/siis.c Modified: head/sys/dev/siis/siis.c == --- head/sys/dev/siis/siis.cMon Nov 16 20:36:43 2009(r199332) +++ head/sys/dev/siis/siis.cMon Nov 16 20:54:47 2009(r199333) @@ -579,7 +579,7 @@ siis_dmainit(device_t dev) } ch->dma.work_bus = dcba.maddr; /* Data area. */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), 2, 0, + if (bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, SIIS_SG_ENTRIES * PAGE_SIZE * SIIS_MAX_SLOTS, ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r199334 - vendor/tzdata/dist
Author: edwin Date: Mon Nov 16 21:06:22 2009 New Revision: 199334 URL: http://svn.freebsd.org/changeset/base/199334 Log: Vendor import of tzdata2009s: - Harmless typo in definitions of Antarctica/Davis - Fiji will go to DST between 29 November 2009 and 25 April 2010 Obtained from: ftp://elsie.nci.nih.gov/pub/ Modified: vendor/tzdata/dist/antarctica vendor/tzdata/dist/australasia Modified: vendor/tzdata/dist/antarctica == --- vendor/tzdata/dist/antarctica Mon Nov 16 20:54:47 2009 (r199333) +++ vendor/tzdata/dist/antarctica Mon Nov 16 21:06:22 2009 (r199334) @@ -1,5 +1,5 @@ # -# @(#)antarctica 8.6 +# @(#)antarctica 8.7 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -106,7 +106,7 @@ Zone Antarctica/Casey 0 - zzz 1969 Zone Antarctica/Davis 0 - zzz 1957 Jan 13 7:00- DAVT1964 Nov # Davis Time 0 - zzz 1969 Feb - 7:00- DAVT2009 Oct 18 2:0 + 7:00- DAVT2009 Oct 18 2:00 5:00- DAVT Zone Antarctica/Mawson 0 - zzz 1954 Feb 13 6:00- MAWT2009 Oct 18 2:00 Modified: vendor/tzdata/dist/australasia == --- vendor/tzdata/dist/australasia Mon Nov 16 20:54:47 2009 (r199333) +++ vendor/tzdata/dist/australasia Mon Nov 16 21:06:22 2009 (r199334) @@ -1,5 +1,5 @@ # -# @(#)australasia 8.14 +# @(#)australasia 8.15 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -248,9 +248,30 @@ Zone Indian/Cocos6:27:40 - LMT 1900 6:30- CCT # Cocos Islands Time # Fiji +# From Alexander Krivenyshev (2009-11-10): +# According to Fiji Broadcasting Corporation, Fiji plans to re-introduce DST +# from November 29th 2009 to April 25th 2010. +# +# "Daylight savings to commence this month" +# http://www.radiofiji.com.fj/fullstory.php?id=23719";> +# http://www.radiofiji.com.fj/fullstory.php?id=23719 +# +# or +# http://www.worldtimezone.com/dst_news/dst_news_fiji01.html";> +# http://www.worldtimezone.com/dst_news/dst_news_fiji01.html +# + +# From Steffen Thorsen (2009-11-10): +# The Fiji Government has posted some more details about the approved +# amendments: +# http://www.fiji.gov.fj/publish/page_16198.shtml";> +# http://www.fiji.gov.fj/publish/page_16198.shtml +# # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S Rule Fiji19981999- Nov Sun>=1 2:001:00S Rule Fiji19992000- Feb lastSun 3:000 - +Rule Fiji2009only- Nov 29 2:001:00S +Rule Fiji2010only- Apr 25 3:000 - # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Pacific/Fiji11:53:40 - LMT 1915 Oct 26 # Suva 12:00 FijiFJ%sT # Fiji Time ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r199335 - vendor/tzdata/tzdata2009s
Author: edwin Date: Mon Nov 16 21:07:17 2009 New Revision: 199335 URL: http://svn.freebsd.org/changeset/base/199335 Log: Tag of tzdata2009s Added: vendor/tzdata/tzdata2009s/ - copied from r199334, vendor/tzdata/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r199336 - head/share/zoneinfo
Author: edwin Date: Mon Nov 16 21:12:27 2009 New Revision: 199336 URL: http://svn.freebsd.org/changeset/base/199336 Log: MFV of tzdata2009s, r199334 - Fix (harmless) typo in the definitions of Antarctica/David - Fiji will go into DST from 29 November 2009 to 25 April 2010. MFC after:3 days Modified: head/share/zoneinfo/antarctica head/share/zoneinfo/australasia Directory Properties: head/share/zoneinfo/ (props changed) Modified: head/share/zoneinfo/antarctica == --- head/share/zoneinfo/antarctica Mon Nov 16 21:07:17 2009 (r199335) +++ head/share/zoneinfo/antarctica Mon Nov 16 21:12:27 2009 (r199336) @@ -1,5 +1,5 @@ # -# @(#)antarctica 8.6 +# @(#)antarctica 8.7 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -106,7 +106,7 @@ Zone Antarctica/Casey 0 - zzz 1969 Zone Antarctica/Davis 0 - zzz 1957 Jan 13 7:00- DAVT1964 Nov # Davis Time 0 - zzz 1969 Feb - 7:00- DAVT2009 Oct 18 2:0 + 7:00- DAVT2009 Oct 18 2:00 5:00- DAVT Zone Antarctica/Mawson 0 - zzz 1954 Feb 13 6:00- MAWT2009 Oct 18 2:00 Modified: head/share/zoneinfo/australasia == --- head/share/zoneinfo/australasia Mon Nov 16 21:07:17 2009 (r199335) +++ head/share/zoneinfo/australasia Mon Nov 16 21:12:27 2009 (r199336) @@ -1,5 +1,5 @@ # -# @(#)australasia 8.14 +# @(#)australasia 8.15 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -248,9 +248,30 @@ Zone Indian/Cocos6:27:40 - LMT 1900 6:30- CCT # Cocos Islands Time # Fiji +# From Alexander Krivenyshev (2009-11-10): +# According to Fiji Broadcasting Corporation, Fiji plans to re-introduce DST +# from November 29th 2009 to April 25th 2010. +# +# "Daylight savings to commence this month" +# http://www.radiofiji.com.fj/fullstory.php?id=23719";> +# http://www.radiofiji.com.fj/fullstory.php?id=23719 +# +# or +# http://www.worldtimezone.com/dst_news/dst_news_fiji01.html";> +# http://www.worldtimezone.com/dst_news/dst_news_fiji01.html +# + +# From Steffen Thorsen (2009-11-10): +# The Fiji Government has posted some more details about the approved +# amendments: +# http://www.fiji.gov.fj/publish/page_16198.shtml";> +# http://www.fiji.gov.fj/publish/page_16198.shtml +# # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S Rule Fiji19981999- Nov Sun>=1 2:001:00S Rule Fiji19992000- Feb lastSun 3:000 - +Rule Fiji2009only- Nov 29 2:001:00S +Rule Fiji2010only- Apr 25 3:000 - # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Pacific/Fiji11:53:40 - LMT 1915 Oct 26 # Suva 12:00 FijiFJ%sT # Fiji Time ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r199337 - in head: sys/conf sys/contrib/dev/acpica sys/contrib/dev/acpica/compiler sys/contrib/dev/acpica/debugger sys/contrib/dev/acpica/dispatcher sys/contrib/dev/acpica/events sys/co...
Author: jkim Date: Mon Nov 16 21:47:12 2009 New Revision: 199337 URL: http://svn.freebsd.org/changeset/base/199337 Log: Merge ACPICA 20091112. Added: head/sys/contrib/dev/acpica/namespace/nsrepair2.c - copied, changed from r199336, vendor-sys/acpica/dist/namespace/nsrepair2.c Modified: head/sys/conf/files head/sys/contrib/dev/acpica/changes.txt head/sys/contrib/dev/acpica/compiler/aslcompile.c head/sys/contrib/dev/acpica/compiler/aslerror.c head/sys/contrib/dev/acpica/compiler/asllookup.c head/sys/contrib/dev/acpica/compiler/asloperands.c head/sys/contrib/dev/acpica/compiler/asltransform.c head/sys/contrib/dev/acpica/compiler/asltypes.h head/sys/contrib/dev/acpica/debugger/dbcmds.c head/sys/contrib/dev/acpica/debugger/dbexec.c head/sys/contrib/dev/acpica/debugger/dbstats.c head/sys/contrib/dev/acpica/dispatcher/dsinit.c head/sys/contrib/dev/acpica/dispatcher/dsmthdat.c head/sys/contrib/dev/acpica/dispatcher/dsobject.c head/sys/contrib/dev/acpica/events/evgpeblk.c head/sys/contrib/dev/acpica/events/evregion.c head/sys/contrib/dev/acpica/executer/exconfig.c head/sys/contrib/dev/acpica/executer/exconvrt.c head/sys/contrib/dev/acpica/executer/exfield.c head/sys/contrib/dev/acpica/executer/exoparg1.c head/sys/contrib/dev/acpica/executer/exoparg6.c head/sys/contrib/dev/acpica/executer/exregion.c head/sys/contrib/dev/acpica/include/acconfig.h head/sys/contrib/dev/acpica/include/acmacros.h head/sys/contrib/dev/acpica/include/acnamesp.h head/sys/contrib/dev/acpica/include/acpixf.h head/sys/contrib/dev/acpica/include/acutils.h head/sys/contrib/dev/acpica/namespace/nsdump.c head/sys/contrib/dev/acpica/namespace/nsdumpdv.c head/sys/contrib/dev/acpica/namespace/nseval.c head/sys/contrib/dev/acpica/namespace/nsinit.c head/sys/contrib/dev/acpica/namespace/nspredef.c head/sys/contrib/dev/acpica/namespace/nsrepair.c head/sys/contrib/dev/acpica/namespace/nswalk.c head/sys/contrib/dev/acpica/namespace/nsxfeval.c head/sys/contrib/dev/acpica/parser/psloop.c head/sys/contrib/dev/acpica/parser/psparse.c head/sys/contrib/dev/acpica/parser/psxface.c head/sys/contrib/dev/acpica/utilities/utmisc.c head/sys/contrib/dev/acpica/utilities/utobject.c head/sys/dev/acpica/acpi.c head/sys/dev/acpica/acpi_dock.c head/sys/dev/acpica/acpi_pci.c head/sys/dev/acpica/acpi_video.c head/usr.sbin/acpi/acpidb/Makefile Directory Properties: head/sys/contrib/dev/acpica/ (props changed) Modified: head/sys/conf/files == --- head/sys/conf/files Mon Nov 16 21:12:27 2009(r199336) +++ head/sys/conf/files Mon Nov 16 21:47:12 2009(r199337) @@ -171,107 +171,108 @@ contrib/dev/acpica/dispatcher/dswexec.c contrib/dev/acpica/dispatcher/dswload.coptional acpi contrib/dev/acpica/dispatcher/dswscope.c optional acpi contrib/dev/acpica/dispatcher/dswstate.c optional acpi -contrib/dev/acpica/events/evevent.coptional acpi -contrib/dev/acpica/events/evgpe.c optional acpi -contrib/dev/acpica/events/evgpeblk.c optional acpi -contrib/dev/acpica/events/evmisc.c optional acpi -contrib/dev/acpica/events/evregion.c optional acpi -contrib/dev/acpica/events/evrgnini.c optional acpi -contrib/dev/acpica/events/evsci.c optional acpi -contrib/dev/acpica/events/evxface.coptional acpi -contrib/dev/acpica/events/evxfevnt.c optional acpi -contrib/dev/acpica/events/evxfregn.c optional acpi -contrib/dev/acpica/executer/exconfig.c optional acpi -contrib/dev/acpica/executer/exconvrt.c optional acpi -contrib/dev/acpica/executer/excreate.c optional acpi -contrib/dev/acpica/executer/exdump.c optional acpi -contrib/dev/acpica/executer/exfield.c optional acpi -contrib/dev/acpica/executer/exfldio.c optional acpi -contrib/dev/acpica/executer/exmisc.c optional acpi -contrib/dev/acpica/executer/exmutex.c optional acpi -contrib/dev/acpica/executer/exnames.c optional acpi -contrib/dev/acpica/executer/exoparg1.c optional acpi -contrib/dev/acpica/executer/exoparg2.c optional acpi -contrib/dev/acpica/executer/exoparg3.c optional acpi -contrib/dev/acpica/executer/exoparg6.c optional acpi -contrib/dev/acpica/executer/exprep.c optional acpi -contrib/dev/acpica/executer/exregion.c optional acpi -contrib/dev/acpica/executer/exresnte.c optional acpi -contrib/dev/acpica/executer/exresolv.c optional acpi -contrib/dev/acpica/executer/exresop.c optional acpi -contrib/dev/acpica/executer/exstore.c optional acpi -contrib/dev/acpica/executer/exstoren.c optional acpi -contrib/dev/acpica/executer/exstorob.c optional acpi -contrib/dev/acpica/executer/exsystem.c optional acpi -contrib/dev/acpica/executer/exutils.c optional acpi -contrib/dev/acpica/hardware/hwacpi.c optional acpi -contrib/dev/acpica/hardware/hwgpe.coptional acpi -contrib/dev/acpica/hardware/hwregs.c optional acpi -contrib/dev/acpica/hardware/hwsleep.c optional acpi -contrib/dev
svn commit: r199338 - head/sys/modules/acpi/acpi
Author: jkim Date: Mon Nov 16 21:53:56 2009 New Revision: 199338 URL: http://svn.freebsd.org/changeset/base/199338 Log: Add a forgotten module Makefile change from the previous commit. Modified: head/sys/modules/acpi/acpi/Makefile Modified: head/sys/modules/acpi/acpi/Makefile == --- head/sys/modules/acpi/acpi/Makefile Mon Nov 16 21:47:12 2009 (r199337) +++ head/sys/modules/acpi/acpi/Makefile Mon Nov 16 21:53:56 2009 (r199338) @@ -41,8 +41,8 @@ SRCS+=exprep.c exregion.c exresnte.c ex SRCS+= exstoren.c exstorob.c exsystem.c exutils.c SRCS+= hwacpi.c hwgpe.c hwregs.c hwsleep.c hwtimer.c hwvalid.c hwxface.c SRCS+= nsaccess.c nsalloc.c nsdump.c nseval.c nsinit.c nsload.c nsnames.c -SRCS+= nsobject.c nsparse.c nspredef.c nsrepair.c nssearch.c nsutils.c -SRCS+= nswalk.c nsxfeval.c nsxfname.c nsxfobj.c +SRCS+= nsobject.c nsparse.c nspredef.c nsrepair.c nsrepair2.c nssearch.c +SRCS+= nsutils.c nswalk.c nsxfeval.c nsxfname.c nsxfobj.c SRCS+= psargs.c psloop.c psopcode.c psparse.c psscope.c pstree.c psutils.c SRCS+= pswalk.c psxface.c SRCS+= rsaddr.c rscalc.c rscreate.c rsdump.c rsinfo.c rsio.c rsirq.c rslist.c ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r199339 - head/usr.bin/gzip
Author: delphij
Date: Mon Nov 16 22:52:52 2009
New Revision: 199339
URL: http://svn.freebsd.org/changeset/base/199339
Log:
We should distinguish between a real truncated case and EOF after
BZ_STREAM_END triggered re-init. Do it by introducing a new flag
to represent the 'cold' case after bzip2 state is reinitialized.
This fixes regression reported on -current@ as well as another one
I found during twiddling with gzip.
Reported by: swell.k gmail.com
MFC after:1 week
Modified:
head/usr.bin/gzip/unbzip2.c
Modified: head/usr.bin/gzip/unbzip2.c
==
--- head/usr.bin/gzip/unbzip2.c Mon Nov 16 21:53:56 2009(r199338)
+++ head/usr.bin/gzip/unbzip2.c Mon Nov 16 22:52:52 2009(r199339)
@@ -36,7 +36,7 @@
static off_t
unbzip2(int in, int out, char *pre, size_t prelen, off_t *bytes_in)
{
- int ret, end_of_file;
+ int ret, end_of_file, cold = 0;
off_t bytes_out = 0;
bz_stream bzs;
static char *inbuf, *outbuf;
@@ -86,8 +86,18 @@ unbzip2(int in, int out, char *pre, size
switch (ret) {
case BZ_STREAM_END:
case BZ_OK:
- if (ret == BZ_OK && end_of_file)
- maybe_err("read");
+ if (ret == BZ_OK && end_of_file) {
+ /*
+* If we hit this after a stream end, consider
+* it as the end of the whole file and don't
+* bail out.
+*/
+ if (cold == 1)
+ ret = BZ_STREAM_END;
+ else
+ maybe_errx("truncated file");
+ }
+ cold = 0;
if (!tflag && bzs.avail_out != BUFLEN) {
ssize_t n;
@@ -100,6 +110,7 @@ unbzip2(int in, int out, char *pre, size
if (BZ2_bzDecompressEnd(&bzs) != BZ_OK ||
BZ2_bzDecompressInit(&bzs, 0, 0) != BZ_OK)
maybe_errx("bzip2 re-init");
+ cold = 1;
ret = BZ_OK;
}
break;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r194783 - head/lib/libc/stdtime
Hello!
Author: edwin
Date: Tue Jun 23 22:28:44 2009
New Revision: 194783
URL: http://svn.freebsd.org/changeset/base/194783
Log:
Remove duplicate if-statement on gmt_is_set in gmtsub().
MFC after: 1 week
Modified:
head/lib/libc/stdtime/localtime.c
Modified: head/lib/libc/stdtime/localtime.c
==
--- head/lib/libc/stdtime/localtime.c Tue Jun 23 22:22:20 2009
(r194782)
+++ head/lib/libc/stdtime/localtime.c Tue Jun 23 22:28:44 2009
(r194783)
@@ -1472,18 +1472,16 @@ struct tm * const tmp;
{
register struct tm *result;
+ _MUTEX_LOCK(&gmt_mutex);
if (!gmt_is_set) {
- _MUTEX_LOCK(&gmt_mutex);
- if (!gmt_is_set) {
This change looks like a (small?) pessimization to me: before it,
_MUTEX_LOCK/_MUTEX_UNLOCK pair would be skipped for the case gmt_is_set
== TRUE (all invocations except the first one), now it won't. I'm not
sure whether this is critical here though...
Sincerely, Dmitry
--
nic-hdl: LYNX-RIPE
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r199349 - head/share/man/man3
Author: brueffer Date: Tue Nov 17 07:06:41 2009 New Revision: 199349 URL: http://svn.freebsd.org/changeset/base/199349 Log: Fix typo. PR: 140615 Submitted by: Andrius Morkunas MFC after:3 days Modified: head/share/man/man3/queue.3 Modified: head/share/man/man3/queue.3 == --- head/share/man/man3/queue.3 Tue Nov 17 07:01:49 2009(r199348) +++ head/share/man/man3/queue.3 Tue Nov 17 07:06:41 2009(r199349) @@ -233,7 +233,7 @@ O(1) removal of any entry in the list. However: .Bl -enum -compact -offset indent .It -Each elements requires two pointers rather than one. +Each element requires two pointers rather than one. .It Code size and execution time of operations (except for removal) is about twice that of the singly-linked data-structures. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r199351 - head/bin/ps
Author: netchild Date: Tue Nov 17 07:29:35 2009 New Revision: 199351 URL: http://svn.freebsd.org/changeset/base/199351 Log: Fix small resource leak (memory). Reviewed by: gad MFC after:1 week Modified: head/bin/ps/keyword.c Modified: head/bin/ps/keyword.c == --- head/bin/ps/keyword.c Tue Nov 17 07:21:27 2009(r199350) +++ head/bin/ps/keyword.c Tue Nov 17 07:29:35 2009(r199351) @@ -330,6 +330,7 @@ findvar(char *p, int user, char **header errx(1, "malloc failed"); snprintf(realfmt, rflen, "%s=%s", v->alias, hp); parsefmt(realfmt, user); + free(realfmt); } return ((VAR *)NULL); } ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
