CVS commit: [netbsd-6] src/libexec/ld.elf_so
Module Name:src
Committed By: jdc
Date: Wed Aug 8 06:24:51 UTC 2012
Modified Files:
src/libexec/ld.elf_so [netbsd-6]: headers.c
src/libexec/ld.elf_so/arch/sparc64 [netbsd-6]: mdreloc.c
Log Message:
Pull up revisions:
src/libexec/ld.elf_so/headers.c revision 1.42
src/libexec/ld.elf_so/arch/sparc64/mdreloc.c revision 1.53
(requested by martin in ticket #447).
Remove a debug assert that does not hold for PIE (e.g. phdr = 0x40, but
obj has not been mapped at 0, so obj->phdr is 0x100040).
OK: skrll
Add special handling needed for OLO10 relocations.
First part of fixing PR port-sparc64/46724.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.41.4.1 src/libexec/ld.elf_so/headers.c
cvs rdiff -u -r1.52 -r1.52.6.1 src/libexec/ld.elf_so/arch/sparc64/mdreloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/headers.c
diff -u src/libexec/ld.elf_so/headers.c:1.41 src/libexec/ld.elf_so/headers.c:1.41.4.1
--- src/libexec/ld.elf_so/headers.c:1.41 Sat Jun 25 05:45:12 2011
+++ src/libexec/ld.elf_so/headers.c Wed Aug 8 06:24:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: headers.c,v 1.41 2011/06/25 05:45:12 nonaka Exp $ */
+/* $NetBSD: headers.c,v 1.41.4.1 2012/08/08 06:24:51 jdc Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: headers.c,v 1.41 2011/06/25 05:45:12 nonaka Exp $");
+__RCSID("$NetBSD: headers.c,v 1.41.4.1 2012/08/08 06:24:51 jdc Exp $");
#endif /* not lint */
#include
@@ -356,7 +356,6 @@ _rtld_digest_phdr(const Elf_Phdr *phdr,
obj->phsize, (long)obj->relocbase));
break;
}
- assert(obj->phdr == phdr);
for (ph = phdr; ph < phlimit; ++ph) {
vaddr = (Elf_Addr)(uintptr_t)(obj->relocbase + ph->p_vaddr);
Index: src/libexec/ld.elf_so/arch/sparc64/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/sparc64/mdreloc.c:1.52 src/libexec/ld.elf_so/arch/sparc64/mdreloc.c:1.52.6.1
--- src/libexec/ld.elf_so/arch/sparc64/mdreloc.c:1.52 Wed Mar 30 08:37:52 2011
+++ src/libexec/ld.elf_so/arch/sparc64/mdreloc.c Wed Aug 8 06:24:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mdreloc.c,v 1.52 2011/03/30 08:37:52 martin Exp $ */
+/* $NetBSD: mdreloc.c,v 1.52.6.1 2012/08/08 06:24:51 jdc Exp $ */
/*-
* Copyright (c) 2000 Eduardo Horvath.
@@ -32,7 +32,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.52 2011/03/30 08:37:52 martin Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.52.6.1 2012/08/08 06:24:51 jdc Exp $");
#endif /* not lint */
#include
@@ -323,6 +323,10 @@ _rtld_relocate_nonplt_objects(Obj_Entry
if (type == R_TYPE(NONE))
continue;
+ /* OLO10 relocations have extra info */
+ if ((type & 0x00ff) == R_SPARC_OLO10)
+ type = R_SPARC_OLO10;
+
/* We do JMP_SLOTs in _rtld_bind() below */
if (type == R_TYPE(JMP_SLOT))
continue;
@@ -335,8 +339,10 @@ _rtld_relocate_nonplt_objects(Obj_Entry
* We use the fact that relocation types are an `enum'
* Note: R_SPARC_TLS_TPOFF64 is currently numerically largest.
*/
- if (type > R_TYPE(TLS_TPOFF64))
- return (-1);
+ if (type > R_TYPE(TLS_TPOFF64)) {
+ dbg(("unknown relocation type %x at %p", type, rela));
+ return -1;
+ }
value = rela->r_addend;
@@ -422,6 +428,11 @@ _rtld_relocate_nonplt_objects(Obj_Entry
value += (Elf_Addr)(defobj->relocbase + def->st_value);
}
+ if (type == R_SPARC_OLO10) {
+ value = (value & 0x3ff)
+ + (((Elf64_Xword)rela->r_info<<32)>>40);
+ }
+
if (RELOC_PC_RELATIVE(type)) {
value -= (Elf_Addr)where;
}
CVS commit: [netbsd-6] src/sys/dev/sdmmc
Module Name:src
Committed By: jdc
Date: Wed Aug 8 06:19:00 UTC 2012
Modified Files:
src/sys/dev/sdmmc [netbsd-6]: sdhc.c sdhcreg.h sdmmc_mem.c sdmmcreg.h
Log Message:
Pull up revisions:
src/sys/dev/sdmmc/sdhc.c revisions 1.16,1.20,1.21,1.22,1.23 via patch,1.25
src/sys/dev/sdmmc/sdhcreg.h revision 1.8
src/sys/dev/sdmmc/sdmmc_mem.c revisions 1.21,1.22
src/sys/dev/sdmmc/sdmmcreg.h revisions 1.10,1.11,1.12
(requested by matt in ticket 441).
SDHCI byte swaps the BE response on the wire into LE registers.
As we always want response data in LE, use bus_space_read_stream.
Additonally, read response data in 1 or 4 4-byte chunks, instead of
one 4-byte chunk or 15 1-byte chunks.
bus_space_*_stream_N() functions are not universally available.
Provite alternate implementation for when they are unavailable.
Handle interrupt acknowledgement in the SDHC_FLAG_32BIT_ACCESS case in
the same way as non-SDHC_FLAG_32BIT_ACCESS case.
If there was an error in 32-bit mode, just set ERROR_INTERRUPT otherwise
see if matched anything we care about.
Add use of watermark register when PIO to an ESDHC. After every kill or
drain of watermask words, pause a bit to give time for the fifo to recover.
Always the command response in BE byteorder. Rewrite __bitfield to deal
with this.
Responses are actually in host order (except SCR which is return in
big endian so that's convert to host order).
Fix comments about __bitfield.
To generate a diff of this commit:
cvs rdiff -u -r1.10.2.1 -r1.10.2.2 src/sys/dev/sdmmc/sdhc.c
cvs rdiff -u -r1.5 -r1.5.2.1 src/sys/dev/sdmmc/sdhcreg.h
cvs rdiff -u -r1.20 -r1.20.2.1 src/sys/dev/sdmmc/sdmmc_mem.c
cvs rdiff -u -r1.8 -r1.8.2.1 src/sys/dev/sdmmc/sdmmcreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.10.2.1 src/sys/dev/sdmmc/sdhc.c:1.10.2.2
--- src/sys/dev/sdmmc/sdhc.c:1.10.2.1 Mon Jun 11 17:45:32 2012
+++ src/sys/dev/sdmmc/sdhc.c Wed Aug 8 06:18:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.10.2.1 2012/06/11 17:45:32 riz Exp $ */
+/* $NetBSD: sdhc.c,v 1.10.2.2 2012/08/08 06:18:59 jdc Exp $ */
/* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.10.2.1 2012/06/11 17:45:32 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.10.2.2 2012/08/08 06:18:59 jdc Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -987,14 +987,11 @@ sdhc_exec_command(sdmmc_chipset_handle_t
*/
mutex_enter(&hp->host_mtx);
if (cmd->c_error == 0 && ISSET(cmd->c_flags, SCF_RSP_PRESENT)) {
+ cmd->c_resp[0] = HREAD4(hp, SDHC_RESPONSE + 0);
if (ISSET(cmd->c_flags, SCF_RSP_136)) {
- uint8_t *p = (uint8_t *)cmd->c_resp;
- int i;
-
- for (i = 0; i < 15; i++)
-*p++ = HREAD1(hp, SDHC_RESPONSE + i);
- } else {
- cmd->c_resp[0] = HREAD4(hp, SDHC_RESPONSE);
+ cmd->c_resp[1] = HREAD4(hp, SDHC_RESPONSE + 4);
+ cmd->c_resp[2] = HREAD4(hp, SDHC_RESPONSE + 8);
+ cmd->c_resp[3] = HREAD4(hp, SDHC_RESPONSE + 12);
}
}
mutex_exit(&hp->host_mtx);
@@ -1379,17 +1376,33 @@ static void
esdhc_read_data_pio(struct sdhc_host *hp, uint8_t *data, u_int datalen)
{
uint16_t status = HREAD2(hp, SDHC_NINTR_STATUS);
+ uint32_t v;
+
+ const size_t watermark = (HREAD4(hp, SDHC_WATERMARK_LEVEL) >> SDHC_WATERMARK_READ_SHIFT) & SDHC_WATERMARK_READ_MASK;
+ size_t count = 0;
+
while (datalen > 3 && !ISSET(status, SDHC_TRANSFER_COMPLETE)) {
- uint32_t v = HREAD4(hp, SDHC_DATA);
+ if (count == 0) {
+ /*
+ * If we've drained "watermark" words, we need to wait
+ * a little bit so the read FIFO can refill.
+ */
+ sdmmc_delay(10);
+ count = watermark;
+ }
+ v = HREAD4(hp, SDHC_DATA);
v = le32toh(v);
*(uint32_t *)data = v;
data += 4;
datalen -= 4;
status = HREAD2(hp, SDHC_NINTR_STATUS);
+ count--;
}
-
if (datalen > 0 && !ISSET(status, SDHC_TRANSFER_COMPLETE)) {
- uint32_t v = HREAD4(hp, SDHC_DATA);
+ if (count == 0) {
+ sdmmc_delay(10);
+ }
+ v = HREAD4(hp, SDHC_DATA);
v = le32toh(v);
do {
*data++ = v;
@@ -1402,16 +1415,29 @@ static void
esdhc_write_data_pio(struct sdhc_host *hp, uint8_t *data, u_int datalen)
{
uint16_t status = HREAD2(hp, SDHC_NINTR_STATUS);
+ uint32_t v;
+
+ const size_t watermark = (HREAD4(hp, SDHC_WATERMARK_LEVEL) >> SDHC_WATERMARK_WRITE_SHIFT) & SDHC_WATERMARK_WRITE_MASK;
+ size_t count = watermark;
+
while (datalen > 3 && !ISSET(status, SDHC_TRANSFER_COMPLETE)) {
- uint32_t v = *(uint32_t *)data;
+ if (count == 0) {
+ sdmmc_delay(10);
+ count = watermark;
+ }
+ v = *(uint32_t *)data;
v = htole32(v);
HWRITE4(hp, SDHC_DATA, v);
data += 4;
datalen -= 4;
status = HREAD2(hp, SDHC_NINTR_STATUS);
+ count--;
}
if (datalen > 0 && !ISSET(status, SDHC_TRANSFER_COMPLETE)) {
- uint32_t v = *(uint32_t *)data;
+ if (count == 0) {
+ sdmmc_delay(10);
+
CVS commit: src/usr.sbin/rtadvd
Module Name:src
Committed By: msaitoh
Date: Wed Aug 8 04:05:26 UTC 2012
Modified Files:
src/usr.sbin/rtadvd: config.c
Log Message:
Fix a bug that incorrect RA packet is sent if rtadvd.conf exists.
Fixes PR#46580 reported by Takahiro HAYASHI.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/rtadvd/config.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/rtadvd/config.c
diff -u src/usr.sbin/rtadvd/config.c:1.27 src/usr.sbin/rtadvd/config.c:1.28
--- src/usr.sbin/rtadvd/config.c:1.27 Sun Dec 11 20:44:44 2011
+++ src/usr.sbin/rtadvd/config.c Wed Aug 8 04:05:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: config.c,v 1.27 2011/12/11 20:44:44 christos Exp $ */
+/* $NetBSD: config.c,v 1.28 2012/08/08 04:05:26 msaitoh Exp $ */
/* $KAME: config.c,v 1.93 2005/10/17 14:40:02 suz Exp $ */
/*
@@ -290,7 +290,7 @@ getconfig(const char *intface)
MAYHAVE(val, "clockskew", 0);
tmp->clockskew = val;
- tmp->pfxs++;
+ tmp->pfxs = 0;
TAILQ_INIT(&tmp->prefix);
for (i = -1; i < MAXPREFIX; i++) {
struct prefix *pfx;
@@ -763,6 +763,7 @@ get_prefix(struct rainfo *rai)
/* link into chain */
TAILQ_INSERT_TAIL(&rai->prefix, pp, next);
+ rai->pfxs++;
}
freeifaddrs(ifap);
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: nisimura Date: Wed Aug 8 02:18:37 UTC 2012 Modified Files: src/sys/arch/evbarm/conf: MINI2440 Log Message: let MINI2440 kernel to have bpf(4) for DHCP. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/MINI2440 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/MINI2440 diff -u src/sys/arch/evbarm/conf/MINI2440:1.3 src/sys/arch/evbarm/conf/MINI2440:1.4 --- src/sys/arch/evbarm/conf/MINI2440:1.3 Sat Mar 31 02:45:37 2012 +++ src/sys/arch/evbarm/conf/MINI2440 Wed Aug 8 02:18:36 2012 @@ -1,4 +1,4 @@ -# $NetBSD: MINI2440,v 1.3 2012/03/31 02:45:37 tsutsui Exp $ +# $NetBSD: MINI2440,v 1.4 2012/08/08 02:18:36 nisimura Exp $ # # MINI2440 -- Friendly ARM evaluation board based on Samsung S3C2440 # @@ -362,7 +362,7 @@ pseudo-device vnd # disk-like interfac #pseudo-device fss 4 # file system snapshot device # network pseudo-devices -#pseudo-device bpfilter # Berkeley packet filter +pseudo-device bpfilter # Berkeley packet filter #pseudo-device ipfilter # IP filter (firewall) and NAT pseudo-device loop # network loopback #pseudo-device ppp # Point-to-Point Protocol
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Tue Aug 7 19:38:28 UTC 2012
Modified Files:
src/sys/dev/pci: pucdata.c
Log Message:
Add some Intel's KT (Serial over LAN) devices.
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/pci/pucdata.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.78 src/sys/dev/pci/pucdata.c:1.79
--- src/sys/dev/pci/pucdata.c:1.78 Sun Aug 5 17:42:01 2012
+++ src/sys/dev/pci/pucdata.c Tue Aug 7 19:38:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.78 2012/08/05 17:42:01 msaitoh Exp $ */
+/* $NetBSD: pucdata.c,v 1.79 2012/08/07 19:38:28 msaitoh Exp $ */
/*
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.78 2012/08/05 17:42:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.79 2012/08/07 19:38:28 msaitoh Exp $");
#include
#include
@@ -1370,6 +1370,149 @@ const struct puc_device_description puc_
},
},
+ /* Intel 82946GZ/GL KT */
+ { "Intel 82946GZ/GL KT",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82946GZ_KT, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+ },
+ },
+
+ /* Intel P965/G965 KT */
+ { "Intel P965/G965 KT",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82P965_KT, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+ },
+ },
+
+ /* Intel PM965/GM965 KT */
+ { "Intel PM965/GM965 KT",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82965PM_KT, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+ },
+ },
+
+ /* Intel GME965/GLE965 KT */
+ { "Intel GME965/GLE965 KT",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82965GME_KT, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+ },
+ },
+
+ /* Intel Q963/Q965 KT */
+ { "Intel Q963/Q965 KT",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q965_KT, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+ },
+ },
+
+ /* Intel G33/G31/P35/P31 KT */
+ { "Intel Q35 KT",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G33_KT, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+ },
+ },
+
+ /* Intel Q35 KT */
+ { "Intel Q35 KT",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q35_KT, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+ },
+ },
+
+ /* Intel Q33 KT */
+ { "Intel Q33 KT",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q33_KT, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+ },
+ },
+
+ /* Intel X38 KT */
+ { "Intel X38 KT",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82X38_KT, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+ },
+ },
+
+ /* Intel 3200 KT */
+ { "Intel 3200 KT",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_3200_KT, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+ },
+ },
+
+ /* Intel GM45 KT */
+ { "Intel GM45 KT",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82GM45_KT, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+ },
+ },
+
+ /* Intel Q45 KT */
+ { "Intel Q45 KT",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q45_KT, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+ },
+ },
+
+ /* Intel 5 Series and Intel 3400 Series KT */
+ { "Intel 6 Series KT",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_3400_KT, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+ },
+ },
+
+ /* Intel 6 Series KT */
+ { "Intel 6 Series KT",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_6SERIES_KT, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+ },
+ },
+
+ /* Intel 7 Series KT */
+ { "Intel 7 Series KT",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_7SERIES_KT, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+ },
+ },
+
+ /* Intel C600/X79 Series KT */
+ { "Intel 7 Series KT",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C600_KT, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+ },
+ },
/* Intel EG20T UART */
{ "Intel EG20T UART #0",
CVS commit: src/sbin/fsck_msdos
Module Name:src
Committed By: jakllsch
Date: Tue Aug 7 19:30:42 UTC 2012
Modified Files:
src/sbin/fsck_msdos: fat.c
Log Message:
The free space value in the FSInfo block is merely unitialized when it is
0x. Fixes first part of bin/46743
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sbin/fsck_msdos/fat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_msdos/fat.c
diff -u src/sbin/fsck_msdos/fat.c:1.22 src/sbin/fsck_msdos/fat.c:1.23
--- src/sbin/fsck_msdos/fat.c:1.22 Sat Apr 11 07:14:50 2009
+++ src/sbin/fsck_msdos/fat.c Tue Aug 7 19:30:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fat.c,v 1.22 2009/04/11 07:14:50 lukem Exp $ */
+/* $NetBSD: fat.c,v 1.23 2012/08/07 19:30:41 jakllsch Exp $ */
/*
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
@@ -28,7 +28,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: fat.c,v 1.22 2009/04/11 07:14:50 lukem Exp $");
+__RCSID("$NetBSD: fat.c,v 1.23 2012/08/07 19:30:41 jakllsch Exp $");
#endif /* not lint */
#include
@@ -596,8 +596,9 @@ checklost(int dosfs, struct bootblock *b
if (boot->FSInfo) {
ret = 0;
- if (boot->FSFree != boot->NumFree) {
- pwarn("Free space in FSInfo block (%d) not correct (%d)\n",
+ if (boot->FSFree != 0xU &&
+ boot->FSFree != boot->NumFree) {
+ pwarn("Free space in FSInfo block (%u) not correct (%u)\n",
boot->FSFree, boot->NumFree);
if (ask(1, "fix")) {
boot->FSFree = boot->NumFree;
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Tue Aug 7 19:26:39 UTC 2012 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add some Intel's KT (Serial over LAN) devices. To generate a diff of this commit: cvs rdiff -u -r1.1130 -r1.1131 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1130 src/sys/dev/pci/pcidevs:1.1131 --- src/sys/dev/pci/pcidevs:1.1130 Mon Aug 6 18:52:40 2012 +++ src/sys/dev/pci/pcidevs Tue Aug 7 19:26:36 2012 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1130 2012/08/06 18:52:40 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1131 2012/08/07 19:26:36 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -2684,6 +2684,7 @@ product INTEL C600_EHCI_2 0x1d2d C600 US product INTEL C600_LAN 0x1d33 C600 LAN product INTEL C600_MEI_1 0x1d3a C600 MEI product INTEL C600_MEI_2 0x1d3b C600 MEI +product INTEL C600_KT 0x1d3d C600 KT product INTEL C600_VPCIE 0x1d3e C600 Virtual PCIE product INTEL C600_LPC 0x1d41 C600 LPC product INTEL C600_SAS_1 0x1d60 C600 SAS Controller @@ -3023,6 +3024,7 @@ product INTEL 82801I_EXP_6 0x294a 82801I product INTEL 82801I_IGP_C 0x294c 82801I (C) LAN Controller product INTEL 82946GZ_HB 0x2970 82946GZ Host Bridge product INTEL 82946GZ_IGD 0x2972 82946GZ Integrated Graphics Device +product INTEL 82946GZ_KT 0x2977 82946GZ KT product INTEL 82G35_HB 0x2980 82G35 Host Bridge product INTEL 82G35_IGD 0x2982 82G35 Integrated Graphics Device product INTEL 82G35_IGD_1 0x2983 82G35 Integrated Graphics Device @@ -3030,38 +3032,47 @@ product INTEL 82965Q_HB 0x2990 82965Q product INTEL 82965Q_EXP 0x2991 82965Q PCI Express Bridge product INTEL 82965Q_IGD 0x2992 82965Q Integrated Graphics Device product INTEL 82965Q_IGD_1 0x2993 82965Q Integrated Graphics Device +product INTEL 82Q965_KT 0x2997 82Q965 KT product INTEL 82965G_HB 0x29a0 82965G Host Bridge product INTEL 82965G_EXP 0x29a1 82965G PCI Express Bridge product INTEL 82965G_IGD 0x29a2 82965G Integrated Graphics Device product INTEL 82965G_IGD_1 0x29a3 82965G Integrated Graphics Device +product INTEL 82P965_KT 0x29a7 82P965/G965 KT product INTEL 82Q35_HB 0x29b0 82Q35 Host Bridge product INTEL 82Q35_EXP 0x29b1 82Q35 PCI Express Bridge product INTEL 82Q35_IGD 0x29b2 82Q35 Integrated Graphics Device product INTEL 82Q35_IGD_1 0x29b3 82Q35 Integrated Graphics Device +product INTEL 82Q35_KT 0x29b7 82Q35 KT product INTEL 82G33_HB 0x29c0 82G33/P35 Host Bridge product INTEL 82G33_EXP 0x29c1 82G33 PCI Express Port product INTEL 82G33_IGD 0x29c2 82G33 Integrated Graphics Device product INTEL 82G33_IGD_1 0x29c3 82G33 Integrated Graphics Device product INTEL 82801I_LAN 0x29c4 82801I LAN Controller +product INTEL 82G33_KT 0x29c7 82G33/G31/P35/P31 KT product INTEL 82Q33_HB 0x29d0 82Q35 Host Bridge product INTEL 82Q33_EXP 0x29d1 82Q35 PCI Express Bridge product INTEL 82Q33_IGD 0x29d2 82Q35 Integrated Graphics Device product INTEL 82Q33_IGD_1 0x29d3 82Q35 Integrated Graphics Device +product INTEL 82Q33_KT 0x29d7 82Q33 KT +product INTEL 82X38_KT 0x29e7 82X38 KT +product INTEL 3200_KT 0x29f7 3200 KT product INTEL 82965PM_HB 0x2a00 82965PM Host Bridge product INTEL 80862A01 0x2a01 80862A01 Mobile PCI Express Root Port product INTEL 82965PM_IGD 0x2a02 82965PM Integrated Graphics Device product INTEL 82965PM_IGD_1 0x2a03 82965PM Integrated Graphics Device product INTEL 82965PM_MEI 0x2a04 82965PM MEI Controller product INTEL 82965PM_IDE 0x2a06 82965PM IDE Interface -product INTEL 82965PM_KT 0x2a07 82965PM Serial Interface +product INTEL 82965PM_KT 0x2a07 82965PM/GM KT product INTEL 82965GME_HB 0x2a10 82965GME Host Bridge product INTEL 82965GME_IGD 0x2a12 82965GME Integrated Graphics Device +product INTEL 82965GME_KT 0x2a17 82965GME KT product INTEL 82GM45_HB 0x2a40 82GM45 Host Bridge product INTEL 82GM45_IGD 0x2a42 82GM45 Integrated Graphics Device product INTEL 82GM45_IGD_1 0x2a43 82GM45 Integrated Graphics Device product INTEL 82GM45_KT 0x2a47 82GM45 KT product INTEL 82IGD_E_HB 0x2e00 82IGD_E Host Bridge product INTEL 82IGD_E_IGD 0x2e02 82IGD_E Integrated Graphics +product INTEL 82Q45_KT 0x2e07 82Q45 KT product INTEL 82Q45_HB 0x2e10 82Q45 Host Bridge product INTEL 82Q45_EXP 0x2e11 82Q45 PCI Express Bridge product INTEL 82Q45_IGD 0x2e12 82Q45 Integrated Graphics Device
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: matt Date: Tue Aug 7 18:48:13 UTC 2012 Modified Files: src/distrib/sets/lists/comp: ad.arm ad.armeb Log Message: Add aeabi.h To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/comp/ad.arm cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/comp/ad.armeb Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/ad.arm diff -u src/distrib/sets/lists/comp/ad.arm:1.39 src/distrib/sets/lists/comp/ad.arm:1.40 --- src/distrib/sets/lists/comp/ad.arm:1.39 Thu Feb 16 21:15:05 2012 +++ src/distrib/sets/lists/comp/ad.arm Tue Aug 7 18:48:13 2012 @@ -1,8 +1,9 @@ -# $NetBSD: ad.arm,v 1.39 2012/02/16 21:15:05 christos Exp $ +# $NetBSD: ad.arm,v 1.40 2012/08/07 18:48:13 matt Exp $ ./usr/include/gcc-4.5/arm_neon.h comp-c-include gcccmds,gcc=45 ./usr/include/gcc-4.5/mmintrin.h comp-c-include gcccmds,gcc=45 ./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45 ./usr/include/armcomp-c-include +./usr/include/arm/aeabi.h comp-c-include ./usr/include/arm/ansi.h comp-c-include ./usr/include/arm/aout_machdep.h comp-c-include ./usr/include/arm/arm26comp-c-include Index: src/distrib/sets/lists/comp/ad.armeb diff -u src/distrib/sets/lists/comp/ad.armeb:1.5 src/distrib/sets/lists/comp/ad.armeb:1.6 --- src/distrib/sets/lists/comp/ad.armeb:1.5 Thu Jul 21 03:05:13 2011 +++ src/distrib/sets/lists/comp/ad.armeb Tue Aug 7 18:48:13 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ad.armeb,v 1.5 2011/07/21 03:05:13 mrg Exp $ +# $NetBSD: ad.armeb,v 1.6 2012/08/07 18:48:13 matt Exp $ # # The armeb MACHINE_ARCH never existed in NetBSD as a.out, so we # skip the old a.out compatibility tools. @@ -7,6 +7,7 @@ ./usr/include/gcc-4.5/mmintrin.h comp-c-include gcccmds,gcc=45 ./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45 ./usr/include/armcomp-c-include +./usr/include/arm/aeabi.h comp-c-include ./usr/include/arm/ansi.h comp-c-include ./usr/include/arm/aout_machdep.h comp-c-include ./usr/include/arm/arm26comp-c-include
CVS commit: src/sys/dev/dm
Module Name:src
Committed By: haad
Date: Tue Aug 7 16:11:11 UTC 2012
Modified Files:
src/sys/dev/dm: dm_target_stripe.c
Log Message:
Fix problem reported by jym on current-user@ patch was provided by mhitch@.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/dm/dm_target_stripe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/dm/dm_target_stripe.c
diff -u src/sys/dev/dm/dm_target_stripe.c:1.17 src/sys/dev/dm/dm_target_stripe.c:1.18
--- src/sys/dev/dm/dm_target_stripe.c:1.17 Wed Jan 4 16:05:53 2012
+++ src/sys/dev/dm/dm_target_stripe.c Tue Aug 7 16:11:11 2012
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_stripe.c,v 1.17 2012/01/04 16:05:53 haad Exp $*/
+/*$NetBSD: dm_target_stripe.c,v 1.18 2012/08/07 16:11:11 haad Exp $*/
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -128,7 +128,7 @@ dm_target_stripe_init(dm_dev_t * dmv, vo
* Parse a string, containing tokens delimited by white space,
* into an argument vector
*/
- for (ap = argv; ap < &argv[9] &&
+ for (ap = argv; ap <= &argv[9] &&
(*ap = strsep(¶ms, " \t")) != NULL;) {
if (**ap != '\0')
ap++;
