svn commit: r257882 - head/sys/modules/bwi
Author: adrian Date: Sat Nov 9 08:11:24 2013 New Revision: 257882 URL: http://svnweb.freebsd.org/changeset/base/257882 Log: Strip out this cruft; people should be making modules with a complete kernel config environment anyway. Modified: head/sys/modules/bwi/Makefile Modified: head/sys/modules/bwi/Makefile == --- head/sys/modules/bwi/Makefile Sat Nov 9 07:30:13 2013 (r257881) +++ head/sys/modules/bwi/Makefile Sat Nov 9 08:11:24 2013 (r257882) @@ -7,8 +7,4 @@ KMOD= if_bwi SRCS = if_bwi.c if_bwi_pci.c bwimac.c bwiphy.c bwirf.c SRCS += device_if.h bus_if.h pci_if.h opt_inet.h opt_bwi.h opt_wlan.h -opt_bwi.h: - echo '#define BWI_DEBUG 1' > opt_bwi.h -# echo '#define BWI_DEBUG_VERBOSE 1' >> opt_bwi.h - .include ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257883 - head/sys/dev/ppc
Author: eadler
Date: Sat Nov 9 08:27:55 2013
New Revision: 257883
URL: http://svnweb.freebsd.org/changeset/base/257883
Log:
Add support for SIIG x1 pci-e single parallel port card (JJ-E01211-S1)
PR: kern/182217
Submitted by: Craig Leres
MFC After:1 week
Modified:
head/sys/dev/ppc/ppc_pci.c
Modified: head/sys/dev/ppc/ppc_pci.c
==
--- head/sys/dev/ppc/ppc_pci.c Sat Nov 9 08:11:24 2013(r257882)
+++ head/sys/dev/ppc/ppc_pci.c Sat Nov 9 08:27:55 2013(r257883)
@@ -88,6 +88,7 @@ static struct pci_id pci_ids[] = {
{ 0x80001407, "Lava Computers 2SP-PCI parallel port", 0x10 },
{ 0x84031415, "Oxford Semiconductor OX12PCI840 Parallel port", 0x10 },
{ 0x95131415, "Oxford Semiconductor OX16PCI954 Parallel port", 0x10 },
+ { 0xc1101415, "Oxford Semiconductor OXPCIe952 Parallel port", 0x10 },
{ 0x98059710, "NetMos NM9805 1284 Printer port", 0x10 },
{ 0x98659710, "MosChip MCS9865 1284 Printer port", 0x10 },
{ 0x99019710, "MosChip MCS9901 PCIe to Peripheral Controller", 0x10 },
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r257883 - head/sys/dev/ppc
On Sat, 9 Nov 2013, Eitan Adler wrote:
Log:
Add support for SIIG x1 pci-e single parallel port card (JJ-E01211-S1)
PR:kern/182217
Submitted by: Craig Leres
MFC After: 1 week
Modified: head/sys/dev/ppc/ppc_pci.c
==
--- head/sys/dev/ppc/ppc_pci.c Sat Nov 9 08:11:24 2013(r257882)
+++ head/sys/dev/ppc/ppc_pci.c Sat Nov 9 08:27:55 2013(r257883)
@@ -88,6 +88,7 @@ static struct pci_id pci_ids[] = {
{ 0x80001407, "Lava Computers 2SP-PCI parallel port", 0x10 },
{ 0x84031415, "Oxford Semiconductor OX12PCI840 Parallel port", 0x10 },
{ 0x95131415, "Oxford Semiconductor OX16PCI954 Parallel port", 0x10 },
+ { 0xc1101415, "Oxford Semiconductor OXPCIe952 Parallel port", 0x10 },
{ 0x98059710, "NetMos NM9805 1284 Printer port", 0x10 },
{ 0x98659710, "MosChip MCS9865 1284 Printer port", 0x10 },
{ 0x99019710, "MosChip MCS9901 PCIe to Peripheral Controller", 0x10 },
Any chance of keeping sorted lists sorted?
Bruce
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257884 - head/usr.bin/split
Author: eadler
Date: Sat Nov 9 08:57:21 2013
New Revision: 257884
URL: http://svnweb.freebsd.org/changeset/base/257884
Log:
Change manual string conversion to expand_number
Reviewed by: adrian
Modified:
head/usr.bin/split/Makefile
head/usr.bin/split/split.c
Modified: head/usr.bin/split/Makefile
==
--- head/usr.bin/split/Makefile Sat Nov 9 08:27:55 2013(r257883)
+++ head/usr.bin/split/Makefile Sat Nov 9 08:57:21 2013(r257884)
@@ -2,5 +2,6 @@
# $FreeBSD$
PROG= split
+LDADD= -lutil
.include
Modified: head/usr.bin/split/split.c
==
--- head/usr.bin/split/split.c Sat Nov 9 08:27:55 2013(r257883)
+++ head/usr.bin/split/split.c Sat Nov 9 08:57:21 2013(r257884)
@@ -49,6 +49,7 @@ static const char sccsid[] = "@(#)split.
#include
#include
#include
+#include
#include
#include
#include
@@ -83,9 +84,8 @@ static void usage(void);
int
main(int argc, char **argv)
{
- intmax_t bytecnti;
- long scale;
int ch;
+ int error;
char *ep, *p;
setlocale(LC_ALL, "");
@@ -118,21 +118,9 @@ main(int argc, char **argv)
break;
case 'b': /* Byte count. */
errno = 0;
- if ((bytecnti = strtoimax(optarg, &ep, 10)) <= 0 ||
- strchr("kKmMgG", *ep) == NULL || errno != 0)
- errx(EX_USAGE,
- "%s: illegal byte count", optarg);
- if (*ep == 'k' || *ep == 'K')
- scale = 1024;
- else if (*ep == 'm' || *ep == 'M')
- scale = 1024 * 1024;
- else if (*ep == 'g' || *ep == 'G')
- scale = 1024 * 1024 * 1024;
- else
- scale = 1;
- if (bytecnti > OFF_MAX / scale)
+ error = expand_number(optarg, &bytecnt);
+ if (error == -1)
errx(EX_USAGE, "%s: offset too large", optarg);
- bytecnt = (off_t)(bytecnti * scale);
break;
case 'd': /* Decimal suffix */
dflag = true;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r257883 - head/sys/dev/ppc
On Sat, Nov 9, 2013 at 3:46 AM, Bruce Evans wrote:
> On Sat, 9 Nov 2013, Eitan Adler wrote:
>
>> Log:
>> Add support for SIIG x1 pci-e single parallel port card (JJ-E01211-S1)
>>
>> PR:kern/182217
>> Submitted by: Craig Leres
>> MFC After: 1 week
>>
>> Modified: head/sys/dev/ppc/ppc_pci.c
>>
>> ==
>> --- head/sys/dev/ppc/ppc_pci.c Sat Nov 9 08:11:24 2013(r257882)
>> +++ head/sys/dev/ppc/ppc_pci.c Sat Nov 9 08:27:55 2013(r257883)
>> @@ -88,6 +88,7 @@ static struct pci_id pci_ids[] = {
>> { 0x80001407, "Lava Computers 2SP-PCI parallel port", 0x10 },
>> { 0x84031415, "Oxford Semiconductor OX12PCI840 Parallel port",
>> 0x10 },
>> { 0x95131415, "Oxford Semiconductor OX16PCI954 Parallel port",
>> 0x10 },
>> + { 0xc1101415, "Oxford Semiconductor OXPCIe952 Parallel port", 0x10
>> },
>> { 0x98059710, "NetMos NM9805 1284 Printer port", 0x10 },
>> { 0x98659710, "MosChip MCS9865 1284 Printer port", 0x10 },
>> { 0x99019710, "MosChip MCS9901 PCIe to Peripheral Controller",
>> 0x10 },
>
>
> Any chance of keeping sorted lists sorted?
Sure. Shall I sort by ID or English text?
--
Eitan Adler
Source, Ports, Doc committer
Bugmeister, Ports Security teams
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257885 - head/usr.bin/split
Author: eadler
Date: Sat Nov 9 09:05:50 2013
New Revision: 257885
URL: http://svnweb.freebsd.org/changeset/base/257885
Log:
Add missed DPADD
Reported by: swild...@dragonflybsd.org
Modified:
head/usr.bin/split/Makefile
Modified: head/usr.bin/split/Makefile
==
--- head/usr.bin/split/Makefile Sat Nov 9 08:57:21 2013(r257884)
+++ head/usr.bin/split/Makefile Sat Nov 9 09:05:50 2013(r257885)
@@ -3,5 +3,6 @@
PROG= split
LDADD= -lutil
+DPADD= ${LIBUTIL}
.include
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257888 - in head: contrib/smbfs/lib/smb usr.sbin/mount_smbfs
Author: glebius
Date: Sat Nov 9 14:48:50 2013
New Revision: 257888
URL: http://svnweb.freebsd.org/changeset/base/257888
Log:
Use system libiconv, instead of trying to dlopen() it.
PR: 183153
Submitted by: Dominic Fandrey
Modified:
head/contrib/smbfs/lib/smb/nls.c
head/usr.sbin/mount_smbfs/Makefile
Modified: head/contrib/smbfs/lib/smb/nls.c
==
--- head/contrib/smbfs/lib/smb/nls.cSat Nov 9 14:46:24 2013
(r257887)
+++ head/contrib/smbfs/lib/smb/nls.cSat Nov 9 14:48:50 2013
(r257888)
@@ -36,12 +36,9 @@
__FBSDID("$FreeBSD$");
#include
-#include
+#include
#include
#include
-#ifndef APPLE
-#include
-#endif
#include
#include
#include
@@ -50,21 +47,10 @@ __FBSDID("$FreeBSD$");
#include
#include
-/*
- * prototype iconv* functions
- */
-typedef void *iconv_t;
-
-static iconv_t (*my_iconv_open)(const char *, const char *);
-static size_t(*my_iconv)(iconv_t, const char **, size_t *, char **, size_t *);
-static int(*my_iconv_close)(iconv_t);
-
u_char nls_lower[256];
u_char nls_upper[256];
static iconv_t nls_toext, nls_toloc;
-static int iconv_loaded;
-static void *iconv_lib;
int
nls_setlocale(const char *name)
@@ -90,32 +76,18 @@ nls_setrecode(const char *local, const c
#else
iconv_t icd;
- if (iconv_loaded == 2)
- return ENOENT;
- else if (iconv_loaded == 0) {
- iconv_loaded++;
- iconv_lib = dlopen("libiconv.so", RTLD_LAZY | RTLD_GLOBAL);
- if (iconv_lib == NULL) {
- warn("Unable to load iconv library: %s\n", dlerror());
- iconv_loaded++;
- return ENOENT;
- }
- my_iconv_open = dlsym(iconv_lib, "iconv_open");
- my_iconv = dlsym(iconv_lib, "iconv");
- my_iconv_close = dlsym(iconv_lib, "iconv_close");
- }
if (nls_toext)
- my_iconv_close(nls_toext);
+ iconv_close(nls_toext);
if (nls_toloc)
- my_iconv_close(nls_toloc);
+ iconv_close(nls_toloc);
nls_toext = nls_toloc = (iconv_t)0;
- icd = my_iconv_open(external, local);
+ icd = iconv_open(external, local);
if (icd == (iconv_t)-1)
return errno;
nls_toext = icd;
- icd = my_iconv_open(local, external);
+ icd = iconv_open(local, external);
if (icd == (iconv_t)-1) {
- my_iconv_close(nls_toext);
+ iconv_close(nls_toext);
nls_toext = (iconv_t)0;
return errno;
}
@@ -130,14 +102,11 @@ nls_str_toloc(char *dst, const char *src
char *p = dst;
size_t inlen, outlen;
- if (!iconv_loaded)
- return strcpy(dst, src);
-
if (nls_toloc == (iconv_t)0)
return strcpy(dst, src);
inlen = outlen = strlen(src);
- my_iconv(nls_toloc, NULL, NULL, &p, &outlen);
- while (my_iconv(nls_toloc, &src, &inlen, &p, &outlen) == -1) {
+ iconv(nls_toloc, NULL, NULL, &p, &outlen);
+ while (iconv(nls_toloc, &src, &inlen, &p, &outlen) == -1) {
*p++ = *src++;
inlen--;
outlen--;
@@ -152,14 +121,11 @@ nls_str_toext(char *dst, const char *src
char *p = dst;
size_t inlen, outlen;
- if (!iconv_loaded)
- return strcpy(dst, src);
-
if (nls_toext == (iconv_t)0)
return strcpy(dst, src);
inlen = outlen = strlen(src);
- my_iconv(nls_toext, NULL, NULL, &p, &outlen);
- while (my_iconv(nls_toext, &src, &inlen, &p, &outlen) == -1) {
+ iconv(nls_toext, NULL, NULL, &p, &outlen);
+ while (iconv(nls_toext, &src, &inlen, &p, &outlen) == -1) {
*p++ = *src++;
inlen--;
outlen--;
@@ -175,17 +141,14 @@ nls_mem_toloc(void *dst, const void *src
const char *s = src;
size_t inlen, outlen;
- if (!iconv_loaded)
- return memcpy(dst, src, size);
-
if (size == 0)
return NULL;
if (nls_toloc == (iconv_t)0)
return memcpy(dst, src, size);
inlen = outlen = size;
- my_iconv(nls_toloc, NULL, NULL, &p, &outlen);
- while (my_iconv(nls_toloc, &s, &inlen, &p, &outlen) == -1) {
+ iconv(nls_toloc, NULL, NULL, &p, &outlen);
+ while (iconv(nls_toloc, &s, &inlen, &p, &outlen) == -1) {
*p++ = *s++;
inlen--;
outlen--;
@@ -203,12 +166,12 @@ nls_mem_toext(void *dst, const void *src
if (size == 0)
return NULL;
- if (!iconv_loaded || nls_toext == (iconv_t)0)
+ if (nls_toext == (iconv_t)0)
return memcpy(dst, src, size);
inlen = outlen = size;
- my_iconv(nls_toext, NULL, NULL, &p, &outlen);
-
svn commit: r257891 - head
Author: pluknet
Date: Sat Nov 9 16:20:42 2013
New Revision: 257891
URL: http://svnweb.freebsd.org/changeset/base/257891
Log:
pkg_install has been removed on 20131031.
Approved by: portmgr (bdrewery)
Modified:
head/MAINTAINERS
Modified: head/MAINTAINERS
==
--- head/MAINTAINERSSat Nov 9 15:10:07 2013(r257890)
+++ head/MAINTAINERSSat Nov 9 16:20:42 2013(r257891)
@@ -99,7 +99,6 @@ nfs alfred Will be happy to review code
rpc.lockd alfred Will be happy to review code, but not mandatory.
truss alfred Will be happy to review code, but not mandatory.
rpcalfred Pre-commit review requested.
-pkg_installportmgr Pre-commit review or approval from portmgr@ requested.
linux emul emulation Please discuss changes here.
bs{diff,patch} cpercivaPre-commit review requested.
portsnap cpercivaPre-commit review requested.
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257892 - head/sys/dev/nand
Author: br
Date: Sat Nov 9 18:46:11 2013
New Revision: 257892
URL: http://svnweb.freebsd.org/changeset/base/257892
Log:
o Add ONFI signature check.
o Add Micron chip found in Freescale Vybrid Family
Phytec COSMIC board.
Approved by: cognet (mentor)
Modified:
head/sys/dev/nand/nand.h
head/sys/dev/nand/nand_generic.c
head/sys/dev/nand/nand_id.c
Modified: head/sys/dev/nand/nand.h
==
--- head/sys/dev/nand/nand.hSat Nov 9 16:20:42 2013(r257891)
+++ head/sys/dev/nand/nand.hSat Nov 9 18:46:11 2013(r257892)
@@ -122,7 +122,8 @@ MALLOC_DECLARE(M_NAND);
#define NAND_MAN_SAMSUNG 0xec
#define NAND_MAN_HYNIX 0xad
-#defineNAND_MAN_STMICRO0x20
+#define NAND_MAN_STMICRO 0x20
+#define NAND_MAN_MICRON0x2c
struct nand_id {
uint8_t man_id;
Modified: head/sys/dev/nand/nand_generic.c
==
--- head/sys/dev/nand/nand_generic.cSat Nov 9 16:20:42 2013
(r257891)
+++ head/sys/dev/nand/nand_generic.cSat Nov 9 18:46:11 2013
(r257892)
@@ -341,8 +341,12 @@ onfi_read_parameter(struct nand_chip *ch
NANDBUS_READ_BUFFER(nandbus, params, sizeof(struct onfi_params));
+ if (memcmp(params->signature, "ONFI", sizeof(params->signature))) {
+ device_printf(chip->dev, "Error: bad signature\n");
+ return (ENXIO);
+ }
+
/* TODO */
- /* Check for signature */
/* Check CRC */
/* Use redundant page if necessary */
Modified: head/sys/dev/nand/nand_id.c
==
--- head/sys/dev/nand/nand_id.c Sat Nov 9 16:20:42 2013(r257891)
+++ head/sys/dev/nand/nand_id.c Sat Nov 9 18:46:11 2013(r257892)
@@ -47,6 +47,8 @@ struct nand_params nand_ids[] = {
0x80, 0x200, 0x10, 0x20, 0 },
{ { NAND_MAN_STMICRO, 0xf1 }, "STMicro 128MB 3,3V 8-bit",
0x80, 2048, 64, 0x40, 0 },
+ { { NAND_MAN_MICRON, 0xcc }, "Micron NAND 512MiB 3,3V 16-bit",
+ 0x200, 2048, 64, 0x40, 0 },
};
struct nand_params *nand_get_params(struct nand_id *id)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r257883 - head/sys/dev/ppc
On Sat, 2013-11-09 at 03:58 -0500, Eitan Adler wrote:
> >> { 0x95131415, "Oxford Semiconductor OX16PCI954 Parallel
> port",
> >> 0x10 },
> >> + { 0xc1101415, "Oxford Semiconductor OXPCIe952 Parallel
> port", 0x10
> >> },
> >> { 0x98059710, "NetMos NM9805 1284 Printer port", 0x10 },
> >> { 0x98659710, "MosChip MCS9865 1284 Printer port", 0x10 },
> >> { 0x99019710, "MosChip MCS9901 PCIe to Peripheral
> Controller",
> >> 0x10 },
> >
> >
> > Any chance of keeping sorted lists sorted?
>
> Sure. Shall I sort by ID or English text?
>
>
Looks like its sorted by ID, so there ya go.
sean
signature.asc
Description: This is a digitally signed message part
svn commit: r257896 - head/sys/x86/iommu
Author: dim
Date: Sat Nov 9 20:09:02 2013
New Revision: 257896
URL: http://svnweb.freebsd.org/changeset/base/257896
Log:
Fix gcc warnings about casting away const in sys/x86/iommu/intel_drv.c.
Reviewed by: kib
Modified:
head/sys/x86/iommu/intel_drv.c
Modified: head/sys/x86/iommu/intel_drv.c
==
--- head/sys/x86/iommu/intel_drv.c Sat Nov 9 20:01:09 2013
(r257895)
+++ head/sys/x86/iommu/intel_drv.c Sat Nov 9 20:09:02 2013
(r257896)
@@ -900,12 +900,12 @@ dmar_inst_rmrr_iter(ACPI_DMAR_HEADER *dm
(uintmax_t)resmem->EndAddress);
}
- ptr = (char *)resmem + sizeof(*resmem);
- ptrend = (char *)resmem + resmem->Header.Length;
+ ptr = (const char *)resmem + sizeof(*resmem);
+ ptrend = (const char *)resmem + resmem->Header.Length;
for (;;) {
if (ptr >= ptrend)
break;
- devscope = (ACPI_DMAR_DEVICE_SCOPE *)ptr;
+ devscope = (const ACPI_DMAR_DEVICE_SCOPE *)ptr;
ptr += devscope->Length;
/* XXXKIB bridge */
if (devscope->EntryType != ACPI_DMAR_SCOPE_TYPE_ENDPOINT)
@@ -914,11 +914,11 @@ dmar_inst_rmrr_iter(ACPI_DMAR_HEADER *dm
dmar_print_path(iria->dmar->dev, "RMRR scope",
devscope->Bus, (devscope->Length -
sizeof(ACPI_DMAR_DEVICE_SCOPE)) / 2,
- (ACPI_DMAR_PCI_PATH *)(devscope + 1));
+ (const ACPI_DMAR_PCI_PATH *)(devscope + 1));
}
dev = dmar_path_dev(resmem->Segment, (devscope->Length -
sizeof(ACPI_DMAR_DEVICE_SCOPE)) / 2, devscope->Bus,
- (ACPI_DMAR_PCI_PATH *)(devscope + 1));
+ (const ACPI_DMAR_PCI_PATH *)(devscope + 1));
if (dev == NULL) {
if (dmar_match_verbose)
printf("null dev\n");
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r257888 - in head: contrib/smbfs/lib/smb usr.sbin/mount_smbfs
On Sat, Nov 09, 2013 at 02:48:50PM +, Gleb Smirnoff wrote:
> Author: glebius
> Date: Sat Nov 9 14:48:50 2013
> New Revision: 257888
> URL: http://svnweb.freebsd.org/changeset/base/257888
>
> Log:
> Use system libiconv, instead of trying to dlopen() it.
>
> PR: 183153
> Submitted by: Dominic Fandrey
>
> Modified:
> head/contrib/smbfs/lib/smb/nls.c
> head/usr.sbin/mount_smbfs/Makefile
>
> Modified: head/contrib/smbfs/lib/smb/nls.c
> ==
> --- head/contrib/smbfs/lib/smb/nls.c Sat Nov 9 14:46:24 2013
> (r257887)
> +++ head/contrib/smbfs/lib/smb/nls.c Sat Nov 9 14:48:50 2013
> (r257888)
> @@ -36,12 +36,9 @@
> __FBSDID("$FreeBSD$");
>
> #include
> -#include
> +#include
> #include
> #include
> -#ifndef APPLE
> -#include
> -#endif
> #include
> #include
> #include
> @@ -50,21 +47,10 @@ __FBSDID("$FreeBSD$");
> #include
> #include
>
> -/*
> - * prototype iconv* functions
> - */
> -typedef void *iconv_t;
> -
> -static iconv_t (*my_iconv_open)(const char *, const char *);
> -static size_t(*my_iconv)(iconv_t, const char **, size_t *, char **, size_t
> *);
> -static int(*my_iconv_close)(iconv_t);
> -
> u_char nls_lower[256];
> u_char nls_upper[256];
>
> static iconv_t nls_toext, nls_toloc;
> -static int iconv_loaded;
> -static void *iconv_lib;
>
> int
> nls_setlocale(const char *name)
> @@ -90,32 +76,18 @@ nls_setrecode(const char *local, const c
> #else
> iconv_t icd;
>
> - if (iconv_loaded == 2)
> - return ENOENT;
> - else if (iconv_loaded == 0) {
> - iconv_loaded++;
> - iconv_lib = dlopen("libiconv.so", RTLD_LAZY | RTLD_GLOBAL);
> - if (iconv_lib == NULL) {
> - warn("Unable to load iconv library: %s\n", dlerror());
> - iconv_loaded++;
> - return ENOENT;
> - }
> - my_iconv_open = dlsym(iconv_lib, "iconv_open");
> - my_iconv = dlsym(iconv_lib, "iconv");
> - my_iconv_close = dlsym(iconv_lib, "iconv_close");
> - }
> if (nls_toext)
> - my_iconv_close(nls_toext);
> + iconv_close(nls_toext);
> if (nls_toloc)
> - my_iconv_close(nls_toloc);
> + iconv_close(nls_toloc);
> nls_toext = nls_toloc = (iconv_t)0;
> - icd = my_iconv_open(external, local);
> + icd = iconv_open(external, local);
> if (icd == (iconv_t)-1)
> return errno;
> nls_toext = icd;
> - icd = my_iconv_open(local, external);
> + icd = iconv_open(local, external);
> if (icd == (iconv_t)-1) {
> - my_iconv_close(nls_toext);
> + iconv_close(nls_toext);
> nls_toext = (iconv_t)0;
> return errno;
> }
> @@ -130,14 +102,11 @@ nls_str_toloc(char *dst, const char *src
> char *p = dst;
> size_t inlen, outlen;
>
> - if (!iconv_loaded)
> - return strcpy(dst, src);
> -
> if (nls_toloc == (iconv_t)0)
> return strcpy(dst, src);
> inlen = outlen = strlen(src);
> - my_iconv(nls_toloc, NULL, NULL, &p, &outlen);
> - while (my_iconv(nls_toloc, &src, &inlen, &p, &outlen) == -1) {
> + iconv(nls_toloc, NULL, NULL, &p, &outlen);
> + while (iconv(nls_toloc, &src, &inlen, &p, &outlen) == -1) {
> *p++ = *src++;
> inlen--;
> outlen--;
> @@ -152,14 +121,11 @@ nls_str_toext(char *dst, const char *src
> char *p = dst;
> size_t inlen, outlen;
>
> - if (!iconv_loaded)
> - return strcpy(dst, src);
> -
> if (nls_toext == (iconv_t)0)
> return strcpy(dst, src);
> inlen = outlen = strlen(src);
> - my_iconv(nls_toext, NULL, NULL, &p, &outlen);
> - while (my_iconv(nls_toext, &src, &inlen, &p, &outlen) == -1) {
> + iconv(nls_toext, NULL, NULL, &p, &outlen);
> + while (iconv(nls_toext, &src, &inlen, &p, &outlen) == -1) {
> *p++ = *src++;
> inlen--;
> outlen--;
> @@ -175,17 +141,14 @@ nls_mem_toloc(void *dst, const void *src
> const char *s = src;
> size_t inlen, outlen;
>
> - if (!iconv_loaded)
> - return memcpy(dst, src, size);
> -
> if (size == 0)
> return NULL;
>
> if (nls_toloc == (iconv_t)0)
> return memcpy(dst, src, size);
> inlen = outlen = size;
> - my_iconv(nls_toloc, NULL, NULL, &p, &outlen);
> - while (my_iconv(nls_toloc, &s, &inlen, &p, &outlen) == -1) {
> + iconv(nls_toloc, NULL, NULL, &p, &outlen);
> + while (iconv(nls_toloc, &s, &inlen, &p, &outlen) == -1) {
> *p++ = *s++;
> inlen--;
> outlen--;
> @@ -203,12 +166,12 @@ nls_mem_toext(void *dst, const void *src
> if (size == 0)
> return NULL;
>
> - if (!iconv
svn commit: r257898 - in head/sys: kern sys
Author: kib
Date: Sat Nov 9 20:30:13 2013
New Revision: 257898
URL: http://svnweb.freebsd.org/changeset/base/257898
Log:
Both vn_close() and VFS_PROLOGUE() evaluate vp->v_mount twice, without
holding the vnode lock; vp->v_mount is checked first for NULL
equiality, and then dereferenced if not NULL. If vnode is reclaimed
meantime, second dereference would still give NULL. Change
VFS_PROLOGUE() to evaluate the mp once, convert MNTK_SHARED_WRITES and
MNTK_EXTENDED_SHARED tests into inline functions.
Reviewed by: alc
Tested by:pho
Sponsored by: The FreeBSD Foundation
MFC after:2 weeks
Modified:
head/sys/kern/vfs_lookup.c
head/sys/kern/vfs_vnops.c
head/sys/sys/mount.h
Modified: head/sys/kern/vfs_lookup.c
==
--- head/sys/kern/vfs_lookup.c Sat Nov 9 20:11:21 2013(r257897)
+++ head/sys/kern/vfs_lookup.c Sat Nov 9 20:30:13 2013(r257898)
@@ -424,13 +424,8 @@ needs_exclusive_leaf(struct mount *mp, i
* extended shared operations, then use a shared lock for the
* leaf node, otherwise use an exclusive lock.
*/
- if (flags & ISOPEN) {
- if (mp != NULL &&
- (mp->mnt_kern_flag & MNTK_EXTENDED_SHARED))
- return (0);
- else
- return (1);
- }
+ if ((flags & ISOPEN) != 0)
+ return (!MNT_EXTENDED_SHARED(mp));
/*
* Lookup requests outside of open() that specify LOCKSHARED
Modified: head/sys/kern/vfs_vnops.c
==
--- head/sys/kern/vfs_vnops.c Sat Nov 9 20:11:21 2013(r257897)
+++ head/sys/kern/vfs_vnops.c Sat Nov 9 20:30:13 2013(r257898)
@@ -360,8 +360,8 @@ vn_close(vp, flags, file_cred, td)
struct mount *mp;
int error, lock_flags;
- if (vp->v_type != VFIFO && !(flags & FWRITE) && vp->v_mount != NULL &&
- vp->v_mount->mnt_kern_flag & MNTK_EXTENDED_SHARED)
+ if (vp->v_type != VFIFO && (flags & FWRITE) == 0 &&
+ MNT_EXTENDED_SHARED(vp->v_mount))
lock_flags = LK_SHARED;
else
lock_flags = LK_EXCLUSIVE;
Modified: head/sys/sys/mount.h
==
--- head/sys/sys/mount.hSat Nov 9 20:11:21 2013(r257897)
+++ head/sys/sys/mount.hSat Nov 9 20:30:13 2013(r257898)
@@ -362,8 +362,19 @@ void __mnt_vnode_markerfree_act
#define MNTK_LOOKUP_SHARED 0x4000 /* FS supports shared lock lookups */
#defineMNTK_NOKNOTE0x8000 /* Don't send KNOTEs from VOP
hooks */
-#defineMNT_SHARED_WRITES(mp) (((mp) != NULL) &&\
- ((mp)->mnt_kern_flag & MNTK_SHARED_WRITES))
+static inline int
+MNT_SHARED_WRITES(struct mount *mp)
+{
+
+ return (mp != NULL && (mp->mnt_kern_flag & MNTK_SHARED_WRITES) != 0);
+}
+
+static inline int
+MNT_EXTENDED_SHARED(struct mount *mp)
+{
+
+ return (mp != NULL && (mp->mnt_kern_flag & MNTK_EXTENDED_SHARED) != 0);
+}
/*
* Sysctl CTL_VFS definitions.
@@ -636,10 +647,12 @@ struct vfsops {
vfs_statfs_t __vfs_statfs;
#defineVFS_PROLOGUE(MP)do {
\
+ struct mount *mp__; \
int _enable_stops; \
\
- _enable_stops = ((MP) != NULL &&\
- ((MP)->mnt_vfc->vfc_flags & VFCF_SBDRY) && sigdeferstop())
+ mp__ = (MP);\
+ _enable_stops = (mp__ != NULL &&\
+ (mp__->mnt_vfc->vfc_flags & VFCF_SBDRY) && sigdeferstop())
#defineVFS_EPILOGUE(MP)
\
if (_enable_stops) \
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257899 - in head/sys: kern vm
Author: kib
Date: Sat Nov 9 20:36:29 2013
New Revision: 257899
URL: http://svnweb.freebsd.org/changeset/base/257899
Log:
If filesystem declares that it supports shared locking for writes, use
shared vnode lock for VOP_PUTPAGES() as well. The only such
filesystem in the tree is ZFS, and it uses
vnode_pager_generic_putpages(), which performs the pageout with
VOP_WRITE().
Reviewed by: alc
Discussed with: avg
Tested by:pho
Sponsored by: The FreeBSD Foundation
MFC after:2 weeks
Modified:
head/sys/kern/vnode_if.src
head/sys/vm/vm_pageout.c
Modified: head/sys/kern/vnode_if.src
==
--- head/sys/kern/vnode_if.src Sat Nov 9 20:30:13 2013(r257898)
+++ head/sys/kern/vnode_if.src Sat Nov 9 20:36:29 2013(r257899)
@@ -477,7 +477,7 @@ vop_getpages {
};
-%% putpagesvp E E E
+%% putpagesvp L L L
vop_putpages {
IN struct vnode *vp;
Modified: head/sys/vm/vm_pageout.c
==
--- head/sys/vm/vm_pageout.cSat Nov 9 20:30:13 2013(r257898)
+++ head/sys/vm/vm_pageout.cSat Nov 9 20:36:29 2013(r257899)
@@ -570,6 +570,7 @@ vm_pageout_launder(struct vm_pagequeue *
vm_object_t object;
vm_paddr_t pa;
vm_page_t m, m_tmp, next;
+ int lockmode;
vm_pagequeue_lock(pq);
TAILQ_FOREACH_SAFE(m, &pq->pq_pl, plinks.q, next) {
@@ -605,7 +606,9 @@ vm_pageout_launder(struct vm_pagequeue *
vm_object_reference_locked(object);
VM_OBJECT_WUNLOCK(object);
(void)vn_start_write(vp, &mp, V_WAIT);
- vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
+ lockmode = MNT_SHARED_WRITES(vp->v_mount) ?
+ LK_SHARED : LK_EXCLUSIVE;
+ vn_lock(vp, lockmode | LK_RETRY);
VM_OBJECT_WLOCK(object);
vm_object_page_clean(object, 0, 0, OBJPC_SYNC);
VM_OBJECT_WUNLOCK(object);
@@ -902,6 +905,7 @@ vm_pageout_scan(struct vm_domain *vmd, i
int act_delta;
int vnodes_skipped = 0;
int maxlaunder;
+ int lockmode;
boolean_t queues_locked;
/*
@@ -1193,7 +1197,9 @@ vm_pageout_scan(struct vm_domain *vmd, i
("vp %p with NULL v_mount", vp));
vm_object_reference_locked(object);
VM_OBJECT_WUNLOCK(object);
- if (vget(vp, LK_EXCLUSIVE | LK_TIMELOCK,
+ lockmode = MNT_SHARED_WRITES(vp->v_mount) ?
+ LK_SHARED : LK_EXCLUSIVE;
+ if (vget(vp, lockmode | LK_TIMELOCK,
curthread)) {
VM_OBJECT_WLOCK(object);
++pageout_lock_miss;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257900 - head/sys/x86/iommu
Author: dim
Date: Sat Nov 9 20:36:52 2013
New Revision: 257900
URL: http://svnweb.freebsd.org/changeset/base/257900
Log:
Fix (erroneous) gcc warnings about usage of uninitialized variables in
sys/x86/iommu/intel_idpgtbl.c.
Reviewed by: kib
Modified:
head/sys/x86/iommu/intel_idpgtbl.c
Modified: head/sys/x86/iommu/intel_idpgtbl.c
==
--- head/sys/x86/iommu/intel_idpgtbl.c Sat Nov 9 20:36:29 2013
(r257899)
+++ head/sys/x86/iommu/intel_idpgtbl.c Sat Nov 9 20:36:52 2013
(r257900)
@@ -167,6 +167,8 @@ ctx_get_idmap_pgtbl(struct dmar_ctx *ctx
vm_page_t m;
int leaf, i;
+ leaf = 0; /* silence gcc */
+
/*
* First, determine where to stop the paging structures.
*/
@@ -619,6 +621,7 @@ ctx_unmap_buf_locked(struct dmar_ctx *ct
(uintmax_t)size));
KASSERT((flags & ~DMAR_PGF_WAITOK) == 0, ("invalid flags %x", flags));
+ pg_sz = 0; /* silence gcc */
base1 = base;
size1 = size;
flags |= DMAR_PGF_OBJL;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257901 - in head/sys/fs: nfs nfsclient
Author: rmacklem
Date: Sat Nov 9 21:24:56 2013
New Revision: 257901
URL: http://svnweb.freebsd.org/changeset/base/257901
Log:
Fix an NFSv4.1 client specific case where a forced dismount would hang.
The hang occurred in nfsv4_setsequence() when it couldn't find an
available session slot and is fixed by checking for a forced dismount
in progress and just returning for this case.
MFC after:1 month
Modified:
head/sys/fs/nfs/nfs_commonsubs.c
head/sys/fs/nfs/nfs_var.h
head/sys/fs/nfsclient/nfs_clcomsubs.c
Modified: head/sys/fs/nfs/nfs_commonsubs.c
==
--- head/sys/fs/nfs/nfs_commonsubs.cSat Nov 9 20:36:52 2013
(r257900)
+++ head/sys/fs/nfs/nfs_commonsubs.cSat Nov 9 21:24:56 2013
(r257901)
@@ -3693,8 +3693,8 @@ nfsv4_seqsess_cacherep(uint32_t slotid,
* Generate the xdr for an NFSv4.1 Sequence Operation.
*/
APPLESTATIC void
-nfsv4_setsequence(struct nfsrv_descript *nd, struct nfsclsession *sep,
-int dont_replycache)
+nfsv4_setsequence(struct nfsmount *nmp, struct nfsrv_descript *nd,
+struct nfsclsession *sep, int dont_replycache)
{
uint32_t *tl, slotseq = 0;
int i, maxslot, slotpos;
@@ -3717,9 +3717,21 @@ nfsv4_setsequence(struct nfsrv_descript
}
bitval <<= 1;
}
- if (slotpos == -1)
+ if (slotpos == -1) {
+ /*
+* If a forced dismount is in progress, just return.
+* This RPC attempt will fail when it calls
+* newnfs_request().
+*/
+ if ((nmp->nm_mountp->mnt_kern_flag & MNTK_UNMOUNTF)
+ != 0) {
+ mtx_unlock(&sep->nfsess_mtx);
+ return;
+ }
+ /* Wake up once/sec, to check for a forced dismount. */
(void)mtx_sleep(&sep->nfsess_slots, &sep->nfsess_mtx,
- PZERO, "nfsclseq", 0);
+ PZERO, "nfsclseq", hz);
+ }
} while (slotpos == -1);
/* Now, find the highest slot in use. (nfsc_slots is 64bits) */
bitval = 1;
Modified: head/sys/fs/nfs/nfs_var.h
==
--- head/sys/fs/nfs/nfs_var.h Sat Nov 9 20:36:52 2013(r257900)
+++ head/sys/fs/nfs/nfs_var.h Sat Nov 9 21:24:56 2013(r257901)
@@ -265,7 +265,8 @@ int nfsv4_getipaddr(struct nfsrv_descrip
int nfsv4_seqsession(uint32_t, uint32_t, uint32_t, struct nfsslot *,
struct mbuf **, uint16_t);
void nfsv4_seqsess_cacherep(uint32_t, struct nfsslot *, struct mbuf *);
-void nfsv4_setsequence(struct nfsrv_descript *, struct nfsclsession *, int);
+void nfsv4_setsequence(struct nfsmount *, struct nfsrv_descript *,
+struct nfsclsession *, int);
void nfsv4_freeslot(struct nfsclsession *, int);
/* nfs_clcomsubs.c */
Modified: head/sys/fs/nfsclient/nfs_clcomsubs.c
==
--- head/sys/fs/nfsclient/nfs_clcomsubs.c Sat Nov 9 20:36:52 2013
(r257900)
+++ head/sys/fs/nfsclient/nfs_clcomsubs.c Sat Nov 9 21:24:56 2013
(r257901)
@@ -203,10 +203,11 @@ nfscl_reqstart(struct nfsrv_descript *nd
NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED);
*tl = txdr_unsigned(NFSV4OP_SEQUENCE);
if (sep == NULL)
- nfsv4_setsequence(nd, NFSMNT_MDSSESSION(nmp),
+ nfsv4_setsequence(nmp, nd,
+ NFSMNT_MDSSESSION(nmp),
nfs_bigreply[procnum]);
else
- nfsv4_setsequence(nd, sep,
+ nfsv4_setsequence(nmp, nd, sep,
nfs_bigreply[procnum]);
}
if (nfsv4_opflag[nfsv4_opmap[procnum].op].needscfh > 0) {
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257902 - head/sys/x86/iommu
Author: dim Date: Sat Nov 9 22:00:44 2013 New Revision: 257902 URL: http://svnweb.freebsd.org/changeset/base/257902 Log: Fix gcc warning about an empty device_printf() format string in sys/x86/iommu/intel_fault.c. Reviewed by: kib Modified: head/sys/x86/iommu/intel_fault.c Modified: head/sys/x86/iommu/intel_fault.c == --- head/sys/x86/iommu/intel_fault.cSat Nov 9 21:24:56 2013 (r257901) +++ head/sys/x86/iommu/intel_fault.cSat Nov 9 22:00:44 2013 (r257902) @@ -215,7 +215,7 @@ dmar_fault_task(void *arg, int pending _ ctx->flags |= DMAR_CTX_FAULTED; ctx->last_fault_rec[0] = fault_rec[0]; ctx->last_fault_rec[1] = fault_rec[1]; - device_printf(ctx->ctx_tag.owner, ""); + device_print_prettyname(ctx->ctx_tag.owner); } DMAR_UNLOCK(unit); printf( ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257903 - head/sys/x86/iommu
Author: dim
Date: Sat Nov 9 22:05:29 2013
New Revision: 257903
URL: http://svnweb.freebsd.org/changeset/base/257903
Log:
Fix gcc warning about an uninitialized bool in sys/x86/iommu/intel_drv.c.
Reviewed by: kib
Modified:
head/sys/x86/iommu/intel_drv.c
Modified: head/sys/x86/iommu/intel_drv.c
==
--- head/sys/x86/iommu/intel_drv.c Sat Nov 9 22:00:44 2013
(r257902)
+++ head/sys/x86/iommu/intel_drv.c Sat Nov 9 22:05:29 2013
(r257903)
@@ -1049,6 +1049,8 @@ DB_FUNC(dmar_ctx, db_dmar_print_ctx, db_
}
show_mappings = strchr(db_tok_string, 'm') != NULL;
t = db_read_token();
+ } else {
+ show_mappings = false;
}
if (t == tNUMBER) {
domain = db_tok_number;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257904 - head/sys/sys
Author: kib
Date: Sat Nov 9 22:28:04 2013
New Revision: 257904
URL: http://svnweb.freebsd.org/changeset/base/257904
Log:
Hide MNT_SHARED_WRITES() and MNT_EXTENDED_SHARED() under the #ifdef
_KERNEL braces. Struct mount is only defined for the kernel build.
Reported and tested by: andreast
Sponsored by: The FreeBSD Foundation
MFC after:2 weeks
Modified:
head/sys/sys/mount.h
Modified: head/sys/sys/mount.h
==
--- head/sys/sys/mount.hSat Nov 9 22:05:29 2013(r257903)
+++ head/sys/sys/mount.hSat Nov 9 22:28:04 2013(r257904)
@@ -362,6 +362,7 @@ void __mnt_vnode_markerfree_act
#define MNTK_LOOKUP_SHARED 0x4000 /* FS supports shared lock lookups */
#defineMNTK_NOKNOTE0x8000 /* Don't send KNOTEs from VOP
hooks */
+#ifdef _KERNEL
static inline int
MNT_SHARED_WRITES(struct mount *mp)
{
@@ -375,6 +376,7 @@ MNT_EXTENDED_SHARED(struct mount *mp)
return (mp != NULL && (mp->mnt_kern_flag & MNTK_EXTENDED_SHARED) != 0);
}
+#endif
/*
* Sysctl CTL_VFS definitions.
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r257883 - head/sys/dev/ppc
On Sat, Nov 9, 2013 at 2:55 PM, Sean Bruno wrote:
> On Sat, 2013-11-09 at 03:58 -0500, Eitan Adler wrote:
>> >> { 0x95131415, "Oxford Semiconductor OX16PCI954 Parallel
>> port",
>> >> 0x10 },
>> >> + { 0xc1101415, "Oxford Semiconductor OXPCIe952 Parallel
>> port", 0x10
>> >> },
>> >> { 0x98059710, "NetMos NM9805 1284 Printer port", 0x10 },
>> >> { 0x98659710, "MosChip MCS9865 1284 Printer port", 0x10 },
>> >> { 0x99019710, "MosChip MCS9901 PCIe to Peripheral
>> Controller",
>> >> 0x10 },
>> >
>> >
>> > Any chance of keeping sorted lists sorted?
>>
>> Sure. Shall I sort by ID or English text?
>>
>>
>
> Looks like its sorted by ID, so there ya go.
0x05111407 comes after 0x1020131f but Lava comes after SIIG. I don't
care either way.
--
Eitan Adler
Source, Ports, Doc committer
Bugmeister, Ports Security teams
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257906 - head/tools/tools/netmap
Author: hiren Date: Sun Nov 10 02:43:09 2013 New Revision: 257906 URL: http://svnweb.freebsd.org/changeset/base/257906 Log: Minor spelling correction. Modified: head/tools/tools/netmap/pkt-gen.c Modified: head/tools/tools/netmap/pkt-gen.c == --- head/tools/tools/netmap/pkt-gen.c Sat Nov 9 23:27:37 2013 (r257905) +++ head/tools/tools/netmap/pkt-gen.c Sun Nov 10 02:43:09 2013 (r257906) @@ -277,11 +277,11 @@ system_ncpus(void) /* * parse the vale configuration in conf and put it in nmr. * The configuration may consist of 0 to 4 numbers separated - * by commas: #tx-slots,#rx-slots,#tx-rinzgs,#rx-rings. + * by commas: #tx-slots,#rx-slots,#tx-rings,#rx-rings. * Missing numbers or zeroes stand for default values. * As an additional convenience, if exactly one number - * is specified, then this is assigned to bot #tx-slots and #rx-slots. - * If there is no 4th number, then the 3rd is assigned to bot #tx-rings + * is specified, then this is assigned to both #tx-slots and #rx-slots. + * If there is no 4th number, then the 3rd is assigned to both #tx-rings * and #rx-rings. */ void parse_nmr_config(const char* conf, struct nmreq *nmr) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257908 - head/share/dict
Author: eadler
Date: Sun Nov 10 03:28:36 2013
New Revision: 257908
URL: http://svnweb.freebsd.org/changeset/base/257908
Log:
Remove dead link
Modified:
head/share/dict/README
Modified: head/share/dict/README
==
--- head/share/dict/README Sun Nov 10 02:49:20 2013(r257907)
+++ head/share/dict/README Sun Nov 10 03:28:36 2013(r257908)
@@ -10,12 +10,6 @@ noun and adverbial phrases. The wordlis
-- James A. Woods{ihnp4,hplabs}!ames!jaw(or jaw@riacs)
-Dictionaries for other languages, e.g. Afrikaans, American, Aussie,
-Chinese, Croatian, Czech, Danish, Dutch, Esperanto, Finnish, French,
-German, Hindi, Hungarian, Italian, Japanese, Latin, Norwegian, Polish,
-Russian, Spanish, Swahili, Swedish, Yiddish, are available
-at ftp://ftp.ox.ac.uk/pub/wordlists.
-
Country names are stored in the file /usr/share/misc/iso3166.
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257909 - head/lib/libc/string
Author: eadler Date: Sun Nov 10 04:06:46 2013 New Revision: 257909 URL: http://svnweb.freebsd.org/changeset/base/257909 Log: Fix typo: site_t -> size_t Obtained From:DragonflyBSD (1ac92c8c857a15dc010924c5f066da404e568640) Modified: head/lib/libc/string/strcasecmp.3 Modified: head/lib/libc/string/strcasecmp.3 == --- head/lib/libc/string/strcasecmp.3 Sun Nov 10 03:28:36 2013 (r257908) +++ head/lib/libc/string/strcasecmp.3 Sun Nov 10 04:06:46 2013 (r257909) @@ -50,7 +50,7 @@ .Ft int .Fn strcasecmp_l "const char *s1" "const char *s2" "locale_t loc" .Ft int -.Fn strncasecmp_l "const char *s1" "const char *s2" "site_t len" "locale_t loc" +.Fn strncasecmp_l "const char *s1" "const char *s2" "size_t len" "locale_t loc" .Sh DESCRIPTION The .Fn strcasecmp ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r257910 - head/sys/ia64/ia64
Author: marcel Date: Sun Nov 10 04:22:40 2013 New Revision: 257910 URL: http://svnweb.freebsd.org/changeset/base/257910 Log: Don't enable interrupts before we call sched_throw(). Interrupts are expected to be disabled by virtue of md_spinlock_count=1. Modified: head/sys/ia64/ia64/mp_machdep.c Modified: head/sys/ia64/ia64/mp_machdep.c == --- head/sys/ia64/ia64/mp_machdep.c Sun Nov 10 04:06:46 2013 (r257909) +++ head/sys/ia64/ia64/mp_machdep.c Sun Nov 10 04:22:40 2013 (r257910) @@ -253,8 +253,6 @@ ia64_ap_startup(void) ia64_set_tpr(0); ia64_srlz_d(); - ia64_enable_intr(); - sched_throw(NULL); /* NOTREACHED */ } ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r257883 - head/sys/dev/ppc
On Sat, 9 Nov 2013, Eitan Adler wrote:
On Sat, Nov 9, 2013 at 2:55 PM, Sean Bruno wrote:
On Sat, 2013-11-09 at 03:58 -0500, Eitan Adler wrote:
{ 0x95131415, "Oxford Semiconductor OX16PCI954 Parallel
port",
0x10 },
+ { 0xc1101415, "Oxford Semiconductor OXPCIe952 Parallel
port", 0x10
},
{ 0x98059710, "NetMos NM9805 1284 Printer port", 0x10 },
{ 0x98659710, "MosChip MCS9865 1284 Printer port", 0x10 },
{ 0x99019710, "MosChip MCS9901 PCIe to Peripheral
Controller",
0x10 },
Any chance of keeping sorted lists sorted?
Sure. Shall I sort by ID or English text?
Looks like its sorted by ID, so there ya go.
0x05111407 comes after 0x1020131f but Lava comes after SIIG. I don't
care either way.
It has been broken before.
Most or all tables of pci ids in FreeBSD are sorted by id, following
/usr/share/misc/pci_vendors. This one was no exception until it was
broken.
The previous breakage was more complete. It unsorts by both id and
name (Lava was placed near Lava, but Lava SP was unsorted before
Lava Computers). It has the following "order":
- first sort on the first word of the name ("Lava")
- next sort on the id
The order is then uniquely determined in this case.
The ordering by id is more complicated and thus has more potential for
bitrot in puc/pucdata.c. There the ids are split into 2 parts and
there are sub-ids, giving 4 16-bit numbers instead of 1 32-bit one,
exactly as in pci_vendors for the first 2 numbers. The 32-bit numbers
are in little-endian order, so when split, sorting by id sorts on the
vendor id first, unlike in tables with 1 32-bit number like the above.
This ordering is better would group the Oxford devices in the above
together (but not sorted by name relative to other vendors). But it
would be too painful to maintain with 32-bit numbers. This splitting
I sorted the pucdata.c declaration lines and got the following:
% --- pucdata 2013-11-10 03:10:31.661338000 +
% +++ pucdata.sorted2013-11-10 03:10:45.615559000 +
% @@ -1,2 +1,4 @@
% + {
% { 0x0009, 0x7168, 0x, 0,
% + { 0x1014, 0x0297, 0x, 0,
% { 0x103c, 0x1048, 0x103c, 0x1049,
% @@ -25,3 +27,2 @@
% { 0x11fe, 0x8019, 0x, 0,
% - { 0x1014, 0x0297, 0x, 0,
% { 0x131f, 0x1010, 0x, 0,
% @@ -94,5 +95,4 @@
% { 0x1407, 0x0181, 0x, 0,
% - { 0x1409, 0x7268, 0x, 0,
% { 0x1409, 0x7168, 0x, 0,
% - {
% + { 0x1409, 0x7268, 0x, 0,
% { 0x1415, 0x9501, 0x131f, 0x2050,
% @@ -108,7 +108,2 @@
% { 0x1415, 0x9538, 0x, 0,
% - { 0x155f, 0x0331, 0x, 0,
% - { 0x155f, 0xB012, 0x, 0,
% - { 0x155f, 0xB022, 0x, 0,
% - { 0x155f, 0xB004, 0x, 0,
% - { 0x155f, 0xB008, 0x, 0,
% { 0x1415, 0xc138, 0x, 0,
% @@ -127,5 +122,5 @@
% { 0x14d2, 0xa005, 0x, 0,
% - { 0x14d2, 0xe020, 0x, 0,
% { 0x14d2, 0xa007, 0x, 0,
% { 0x14d2, 0xa008, 0x, 0,
% + { 0x14d2, 0xe020, 0x, 0,
% { 0x14db, 0x2130, 0x, 0,
% @@ -133,2 +128,7 @@
% { 0x14db, 0x2152, 0x, 0,
% + { 0x155f, 0x0331, 0x, 0,
% + { 0x155f, 0xB004, 0x, 0,
% + { 0x155f, 0xB008, 0x, 0,
% + { 0x155f, 0xB012, 0x, 0,
% + { 0x155f, 0xB022, 0x, 0,
% { 0x1592, 0x0781, 0x, 0,
Not too bad.
The brace on a line by itself is just another style bug in Oxford data.
All the 0x155f's are Perle cards unsorted into the middle of Oxford
cards because they use Oxford chips. The sorting is not quite on
the device id within the Oxford chips. The vendor id 0x1415 is supposed
to be for Oxford, but it is used by many manufacturers. (I think
Oxford was both a chip and card manufacturer but this was an abuse
of the vendor id by other manuacturers.) Perle is perhaps more recent
and uses its own id 0x155f. We shouldn't try to untangle this in our
data. pci_vendors is out of data and doesn't have an Perle cards.
0x0297 is for IBM SurePOS. This is preceded by a formatting style bug
(comment detached from its code). Elsewhere there is a reason to detach
the comment from the code (because the comment is about multiple blocks
of code). It is hard to delimit the scope of such comments clearly,
and attached to only the first block.
0x7268 is for Sunix SUN1888.
0xe020 is for Titan VScom PCI-200HV2. I broke this back in 2003 :-(.
BTW, this device needs memory-mapped i/o to work efficiently. I didn't
commit that part, and the support for memory-mapped i/o in puc is now
almost completely broken. It was replaced by automatic configuration
that depends on never using the memory-mapped case (for this card and
others) to avoid the lost regshft support being fatal.
Bruce
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubs
svn commit: r257911 - head/bin/pkill
Author: eadler
Date: Sun Nov 10 05:22:29 2013
New Revision: 257911
URL: http://svnweb.freebsd.org/changeset/base/257911
Log:
pkill - Optimize pgrep -F
Ask for a specific process instead of pulling down all processes when
-F is specified. This is much much faster.
Obtained from: DragonflyBSD
Modified:
head/bin/pkill/pkill.c
Modified: head/bin/pkill/pkill.c
==
--- head/bin/pkill/pkill.c Sun Nov 10 04:22:40 2013(r257910)
+++ head/bin/pkill/pkill.c Sun Nov 10 05:22:29 2013(r257911)
@@ -318,7 +318,10 @@ main(int argc, char **argv)
* Use KERN_PROC_PROC instead of KERN_PROC_ALL, since we
* just want processes and not individual kernel threads.
*/
- plist = kvm_getprocs(kd, KERN_PROC_PROC, 0, &nproc);
+ if (pidfromfile >= 0)
+ plist = kvm_getprocs(kd, KERN_PROC_PID, pidfromfile, &nproc);
+ else
+ plist = kvm_getprocs(kd, KERN_PROC_PROC, 0, &nproc);
if (plist == NULL) {
errx(STATUS_ERROR, "Cannot get process list (%s)",
kvm_geterr(kd));
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
