CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sat Jan 19 07:41:51 UTC 2013
Modified Files:
src/sys/dev/usb: dwc_otg.c
Log Message:
Use PR_NOWAIT in dwc_otg_allocx as it can be called in the USB softint via
completions.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/usb/dwc_otg.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/usb/dwc_otg.c
diff -u src/sys/dev/usb/dwc_otg.c:1.24 src/sys/dev/usb/dwc_otg.c:1.25
--- src/sys/dev/usb/dwc_otg.c:1.24 Sun Jan 13 15:27:17 2013
+++ src/sys/dev/usb/dwc_otg.c Sat Jan 19 07:41:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_otg.c,v 1.24 2013/01/13 15:27:17 skrll Exp $ */
+/* $NetBSD: dwc_otg.c,v 1.25 2013/01/19 07:41:51 skrll Exp $ */
/*-
* Copyright (c) 2012 Hans Petter Selasky. All rights reserved.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dwc_otg.c,v 1.24 2013/01/13 15:27:17 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_otg.c,v 1.25 2013/01/19 07:41:51 skrll Exp $");
#include
#include
@@ -377,7 +377,7 @@ dwc_otg_allocx(struct usbd_bus *bus)
DPRINTF("\n");
DOTG_EVCNT_INCR(sc->sc_ev_xferpoolget);
- xfer = pool_cache_get(sc->sc_xferpool, PR_WAITOK);
+ xfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
if (xfer != NULL) {
memset(xfer, 0, sizeof(struct dwc_otg_xfer));
#ifdef DIAGNOSTIC
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Sat Jan 19 04:23:37 UTC 2013
Modified Files:
src/usr.bin/make: meta.c
Log Message:
meta_oodate: rename ignoreOODATE to needOODATE.
if target uses ${.OODATE} in its script;
1. we canno compare commands
2. if we decide it is out-of-date .OODATE must not be empty.
The only option is to set it to .ALLSRC
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/make/meta.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.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.25 src/usr.bin/make/meta.c:1.26
--- src/usr.bin/make/meta.c:1.25 Wed Jun 27 17:22:58 2012
+++ src/usr.bin/make/meta.c Sat Jan 19 04:23:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: meta.c,v 1.25 2012/06/27 17:22:58 sjg Exp $ */
+/* $NetBSD: meta.c,v 1.26 2013/01/19 04:23:37 sjg Exp $ */
/*
* Implement 'meta' mode.
@@ -843,7 +843,7 @@ meta_oodate(GNode *gn, Boolean oodate)
static size_t cwdlen = 0;
static size_t tmplen = 0;
FILE *fp;
-Boolean ignoreOODATE = FALSE;
+Boolean needOODATE = FALSE;
Lst missingFiles;
if (oodate)
@@ -1197,15 +1197,15 @@ meta_oodate(GNode *gn, Boolean oodate)
} else {
char *cmd = (char *)Lst_Datum(ln);
- if (!ignoreOODATE) {
+ if (!needOODATE) {
if (strstr(cmd, "$?"))
- ignoreOODATE = TRUE;
+ needOODATE = TRUE;
else if ((cp = strstr(cmd, ".OODATE"))) {
/* check for $[{(].OODATE[)}] */
if (cp > cmd + 2 && cp[-2] == '$')
-ignoreOODATE = TRUE;
+needOODATE = TRUE;
}
- if (ignoreOODATE && DEBUG(META))
+ if (needOODATE && DEBUG(META))
fprintf(debug_file, "%s: %d: cannot compare commands using .OODATE\n", fname, lineno);
}
cmd = Var_Subst(NULL, cmd, gn, TRUE);
@@ -1235,7 +1235,7 @@ meta_oodate(GNode *gn, Boolean oodate)
if (buf[x - 1] == '\n')
buf[x - 1] = '\0';
}
- if (!ignoreOODATE &&
+ if (!needOODATE &&
!(gn->type & OP_NOMETA_CMP) &&
strcmp(p, cmd) != 0) {
if (DEBUG(META))
@@ -1279,14 +1279,16 @@ meta_oodate(GNode *gn, Boolean oodate)
oodate = TRUE;
}
}
-if (oodate && ignoreOODATE) {
+if (oodate && needOODATE) {
/*
- * Target uses .OODATE, so we need to re-compute it.
- * We need to clean up what Make_DoAllVar() did.
+ * Target uses .OODATE which is empty; or we wouldn't be here.
+ * We have decided it is oodate, so .OODATE needs to be set.
+ * All we can sanely do is set it to .ALLSRC.
*/
- Var_Delete(ALLSRC, gn);
Var_Delete(OODATE, gn);
- gn->flags &= ~DONE_ALLSRC;
+ Var_Set(OODATE, Var_Value(ALLSRC, gn, &cp), gn, 0);
+ if (cp)
+ free(cp);
}
return oodate;
}
CVS commit: src/external/cddl/osnet/usr.bin
Module Name:src Committed By: wiz Date: Sat Jan 19 01:22:13 UTC 2013 Modified Files: src/external/cddl/osnet/usr.bin/ctfconvert: ctfconvert.1 src/external/cddl/osnet/usr.bin/ctfdump: ctfdump.1 src/external/cddl/osnet/usr.bin/ctfmerge: ctfmerge.1 Log Message: Sort options in SYNOPSIS and text. XXX: please check if SYNOPSIS are correct, I think they missing some .Op. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/cddl/osnet/usr.bin/ctfconvert/ctfconvert.1 cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/usr.bin/ctfdump/ctfdump.1 cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/usr.bin/ctfmerge/ctfmerge.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/usr.bin/ctfconvert/ctfconvert.1 diff -u src/external/cddl/osnet/usr.bin/ctfconvert/ctfconvert.1:1.1 src/external/cddl/osnet/usr.bin/ctfconvert/ctfconvert.1:1.2 --- src/external/cddl/osnet/usr.bin/ctfconvert/ctfconvert.1:1.1 Fri Jan 18 19:58:43 2013 +++ src/external/cddl/osnet/usr.bin/ctfconvert/ctfconvert.1 Sat Jan 19 01:22:12 2013 @@ -1,31 +1,31 @@ -.\" $NetBSD: ctfconvert.1,v 1.1 2013/01/18 19:58:43 christos Exp $ +.\" $NetBSD: ctfconvert.1,v 1.2 2013/01/19 01:22:12 wiz Exp $ +.\" +.\" Copyright (c) 2010 The FreeBSD Foundation +.\" All rights reserved. .\" -.\" Copyright (c) 2010 The FreeBSD Foundation -.\" All rights reserved. -.\" .\" This software was developed by Rui Paulo under sponsorship from the -.\" FreeBSD Foundation. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\"notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\"notice, this list of conditions and the following disclaimer in the -.\"documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. +.\" FreeBSD Foundation. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\"notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\"notice, this list of conditions and the following disclaimer in the +.\"documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. .\" .\" $FreeBSD: src/cddl/usr.bin/ctfconvert/ctfconvert.1,v 1.1 2010/08/11 18:00:45 rpaulo Exp $ .\" @@ -38,45 +38,47 @@ .Sh SYNOPSIS .Nm .Op Fl gis -.Fl l Ar label .Fl L Ar labelenv +.Fl l Ar label .Op Fl o Ar outfile -object_file +.Ar object_file .Sh DESCRIPTION The .Nm utility converts debug information from a binary file to CTF data and replaces the debug section of that file with a CTF section called SUNW_ctf. -This new section is added to the input file, unless the -o +This new section is added to the input file, unless the +.Fl o option is present. You can also opt to keep the original debugging section with the --g option. +.Fl g +option. .Pp The following options ar
CVS commit: src/sys/sys
Module Name:src Committed By: matt Date: Sat Jan 19 01:06:34 UTC 2013 Modified Files: src/sys/sys: physmap.h Log Message: Add !defined(KMEMUSER) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/sys/physmap.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/sys/physmap.h diff -u src/sys/sys/physmap.h:1.2 src/sys/sys/physmap.h:1.3 --- src/sys/sys/physmap.h:1.2 Sat Jan 19 01:04:52 2013 +++ src/sys/sys/physmap.h Sat Jan 19 01:06:34 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: physmap.h,v 1.2 2013/01/19 01:04:52 rmind Exp $ */ +/* $NetBSD: physmap.h,v 1.3 2013/01/19 01:06:34 matt Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #ifndef _SYS_PHYSMAP_H_ #define _SYS_PHYSMAP_H_ -#if !defined(_KERNEL) +#if !defined(_KERNEL) && !defined(KMEMUSER) #error "not supposed to be exposed to userland" #endif
CVS commit: src/sys
Module Name:src
Committed By: rmind
Date: Sat Jan 19 01:04:52 UTC 2013
Modified Files:
src/sys/kern: subr_physmap.c
src/sys/sys: physmap.h
Log Message:
- physmap_map, physmap_map_fini: pmap_update() must be performed before
freeing the VA; otherwise there is a window when it can be re-used while
stale TLB entries may be present.
- physmap_fill: use MIN() instead of min(), since vsize_t is used.
- Add RCS ID comment while here and prevent physmap.h inclusion in userland.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/kern/subr_physmap.c
cvs rdiff -u -r1.1 -r1.2 src/sys/sys/physmap.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/kern/subr_physmap.c
diff -u src/sys/kern/subr_physmap.c:1.1 src/sys/kern/subr_physmap.c:1.2
--- src/sys/kern/subr_physmap.c:1.1 Fri Jan 18 06:42:16 2013
+++ src/sys/kern/subr_physmap.c Sat Jan 19 01:04:51 2013
@@ -1,3 +1,5 @@
+/* $NetBSD: subr_physmap.c,v 1.2 2013/01/19 01:04:51 rmind Exp $ */
+
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -28,8 +30,7 @@
*/
#include
-
-__KERNEL_RCSID(1, "$NetBSD: subr_physmap.c,v 1.1 2013/01/18 06:42:16 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: subr_physmap.c,v 1.2 2013/01/19 01:04:51 rmind Exp $");
#include
#include
@@ -82,7 +83,7 @@ physmap_fill(physmap_t *map, pmap_t pmap
if (!pmap_extract(pmap, va, &ps->ps_addr)) {
return EFAULT;
}
- ps->ps_len = min(len, PAGE_SIZE - offset);
+ ps->ps_len = MIN(len, PAGE_SIZE - offset);
if (ps->ps_len == len) {
map->pm_nsegs = 1;
return 0;
@@ -266,9 +267,9 @@ physmap_map(void *cookie, vaddr_t *kvap)
*/
if (pc->pc_kva != 0 && !pc->pc_direct_mapped) {
pmap_kremove(pc->pc_kva, pc->pc_klen);
+ pmap_update(pmap_kernel());
uvm_km_free(kernel_map, pc->pc_kva, pc->pc_klen,
UVM_KMF_VAONLY);
- pmap_update(pmap_kernel());
}
/*
@@ -350,9 +351,9 @@ physmap_map_fini(void *cookie)
*/
if (pc->pc_kva != 0 && !pc->pc_direct_mapped) {
pmap_kremove(pc->pc_kva, pc->pc_klen);
+ pmap_update(pmap_kernel());
uvm_km_free(kernel_map, pc->pc_kva, pc->pc_klen,
UVM_KMF_VAONLY);
- pmap_update(pmap_kernel());
}
/*
Index: src/sys/sys/physmap.h
diff -u src/sys/sys/physmap.h:1.1 src/sys/sys/physmap.h:1.2
--- src/sys/sys/physmap.h:1.1 Fri Jan 18 06:42:16 2013
+++ src/sys/sys/physmap.h Sat Jan 19 01:04:52 2013
@@ -1,3 +1,5 @@
+/* $NetBSD: physmap.h,v 1.2 2013/01/19 01:04:52 rmind Exp $ */
+
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -30,7 +32,13 @@
#ifndef _SYS_PHYSMAP_H_
#define _SYS_PHYSMAP_H_
+#if !defined(_KERNEL)
+#error "not supposed to be exposed to userland"
+#endif
+
#include
+#include
+#include
typedef struct {
paddr_t ps_addr;
@@ -44,10 +52,6 @@ struct physmap {
physmap_segment_t pm_segs[0];
};
-#ifdef _KERNEL
-#include
-#include
-
int physmap_create_iov(physmap_t **, const struct vmspace *,
struct iovec *, size_t);
int physmap_create_linear(physmap_t **, const struct vmspace *,
@@ -62,6 +66,5 @@ size_t physmap_map(void *, vaddr_t *);
void physmap_map_fini(void *);
void physmap_zero(physmap_t *, size_t, size_t);
-#endif /* _KERNEL */
#endif /* _SYS_PHYSMAP_H_ */
CVS commit: src/sys
Module Name:src
Committed By: rmind
Date: Sat Jan 19 00:51:53 UTC 2013
Modified Files:
src/sys/kern: uipc_mbuf.c
src/sys/sys: mbuf.h
Log Message:
Add m_ensure_contig() routine, which is equivalent to m_pullup, but does not
destroy the mbuf chain on failure (it is kept valid).
To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 src/sys/kern/uipc_mbuf.c
cvs rdiff -u -r1.150 -r1.151 src/sys/sys/mbuf.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/kern/uipc_mbuf.c
diff -u src/sys/kern/uipc_mbuf.c:1.147 src/sys/kern/uipc_mbuf.c:1.148
--- src/sys/kern/uipc_mbuf.c:1.147 Thu Oct 18 19:33:38 2012
+++ src/sys/kern/uipc_mbuf.c Sat Jan 19 00:51:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_mbuf.c,v 1.147 2012/10/18 19:33:38 para Exp $ */
+/* $NetBSD: uipc_mbuf.c,v 1.148 2013/01/19 00:51:52 rmind Exp $ */
/*-
* Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.147 2012/10/18 19:33:38 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.148 2013/01/19 00:51:52 rmind Exp $");
#include "opt_mbuftrace.h"
#include "opt_nmbclusters.h"
@@ -906,21 +906,18 @@ m_adj(struct mbuf *mp, int req_len)
}
/*
- * Rearrange an mbuf chain so that len bytes are contiguous
- * and in the data area of an mbuf (so that mtod and dtom
- * will work for a structure of size len). Returns the resulting
- * mbuf chain on success, frees it and returns null on failure.
- * If there is room, it will add up to max_protohdr-len extra bytes to the
- * contiguous region in an attempt to avoid being called next time.
+ * m_ensure_contig: rearrange an mbuf chain that given length of bytes
+ * would be contiguous and in the data area of an mbuf (therefore, mtod()
+ * would work for a structure of given length).
+ *
+ * => On success, returns true and the resulting mbuf chain; false otherwise.
+ * => The mbuf chain may change, but is always preserved valid.
*/
-int MPFail;
-
-struct mbuf *
-m_pullup(struct mbuf *n, int len)
+bool
+m_ensure_contig(struct mbuf **m0, int len)
{
- struct mbuf *m;
- int count;
- int space;
+ struct mbuf *n = *m0, *m;
+ size_t count, space;
/*
* If first mbuf has no cluster, and has room for len bytes
@@ -929,17 +926,20 @@ m_pullup(struct mbuf *n, int len)
*/
if ((n->m_flags & M_EXT) == 0 &&
n->m_data + len < &n->m_dat[MLEN] && n->m_next) {
- if (n->m_len >= len)
- return (n);
+ if (n->m_len >= len) {
+ return true;
+ }
m = n;
n = n->m_next;
len -= m->m_len;
} else {
- if (len > MHLEN)
- goto bad;
+ if (len > MHLEN) {
+ return false;
+ }
MGET(m, M_DONTWAIT, n->m_type);
- if (m == 0)
- goto bad;
+ if (m == NULL) {
+ return false;
+ }
MCLAIM(m, n->m_owner);
m->m_len = 0;
if (n->m_flags & M_PKTHDR) {
@@ -948,7 +948,7 @@ m_pullup(struct mbuf *n, int len)
}
space = &m->m_dat[MLEN] - (m->m_data + m->m_len);
do {
- count = min(min(max(len, max_protohdr), space), n->m_len);
+ count = MIN(MIN(MAX(len, max_protohdr), space), n->m_len);
memcpy(mtod(m, char *) + m->m_len, mtod(n, void *),
(unsigned)count);
len -= count;
@@ -960,16 +960,30 @@ m_pullup(struct mbuf *n, int len)
else
n = m_free(n);
} while (len > 0 && n);
- if (len > 0) {
- (void) m_free(m);
- goto bad;
- }
+
m->m_next = n;
- return (m);
-bad:
- m_freem(n);
- MPFail++;
- return (NULL);
+ *m0 = m;
+
+ return len <= 0;
+}
+
+/*
+ * m_pullup: same as m_ensure_contig(), but destroys mbuf chain on error.
+ */
+int MPFail;
+
+struct mbuf *
+m_pullup(struct mbuf *n, int len)
+{
+ struct mbuf *m = n;
+
+ if (!m_ensure_contig(&m, len)) {
+ KASSERT(m != NULL);
+ m_freem(m);
+ MPFail++;
+ m = NULL;
+ }
+ return m;
}
/*
Index: src/sys/sys/mbuf.h
diff -u src/sys/sys/mbuf.h:1.150 src/sys/sys/mbuf.h:1.151
--- src/sys/sys/mbuf.h:1.150 Thu Dec 27 14:41:10 2012
+++ src/sys/sys/mbuf.h Sat Jan 19 00:51:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mbuf.h,v 1.150 2012/12/27 14:41:10 christos Exp $ */
+/* $NetBSD: mbuf.h,v 1.151 2013/01/19 00:51:52 rmind Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
@@ -854,6 +854,8 @@ void m_ext_free(struct mbuf *);
char * m_mapin(struct mbuf *);
void m_move_pkthdr(struct mbuf *to, struct mbuf *from);
+bool m_ensure_contig(struct mbuf **, int);
+
/* Inline routines. */
static __inline u_int m_length(const struct mbuf *) __unused;
CVS commit: src/sys/arch/arm/broadcom
Module Name:src Committed By: matt Date: Sat Jan 19 00:35:24 UTC 2013 Modified Files: src/sys/arch/arm/broadcom: bcm53xx_eth.c Log Message: Remove a KASSERT that is no longer valid (no restricted to only coherent memory). Fix c&p error for a !RCVMAGIC bus_dmamap_sync PREREAD. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/broadcom/bcm53xx_eth.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/arch/arm/broadcom/bcm53xx_eth.c diff -u src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.22 src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.23 --- src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.22 Thu Jan 10 22:07:19 2013 +++ src/sys/arch/arm/broadcom/bcm53xx_eth.c Sat Jan 19 00:35:24 2013 @@ -35,7 +35,7 @@ #include -__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.22 2013/01/10 22:07:19 matt Exp $"); +__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.23 2013/01/19 00:35:24 matt Exp $"); #include #include @@ -896,7 +896,6 @@ bcmeth_rx_buf_alloc( bcmeth_mapcache_put(sc, sc->sc_rx_mapcache, map); return NULL; } - KASSERT(((map->_dm_flags ^ sc->sc_dmat->_ranges[0].dr_flags) & _BUS_DMAMAP_COHERENT) == 0); KASSERT(map->dm_mapsize == MCLBYTES); #ifdef BCMETH_RCVMAGIC *mtod(m, uint32_t *) = BCMETH_RCVMAGIC; @@ -905,7 +904,7 @@ bcmeth_rx_buf_alloc( bus_dmamap_sync(sc->sc_dmat, map, sizeof(uint32_t), map->dm_mapsize - sizeof(uint32_t), BUS_DMASYNC_PREREAD); #else - bus_dmamap_sync(sc->sc_dmat, map, 0, sizeof(uint32_t), + bus_dmamap_sync(sc->sc_dmat, map, 0, map->dm_mapsize, BUS_DMASYNC_PREREAD); #endif
CVS commit: src/sys/dev
Module Name:src
Committed By: matt
Date: Sat Jan 19 00:27:34 UTC 2013
Modified Files:
src/sys/dev: mm.c
Log Message:
Fix __HAVE_MM_MD_CACHE_ALIASING case to use UVM_KMF_COLORMATCH so that
uvm returns a page of the correct color.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/mm.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/mm.c
diff -u src/sys/dev/mm.c:1.16 src/sys/dev/mm.c:1.17
--- src/sys/dev/mm.c:1.16 Tue Feb 21 21:57:06 2012
+++ src/sys/dev/mm.c Sat Jan 19 00:27:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mm.c,v 1.16 2012/02/21 21:57:06 rmind Exp $ */
+/* $NetBSD: mm.c,v 1.17 2013/01/19 00:27:34 matt Exp $ */
/*-
* Copyright (c) 2002, 2008, 2010 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mm.c,v 1.16 2012/02/21 21:57:06 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mm.c,v 1.17 2013/01/19 00:27:34 matt Exp $");
#include "opt_compat_netbsd.h"
@@ -113,11 +113,9 @@ static inline vaddr_t
dev_mem_getva(paddr_t pa)
{
#ifdef __HAVE_MM_MD_CACHE_ALIASING
- const vsize_t coloroff = trunc_page(pa) & ptoa(uvmexp.colormask);
- const vaddr_t kva = uvm_km_alloc(kernel_map, PAGE_SIZE + coloroff,
- ptoa(uvmexp.ncolors), UVM_KMF_VAONLY | UVM_KMF_WAITVA);
-
- return kva + coloroff;
+ return uvm_km_alloc(kernel_map, PAGE_SIZE,
+ atop(pa) & uvmexp.colormask,
+ UVM_KMF_VAONLY | UVM_KMF_WAITVA | UVM_KMF_COLORMATCH);
#else
return dev_mem_addr;
#endif
@@ -127,10 +125,7 @@ static inline void
dev_mem_relva(paddr_t pa, vaddr_t va)
{
#ifdef __HAVE_MM_MD_CACHE_ALIASING
- const vsize_t coloroff = trunc_page(pa) & ptoa(uvmexp.colormask);
- const vaddr_t origva = va - coloroff;
-
- uvm_km_free(kernel_map, origva, PAGE_SIZE + coloroff, UVM_KMF_VAONLY);
+ uvm_km_free(kernel_map, va, PAGE_SIZE, UVM_KMF_VAONLY);
#else
KASSERT(dev_mem_addr == va);
#endif
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: matt
Date: Sat Jan 19 00:15:10 UTC 2013
Modified Files:
src/sys/arch/arm/arm32: pmap.c
Log Message:
Switch from only UVM_PGA_STRAT_ONLY to UVM_PGA_STRAT_FALLBACK in
arm_pmap_alloc_poolpage.
To generate a diff of this commit:
cvs rdiff -u -r1.247 -r1.248 src/sys/arch/arm/arm32/pmap.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/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.247 src/sys/arch/arm/arm32/pmap.c:1.248
--- src/sys/arch/arm/arm32/pmap.c:1.247 Fri Jan 11 12:04:00 2013
+++ src/sys/arch/arm/arm32/pmap.c Sat Jan 19 00:15:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.247 2013/01/11 12:04:00 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.248 2013/01/19 00:15:09 matt Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -212,7 +212,7 @@
#include
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.247 2013/01/11 12:04:00 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.248 2013/01/19 00:15:09 matt Exp $");
#ifdef PMAP_DEBUG
@@ -6929,11 +6929,13 @@ arm_pmap_alloc_poolpage(int flags)
{
/*
* On some systems, only some pages may be "coherent" for dma and we
- * want to use those for pool pages (think mbufs).
+ * want to prefer those for pool pages (think mbufs) but fallback to
+ * any page if none is available.
*/
- if (arm_poolpage_vmfreelist != VM_FREELIST_DEFAULT)
+ if (arm_poolpage_vmfreelist != VM_FREELIST_DEFAULT) {
return uvm_pagealloc_strat(NULL, 0, NULL, flags,
- UVM_PGA_STRAT_ONLY, arm_poolpage_vmfreelist);
+ UVM_PGA_STRAT_FALLBACK, arm_poolpage_vmfreelist);
+ }
return uvm_pagealloc(NULL, 0, NULL, flags);
}
CVS commit: src/share/man/man9
Module Name:src Committed By: riastradh Date: Sat Jan 19 00:14:11 UTC 2013 Modified Files: src/share/man/man9: intro.9 Log Message: Fix typo, unless `ro raising' is something I don't know about. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/share/man/man9/intro.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/intro.9 diff -u src/share/man/man9/intro.9:1.14 src/share/man/man9/intro.9:1.15 --- src/share/man/man9/intro.9:1.14 Thu Dec 2 12:54:13 2010 +++ src/share/man/man9/intro.9 Sat Jan 19 00:14:11 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: intro.9,v 1.14 2010/12/02 12:54:13 wiz Exp $ +.\" $NetBSD: intro.9,v 1.15 2013/01/19 00:14:11 riastradh Exp $ .\" .\" Copyright (c) 1997, 2007 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -248,7 +248,7 @@ Functions to modify system interrupt pri See .Xr spl 9 . .Pp -Functions ro raise the system priority level. +Functions to raise the system priority level. See .Xr splraiseipl 9 . .Sh SECURITY
CVS commit: src/common/lib/libc/arch/arm/string
Module Name:src
Committed By: matt
Date: Fri Jan 18 22:49:11 UTC 2013
Added Files:
src/common/lib/libc/arch/arm/string: strlcat_naive.S
Log Message:
Simple version of strlcat for ARM.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/common/lib/libc/arch/arm/string/strlcat_naive.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/common/lib/libc/arch/arm/string/strlcat_naive.S
diff -u /dev/null src/common/lib/libc/arch/arm/string/strlcat_naive.S:1.1
--- /dev/null Fri Jan 18 22:49:11 2013
+++ src/common/lib/libc/arch/arm/string/strlcat_naive.S Fri Jan 18 22:49:11 2013
@@ -0,0 +1,67 @@
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include
+
+RCSID("$NetBSD: strlcat_naive.S,v 1.1 2013/01/18 22:49:11 matt Exp $")
+
+/* LINTSTUB: size_t strlcat(char *, const char *, size_t) */
+ENTRY(strlcat)
+ mov ip, r0 /* need to preserve r0 */
+ add r3, r2, r0 /* point to just end of dst */
+1: cmp ip, r3 /* still within dst? */
+ beq 4f /* no, get length of src */
+ ldrb r2, [ip], #1 /* load next byte */
+ teq r2, #0 /* was it a NUL? */
+ bne 1b /* no, get next byte */
+
+ sub r0, ip, r0 /* get actual length was dst */
+ sub r0, r0, #1 /* account for the trailing NUL */
+ sub r3, r3, #1 /* back up to last byte in dst */
+ sub ip, ip, #1 /* back up over the NUL */
+
+2: ldrb r2, [r1], #1 /* load next byte from append */
+ teq r2, #0 /* was it a NUL? */
+ beq 3f /* yes, end of append */
+ add r0, r0, #1 /* count another byte */
+ cmp ip, r3 /* do we have enough room for it? */
+ strltb r2, [ip], #1 /* yes, store it */
+ b 2b /* get next byte from append */
+
+3: mov r2, #0 /* NUL */
+ strb r2, [ip] /* append final NUL */
+ RET/* return */
+
+4: sub r0, r3, r0 /* move size to return value */
+5: ldrb r2, [r1], #1 /* load next byte from append */
+ teq r2, #0 /* was it a NUL? */
+ RETc(eq) /* yes, we're done */
+ add r0, r0, #1 /* add one to return value */
+ b 5b /* get next byte from append */
+END(strlcat)
CVS commit: src/usr.bin/finger
Module Name:src
Committed By: christos
Date: Fri Jan 18 22:10:31 UTC 2013
Modified Files:
src/usr.bin/finger: lprint.c
Log Message:
- Don't dump core or print random junk on corrupt utmp entries.
- Factor out duplicated code in the process.
- The actual code is now smaller and does error checking, and encoding.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/finger/lprint.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.bin/finger/lprint.c
diff -u src/usr.bin/finger/lprint.c:1.22 src/usr.bin/finger/lprint.c:1.23
--- src/usr.bin/finger/lprint.c:1.22 Sun Apr 12 02:18:54 2009
+++ src/usr.bin/finger/lprint.c Fri Jan 18 17:10:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lprint.c,v 1.22 2009/04/12 06:18:54 lukem Exp $ */
+/* $NetBSD: lprint.c,v 1.23 2013/01/18 22:10:31 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)lprint.c 8.3 (Berkeley) 4/28/95";
#else
-__RCSID( "$NetBSD: lprint.c,v 1.22 2009/04/12 06:18:54 lukem Exp $");
+__RCSID( "$NetBSD: lprint.c,v 1.23 2013/01/18 22:10:31 christos Exp $");
#endif
#endif /* not lint */
@@ -111,16 +111,71 @@ lflag_print(void)
}
}
+static size_t
+visify(char *buf, size_t blen, const char *str)
+{
+ int len = strnvisx(buf, blen, str, strlen(str), VIS_WHITE|VIS_CSTYLE);
+ if (len == -1) {
+ buf[0] = '\0';
+ return 0;
+ }
+ return len;
+}
+
+static void
+fmt_time(char *buf, size_t blen, time_t ti, time_t n)
+{
+ struct tm *tp = localtime(&ti);
+ if (tp != NULL) {
+ char *t = asctime(tp);
+ char *tzn = TIMEZONE(tp);
+ if (n == (time_t)-1 ||
+ n - ti > SECSPERDAY * DAYSPERNYEAR / 2)
+ snprintf(buf, blen, "%.16s %.4s (%s)", t, t + 20, tzn);
+ else
+ snprintf(buf, blen, "%.16s (%s)", t, tzn);
+ } else
+ snprintf(buf, blen, "[*bad time 0x%llx*]", (long long)ti);
+}
+
+/*
+ * idle time is tough; if have one, print a comma,
+ * then spaces to pad out the device name, then the
+ * idle time. Follow with a comma if a remote login.
+ */
+static int
+print_idle(time_t t, int maxlen, size_t hostlen, size_t ttylen) {
+
+ int cpr;
+ struct tm *delta = gmtime(&t);
+
+ if (delta == NULL)
+ return printf("Bad idle 0x%llx", (long long)t);
+
+ if (delta->tm_yday == 0 && delta->tm_hour == 0 && delta->tm_min == 0)
+ return 0;
+
+ cpr = printf("%-*s idle ", (int)(maxlen - ttylen + 1), ",");
+ if (delta->tm_yday > 0) {
+ cpr += printf("%d day%s ", delta->tm_yday,
+ delta->tm_yday == 1 ? "" : "s");
+ }
+ cpr += printf("%d:%02d", delta->tm_hour, delta->tm_min);
+ if (hostlen) {
+ putchar(',');
+ ++cpr;
+ }
+ return cpr;
+}
+
static void
lprint(PERSON *pn)
{
- struct tm *delta;
WHERE *w;
int cpr, len, maxlen;
- struct tm *tp;
int oddfield;
- char *t;
- const char *tzn;
+ char timebuf[128], ttybuf[64], hostbuf[512];
+ size_t ttylen, hostlen;
cpr = 0;
/*
@@ -148,25 +203,25 @@ lprint(PERSON *pn)
if (pn->office && pn->officephone &&
strlen(pn->office) + strlen(pn->officephone) +
sizeof(OFFICE_TAG) + 2 <= 5 * TAB_LEN) {
- (void)snprintf(tbuf, sizeof(tbuf), "%s: %s, %s",
+ (void)snprintf(timebuf, sizeof(timebuf), "%s: %s, %s",
OFFICE_TAG, pn->office, prphone(pn->officephone));
- oddfield = demi_print(tbuf, oddfield);
+ oddfield = demi_print(timebuf, oddfield);
} else {
if (pn->office) {
- (void)snprintf(tbuf, sizeof(tbuf), "%s: %s",
+ (void)snprintf(timebuf, sizeof(timebuf), "%s: %s",
OFFICE_TAG, pn->office);
- oddfield = demi_print(tbuf, oddfield);
+ oddfield = demi_print(timebuf, oddfield);
}
if (pn->officephone) {
- (void)snprintf(tbuf, sizeof(tbuf), "%s: %s",
+ (void)snprintf(timebuf, sizeof(timebuf), "%s: %s",
OFFICE_PHONE_TAG, prphone(pn->officephone));
- oddfield = demi_print(tbuf, oddfield);
+ oddfield = demi_print(timebuf, oddfield);
}
}
if (pn->homephone) {
- (void)snprintf(tbuf, sizeof(tbuf), "%s: %s", "Home Phone",
+ (void)snprintf(timebuf, sizeof(timebuf), "%s: %s", "Home Phone",
prphone(pn->homephone));
- oddfield = demi_print(tbuf, oddfield);
+ oddfield = demi_print(timebuf, oddfield);
}
if (oddfield)
putchar('\n');
@@ -183,39 +238,23 @@ no_gecos:
* when last logged in
*/
/* find out longest device name for this user for formatting */
- for (w = pn->whead, maxlen = -1; w != NULL; w = w->next)
- if ((len = strlen(w->tty)) > maxlen)
+ for (w = pn->whead, maxlen = -1; w != NULL; w = w->next) {
+ visify(ttybuf, sizeof(ttybuf), w->tty);
+ if ((len = strlen(ttybuf)) > maxlen)
maxlen = len;
+ }
/* find rest of entries for user */
for (w = pn->whead; w != NULL; w = w->next) {
+ ttylen = visify(ttybuf, sizeof(ttybuf), w->tty);
+ hostlen = visify(hostbuf, sizeof(hostbuf), w->host);
switch (w->info) {
case LOGGEDIN:
- tp = localtime(&w->loginat);
- t = asctime(tp);
- tzn = TIMEZONE(tp);
- cpr = printf("On since %.16s (%s) on %s",
CVS commit: src/distrib/sets/lists/man
Module Name:src Committed By: christos Date: Fri Jan 18 20:01:47 UTC 2013 Modified Files: src/distrib/sets/lists/man: mi Log Message: add ctf man pages To generate a diff of this commit: cvs rdiff -u -r1.1416 -r1.1417 src/distrib/sets/lists/man/mi 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/man/mi diff -u src/distrib/sets/lists/man/mi:1.1416 src/distrib/sets/lists/man/mi:1.1417 --- src/distrib/sets/lists/man/mi:1.1416 Fri Jan 11 11:32:48 2013 +++ src/distrib/sets/lists/man/mi Fri Jan 18 15:01:47 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1416 2013/01/11 16:32:48 skrll Exp $ +# $NetBSD: mi,v 1.1417 2013/01/18 20:01:47 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -120,6 +120,9 @@ ./usr/share/man/cat1/csh.0 man-util-catman .cat ./usr/share/man/cat1/csplit.0 man-util-catman .cat ./usr/share/man/cat1/ctags.0 man-c-catman .cat +./usr/share/man/cat1/ctfconvert.0 man-util-catman .cat,dtrace +./usr/share/man/cat1/ctfdump.0 man-util-catman .cat,dtrace +./usr/share/man/cat1/ctfmerge.0 man-util-catman .cat,dtrace ./usr/share/man/cat1/cu.0 man-util-catman .cat ./usr/share/man/cat1/cut.0 man-util-catman .cat ./usr/share/man/cat1/daicctl.0 man-sysutil-catman .cat @@ -3129,6 +3132,9 @@ ./usr/share/man/html1/csh.html man-util-htmlman html ./usr/share/man/html1/csplit.html man-util-htmlman html ./usr/share/man/html1/ctags.html man-c-htmlman html +./usr/share/man/html1/ctfconvert.html man-util-htmlman html,dtrace +./usr/share/man/html1/ctfdump.html man-util-htmlman html,dtrace +./usr/share/man/html1/ctfmerge.html man-util-htmlman html,dtrace ./usr/share/man/html1/cu.html man-util-htmlman html ./usr/share/man/html1/cut.html man-util-htmlman html ./usr/share/man/html1/daicctl.html man-sysutil-htmlman html @@ -5746,6 +5752,9 @@ ./usr/share/man/man1/csh.1 man-util-man .man ./usr/share/man/man1/csplit.1 man-util-man .man ./usr/share/man/man1/ctags.1 man-c-man .man +./usr/share/man/man1/ctfconvert.1 man-util-man .man,dtrace +./usr/share/man/man1/ctfdump.1 man-util-man .man,dtrace +./usr/share/man/man1/ctfmerge.1 man-util-man .man,dtrace ./usr/share/man/man1/cu.1 man-util-man .man ./usr/share/man/man1/cut.1 man-util-man .man ./usr/share/man/man1/daicctl.1 man-sysutil-man .man
CVS commit: src/external/cddl/osnet/usr.bin
Module Name:src
Committed By: christos
Date: Fri Jan 18 19:58:44 UTC 2013
Modified Files:
src/external/cddl/osnet/usr.bin/ctfconvert: Makefile
src/external/cddl/osnet/usr.bin/ctfdump: Makefile
src/external/cddl/osnet/usr.bin/ctfmerge: Makefile
Added Files:
src/external/cddl/osnet/usr.bin/ctfconvert: ctfconvert.1
src/external/cddl/osnet/usr.bin/ctfdump: ctfdump.1
src/external/cddl/osnet/usr.bin/ctfmerge: ctfmerge.1
Log Message:
add man pages
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/usr.bin/ctfconvert/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/cddl/osnet/usr.bin/ctfconvert/ctfconvert.1
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/usr.bin/ctfdump/Makefile
cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/usr.bin/ctfdump/ctfdump.1
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/usr.bin/ctfmerge/Makefile
cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/usr.bin/ctfmerge/ctfmerge.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/usr.bin/ctfconvert/Makefile
diff -u src/external/cddl/osnet/usr.bin/ctfconvert/Makefile:1.3 src/external/cddl/osnet/usr.bin/ctfconvert/Makefile:1.4
--- src/external/cddl/osnet/usr.bin/ctfconvert/Makefile:1.3 Sun Feb 21 06:00:01 2010
+++ src/external/cddl/osnet/usr.bin/ctfconvert/Makefile Fri Jan 18 14:58:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/02/21 11:00:01 darran Exp $
+# $NetBSD: Makefile,v 1.4 2013/01/18 19:58:43 christos Exp $
# $FreeBSD: src/cddl/usr.bin/ctfconvert/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
@@ -55,6 +55,4 @@ LDADD+= -lctf -ldwarf -lelf -lz
.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt
-MKMAN= no
-
.include
Index: src/external/cddl/osnet/usr.bin/ctfdump/Makefile
diff -u src/external/cddl/osnet/usr.bin/ctfdump/Makefile:1.3 src/external/cddl/osnet/usr.bin/ctfdump/Makefile:1.4
--- src/external/cddl/osnet/usr.bin/ctfdump/Makefile:1.3 Sat Apr 3 14:50:43 2010
+++ src/external/cddl/osnet/usr.bin/ctfdump/Makefile Fri Jan 18 14:58:44 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/04/03 18:50:43 christos Exp $
+# $NetBSD: Makefile,v 1.4 2013/01/18 19:58:44 christos Exp $
# $FreeBSD: src/cddl/usr.bin/ctfdump/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
@@ -28,6 +28,4 @@ LDADD+= -lelf -lz
.PATH: ${.CURDIR}/../../dist/tools/ctf/common
.PATH: ${.CURDIR}/../../dist/tools/ctf/dump
-MKMAN= no
-
.include
Index: src/external/cddl/osnet/usr.bin/ctfmerge/Makefile
diff -u src/external/cddl/osnet/usr.bin/ctfmerge/Makefile:1.3 src/external/cddl/osnet/usr.bin/ctfmerge/Makefile:1.4
--- src/external/cddl/osnet/usr.bin/ctfmerge/Makefile:1.3 Sun Feb 21 06:00:01 2010
+++ src/external/cddl/osnet/usr.bin/ctfmerge/Makefile Fri Jan 18 14:58:44 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/02/21 11:00:01 darran Exp $
+# $NetBSD: Makefile,v 1.4 2013/01/18 19:58:44 christos Exp $
# $FreeBSD: src/cddl/usr.bin/ctfmerge/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
@@ -44,6 +44,4 @@ LDADD+= -ldwarf -lelf -lz -lpthread
.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt
-MKMAN= no
-
.include
Added files:
Index: src/external/cddl/osnet/usr.bin/ctfconvert/ctfconvert.1
diff -u /dev/null src/external/cddl/osnet/usr.bin/ctfconvert/ctfconvert.1:1.1
--- /dev/null Fri Jan 18 14:58:44 2013
+++ src/external/cddl/osnet/usr.bin/ctfconvert/ctfconvert.1 Fri Jan 18 14:58:43 2013
@@ -0,0 +1,86 @@
+.\" $NetBSD: ctfconvert.1,v 1.1 2013/01/18 19:58:43 christos Exp $
+.\"
+.\" Copyright (c) 2010 The FreeBSD Foundation
+.\" All rights reserved.
+.\"
+.\" This software was developed by Rui Paulo under sponsorship from the
+.\" FreeBSD Foundation.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"notice, this list of conditions and the following disclaimer in the
+.\"documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Fri Jan 18 19:32:10 UTC 2013
Modified Files:
src/share/mk: bsd.own.mk sys.mk
Log Message:
Now that ctf is fixed for at least amd64, go back to an equivalent to the
original functionality, use the tool only if it exists.
To generate a diff of this commit:
cvs rdiff -u -r1.717 -r1.718 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.112 -r1.113 src/share/mk/sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.717 src/share/mk/bsd.own.mk:1.718
--- src/share/mk/bsd.own.mk:1.717 Fri Jan 11 07:55:29 2013
+++ src/share/mk/bsd.own.mk Fri Jan 18 14:32:09 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.717 2013/01/11 12:55:29 matt Exp $
+# $NetBSD: bsd.own.mk,v 1.718 2013/01/18 19:32:09 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -462,6 +462,11 @@ CXX= ${TOOL_CXX.${ACTIVE_CXX}}
FC= ${TOOL_FC.${ACTIVE_FC}}
OBJC= ${TOOL_OBJC.${ACTIVE_OBJC}}
+.if exists(/usr/bin/${TOOL_CTFCONVERT}) || exists(${TOOL_CTFCONVERT})
+CTFCONVERT= ${TOOL_CTFCONVERT}
+CTFMERGE= ${TOOL_CTFMERGE}
+.endif
+
# OBJCOPY flags to create a.out binaries for old firmware
# shared among src/distrib and ${MACHINE}/conf/Makefile.${MACHINE}.inc
.if ${MACHINE_CPU} == "arm"
Index: src/share/mk/sys.mk
diff -u src/share/mk/sys.mk:1.112 src/share/mk/sys.mk:1.113
--- src/share/mk/sys.mk:1.112 Thu Jan 17 12:33:16 2013
+++ src/share/mk/sys.mk Fri Jan 18 14:32:09 2013
@@ -1,4 +1,4 @@
-# $NetBSD: sys.mk,v 1.112 2013/01/17 17:33:16 christos Exp $
+# $NetBSD: sys.mk,v 1.113 2013/01/18 19:32:09 christos Exp $
# @(#)sys.mk 8.2 (Berkeley) 3/21/94
#
# This file contains the basic rules for make(1) and is read first
@@ -41,13 +41,12 @@ COMPILE.c?= ${CC} ${CFLAGS} ${CPPFLAGS}
LINK.c?= ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
# C Type Format data is required for DTrace
-# XXX TBD VERSION is not defined
-# XXX Broken: disable, see commit message
-#CTFFLAGS ?= -L VERSION
-#CTFMFLAGS ?= -t -L VERSION
+CTFFLAGS ?= -L VERSION
+CTFMFLAGS ?= -t -L VERSION
-#CTFCONVERT ?= ${TOOL_CTFCONVERT}
-#CTFMERGE ?= ${TOOL_CTFMERGE}
+# We don't define these here, we let the bsd.own.mk to do it
+#CTFCONVERT ?= ctfconvert
+#CTFMERGE ?= ctfmerge
CXX?= c++
CXXFLAGS?= ${CFLAGS:N-Wno-traditional:N-Wstrict-prototypes:N-Wmissing-prototypes:N-Wno-pointer-sign:N-ffreestanding:N-std=gnu99:N-Wold-style-definition:N-Wno-format-zero-length}
CVS commit: src/sys/arch/luna68k/luna68k
Module Name:src
Committed By: tsutsui
Date: Fri Jan 18 18:41:12 UTC 2013
Modified Files:
src/sys/arch/luna68k/luna68k: locore.s machdep.c
Log Message:
Handle ddb symbol table loaded by the native bootloader properly.
- add a function that check if the symbol table is loaded and
return the table size (taken from sun3/sun3/locore2.c)
- calculate end of symbol table address in locore.s
- call ksym_addsyms_elf() with proper args
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/luna68k/luna68k/locore.s
cvs rdiff -u -r1.93 -r1.94 src/sys/arch/luna68k/luna68k/machdep.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/arch/luna68k/luna68k/locore.s
diff -u src/sys/arch/luna68k/luna68k/locore.s:1.49 src/sys/arch/luna68k/luna68k/locore.s:1.50
--- src/sys/arch/luna68k/luna68k/locore.s:1.49 Sat Jul 28 17:33:53 2012
+++ src/sys/arch/luna68k/luna68k/locore.s Fri Jan 18 18:41:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.49 2012/07/28 17:33:53 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.50 2013/01/18 18:41:12 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -107,8 +107,6 @@ ASENTRY_NOPROFILE(start)
movl %d7,%a0@ | save boothowto
RELOC(bootdev,%a0)
movl %d6,%a0@ | save bootdev
- RELOC(esym,%a0)
- movl %d5,%a0@ | save esym
#endif
RELOC(edata,%a0) | clear out BSS
movl #_C_LABEL(end)-4,%d0 | (must be <= 256 kB)
@@ -117,10 +115,6 @@ ASENTRY_NOPROFILE(start)
1: clrl %a0@+
dbra %d0,1b
-#if 1
- RELOC(esym,%a0)
- clrl %a0@ | store end of symbol table XXX
-#endif
RELOC(lowram,%a0)
movl %a5,%a0@ | store start of physical memory
@@ -219,6 +213,24 @@ Lstart2:
RELOC(physmem,%a0)
movl %d1,%a0@ | and physmem
+/* check if symbol table is loaded and set esym address */
+#if NKSYMS || defined(DDB) || defined(LKM)
+ RELOC(end,%a0)
+ pea %a0@
+ RELOC(_C_LABEL(symtab_size),%a0)
+ jbsr %a0@ | symtab_size(end)
+ addql #4,%sp
+ tstl %d0 | check if valid symtab is loaded
+ jeq 1f | no, skip
+ lea _C_LABEL(end),%a0 | calculate end of symtab address
+ addl %a0,%d0
+#else
+ clrl %d0 | no symbol table
+#endif
+1:
+ RELOC(esym,%a0)
+ movl %d0,%a0@
+
/* configure kernel and lwp0 VA space so we can get going */
#if NKSYMS || defined(DDB) || defined(LKM)
RELOC(esym,%a0) | end of static kernel test/data/syms
Index: src/sys/arch/luna68k/luna68k/machdep.c
diff -u src/sys/arch/luna68k/luna68k/machdep.c:1.93 src/sys/arch/luna68k/luna68k/machdep.c:1.94
--- src/sys/arch/luna68k/luna68k/machdep.c:1.93 Fri Aug 10 12:48:14 2012
+++ src/sys/arch/luna68k/luna68k/machdep.c Fri Jan 18 18:41:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.93 2012/08/10 12:48:14 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.94 2013/01/18 18:41:12 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.93 2012/08/10 12:48:14 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.94 2013/01/18 18:41:12 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -68,6 +68,8 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include
#endif
#include
+#define ELFSIZE 32
+#include
#include
@@ -117,6 +119,12 @@ int cpu_dumpsize(void);
int cpu_dump(int (*)(dev_t, daddr_t, void *, size_t), daddr_t *);
void cpu_init_kcore_hdr(void);
+#if NKSYMS || defined(DDB) || defined(MODULAR)
+vsize_t symtab_size(vaddr_t);
+#endif
+extern char end[];
+extern void *esym;
+
/*
* Machine-independent crash dump header info.
*/
@@ -225,12 +233,7 @@ consinit(void)
}
#if NKSYMS || defined(DDB) || defined(MODULAR)
- {
- extern char end[];
- extern int *esym;
-
- ksyms_addsyms_elf(*(int *)&end, ((int *)&end) + 1, esym);
- }
+ ksyms_addsyms_elf((esym != NULL) ? 1 : 0, (void *)&end, esym);
#endif
#ifdef DDB
if (boothowto & RB_KDB)
@@ -238,6 +241,53 @@ consinit(void)
#endif
}
+#if NKSYMS || defined(DDB) || defined(MODULAR)
+
+/*
+ * Check and compute size of DDB symbols and strings.
+ *
+ * Note this function could be called from locore.s before MMU is turned on
+ * so we should avoid global variables and function calls.
+ */
+vsize_t
+symtab_size(vaddr_t hdr)
+{
+ int i;
+ Elf_Ehdr *ehdr;
+ Elf_Shdr *shp;
+ vaddr_t maxsym;
+
+ /*
+ * Check the ELF headers.
+ */
+
+ ehdr = (void *)hdr;
+ if (ehdr->e_ident[EI_MAG0] != ELFMAG0 ||
+ ehdr->e_ident[EI_MAG1] != ELFMAG1 ||
+ ehdr->e_ident[EI_MAG2] != ELFMAG2 ||
+ ehdr->e_ident[EI_MAG3] != ELFMAG3 ||
+ ehdr->e_ident[EI_CLASS] != ELFCLASS32) {
+ return 0;
+ }
+
+ /*
+ * Find the end of the symbols and strings.
+ */
+
+ maxsym = 0;
+ shp = (Elf_Shdr *)(hdr + ehdr->e_shoff);
+ for (i = 0; i < ehdr->e_shnum; i++) {
+ if (shp[i].sh_type != SHT_SYMTAB &&
+ shp[i].sh_type != SHT_STRTAB) {
+ continue;
+ }
+ maxsym = max(maxsym, shp[i].sh_offset + shp[i].s
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: christos Date: Fri Jan 18 18:12:57 UTC 2013 Modified Files: src/distrib/sets/lists/comp: mi Log Message: pc files for openssl To generate a diff of this commit: cvs rdiff -u -r1.1797 -r1.1798 src/distrib/sets/lists/comp/mi 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/mi diff -u src/distrib/sets/lists/comp/mi:1.1797 src/distrib/sets/lists/comp/mi:1.1798 --- src/distrib/sets/lists/comp/mi:1.1797 Wed Jan 16 11:01:06 2013 +++ src/distrib/sets/lists/comp/mi Fri Jan 18 13:12:56 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1797 2013/01/16 16:01:06 christos Exp $ +# $NetBSD: mi,v 1.1798 2013/01/18 18:12:56 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3150,6 +3150,9 @@ ./usr/lib/pkgconfig/atf-c.pc comp-atf-lib atf,share ./usr/lib/pkgconfig/atf-sh.pc comp-atf-lib atf,share ./usr/lib/pkgconfig/atf.pc comp-obsolete obsolete +./usr/lib/pkgconfig/libcrypto.pc comp-crypto-lib crypto,share +./usr/lib/pkgconfig/libssl.pc comp-crypto-lib crypto,share +./usr/lib/pkgconfig/openssl.pc comp-crypto-lib crypto,share ./usr/lib/pkgconfig/sqlite3.pc comp-c-lib ./usr/libdata/ldscripts/kmodule comp-util-share binutils,kmod ./usr/libdata/lint/llib-larchive.ln comp-c-lintlib lint
CVS commit: src/crypto/external/bsd/openssl
Module Name:src
Committed By: christos
Date: Fri Jan 18 18:09:56 UTC 2013
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: Makefile
src/crypto/external/bsd/openssl/lib/libssl: Makefile
Added Files:
src/crypto/external/bsd/openssl: pkgconfig.mk
Log Message:
Add pkgconfig gluons
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssl/pkgconfig.mk
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssl/lib/libssl/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.6 src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.7
--- src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.6 Thu Jul 26 15:58:40 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/Makefile Fri Jan 18 13:09:56 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/07/26 19:58:40 christos Exp $
+# $NetBSD: Makefile,v 1.7 2013/01/18 18:09:56 christos Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -116,4 +116,7 @@ COPTS.eng_padlock.c = -Wno-stack-protect
INCSDIR=/usr/include/openssl
+PKGCONFIG=libcrypto
+.include "${.CURDIR}/../../pkgconfig.mk"
+
.include
Index: src/crypto/external/bsd/openssl/lib/libssl/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.4 src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.5
--- src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.4 Thu Jul 26 15:58:42 2012
+++ src/crypto/external/bsd/openssl/lib/libssl/Makefile Fri Jan 18 13:09:56 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/07/26 19:58:42 christos Exp $
+# $NetBSD: Makefile,v 1.5 2013/01/18 18:09:56 christos Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -53,4 +53,7 @@ update_inc:
perl ${OPENSSLSRC}/extsrcs.pl 2> srcs.inc; \
patch -s ssl.inc < ssl.diff )
+PKGCONFIG=libssl openssl
+.include "${.CURDIR}/../../pkgconfig.mk"
+
.include
Added files:
Index: src/crypto/external/bsd/openssl/pkgconfig.mk
diff -u /dev/null src/crypto/external/bsd/openssl/pkgconfig.mk:1.1
--- /dev/null Fri Jan 18 13:09:56 2013
+++ src/crypto/external/bsd/openssl/pkgconfig.mk Fri Jan 18 13:09:55 2013
@@ -0,0 +1,10 @@
+# $NetBSD: pkgconfig.mk,v 1.1 2013/01/18 18:09:55 christos Exp $
+
+FILESDIR=/usr/lib/pkgconfig
+.for pkg in ${PKGCONFIG}
+FILES+=${pkg}.pc
+CLEANFILES+=${pkg}.pc
+
+${pkg}.pc: ${.CURDIR}/../../mkpc
+ ${.ALLSRC} ${.TARGET} > ${.TARGET}
+.endfor
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jakllsch
Date: Fri Jan 18 17:58:15 UTC 2013
Modified Files:
src/sbin/gpt: gpt.c show.c
Log Message:
Now that GPT_ENT_TYPE_LINUX_DATA is diffrent from the Windows one, use it.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sbin/gpt/gpt.c
cvs rdiff -u -r1.7 -r1.8 src/sbin/gpt/show.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/gpt/gpt.c
diff -u src/sbin/gpt/gpt.c:1.17 src/sbin/gpt/gpt.c:1.18
--- src/sbin/gpt/gpt.c:1.17 Mon Jul 30 00:53:59 2012
+++ src/sbin/gpt/gpt.c Fri Jan 18 17:58:15 2013
@@ -31,7 +31,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: gpt.c,v 1.17 2012/07/30 00:53:59 matt Exp $");
+__RCSID("$NetBSD: gpt.c,v 1.18 2013/01/18 17:58:15 jakllsch Exp $");
#endif
#include
@@ -328,7 +328,7 @@ parse_uuid(const char *s, uuid_t *uuid)
*uuid = lfs;
return (0);
} else if (strcmp(s, "linux") == 0) {
- uuid_t lnx = GPT_ENT_TYPE_MS_BASIC_DATA;
+ uuid_t lnx = GPT_ENT_TYPE_LINUX_DATA;
*uuid = lnx;
return (0);
}
Index: src/sbin/gpt/show.c
diff -u src/sbin/gpt/show.c:1.7 src/sbin/gpt/show.c:1.8
--- src/sbin/gpt/show.c:1.7 Sat Aug 27 17:38:16 2011
+++ src/sbin/gpt/show.c Fri Jan 18 17:58:15 2013
@@ -29,7 +29,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/show.c,v 1.14 2006/06/22 22:22:32 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: show.c,v 1.7 2011/08/27 17:38:16 joerg Exp $");
+__RCSID("$NetBSD: show.c,v 1.8 2013/01/18 17:58:15 jakllsch Exp $");
#endif
#include
@@ -63,9 +63,10 @@ friendly(uuid_t *t)
{
static uuid_t efi_slice = GPT_ENT_TYPE_EFI;
static uuid_t bios_boot = GPT_ENT_TYPE_BIOS;
- static uuid_t mslinux = GPT_ENT_TYPE_MS_BASIC_DATA;
+ static uuid_t msdata = GPT_ENT_TYPE_MS_BASIC_DATA;
static uuid_t freebsd = GPT_ENT_TYPE_FREEBSD;
static uuid_t hfs = GPT_ENT_TYPE_APPLE_HFS;
+ static uuid_t linuxdata = GPT_ENT_TYPE_LINUX_DATA;
static uuid_t linuxswap = GPT_ENT_TYPE_LINUX_SWAP;
static uuid_t msr = GPT_ENT_TYPE_MS_RESERVED;
static uuid_t swap = GPT_ENT_TYPE_FREEBSD_SWAP;
@@ -108,12 +109,14 @@ friendly(uuid_t *t)
if (uuid_equal(t, &freebsd, NULL))
return ("FreeBSD legacy");
- if (uuid_equal(t, &mslinux, NULL))
- return ("Linux/Windows");
- if (uuid_equal(t, &linuxswap, NULL))
- return ("Linux swap");
+ if (uuid_equal(t, &msdata, NULL))
+ return ("Windows basic data");
if (uuid_equal(t, &msr, NULL))
return ("Windows reserved");
+ if (uuid_equal(t, &linuxdata, NULL))
+ return ("Linux data");
+ if (uuid_equal(t, &linuxswap, NULL))
+ return ("Linux swap");
if (uuid_equal(t, &hfs, NULL))
return ("Apple HFS");
CVS commit: src/crypto/external/bsd/openssl
Module Name:src
Committed By: christos
Date: Fri Jan 18 17:56:12 UTC 2013
Added Files:
src/crypto/external/bsd/openssl: mkpc
Log Message:
#!/bin/sh
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssl/mkpc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/crypto/external/bsd/openssl/mkpc
diff -u /dev/null src/crypto/external/bsd/openssl/mkpc:1.1
--- /dev/null Fri Jan 18 12:56:12 2013
+++ src/crypto/external/bsd/openssl/mkpc Fri Jan 18 12:56:11 2013
@@ -0,0 +1,48 @@
+#!/bin/sh
+# $NetBSD: mkpc,v 1.1 2013/01/18 17:56:11 christos Exp $
+
+getversion() {
+ (echo '#include '; echo OPENSSL_VERSION_TEXT) |
+ cpp | grep OpenSSL | tr -d \"
+}
+VERSION="$(getversion)"
+
+sed -e "s/@VERSION@/${VERSION}/g" < "$1"
+
+case "$1" in
+libcrypto.pc)
+ NAME="OpenSSL-libcrypto"
+ LIBS="-lcrypto"
+ DESCRIPTION="OpenSSL cryptography library"
+ ;;
+libssl.pc)
+ NAME="OpenSSL"
+ LIBS="-lssl -lcrypto"
+ DESCRIPTION="Secure Sockets Layer and cryptography libraries"
+ ;;
+openssl.pc)
+ NAME="OpenSSL"
+ LIBS="-lssl -lcrypto"
+ DESCRIPTION="Sockets Layer and cryptography libraries and tools"
+ ;;
+*)
+ echo "$0: I don't know about $1" 1>&2
+ exit 1
+ ;;
+esac
+
+cat << EOF > "$1"
+# \$NetBSD: mkpc,v 1.1 2013/01/18 17:56:11 christos Exp $
+prefix=/usr
+exec_prefix=/usr
+libdir=/usr/lib
+includedir=/usr/include
+
+Name: ${NAME}
+Description: ${DESCRIPTION}
+Version: ${VERSION}
+Requires:
+Libs: ${LIBS}
+Libs.private:
+Cflags:
+EOF
CVS commit: src/sys/sys
Module Name:src
Committed By: jakllsch
Date: Fri Jan 18 17:43:35 UTC 2013
Modified Files:
src/sys/sys: disklabel_gpt.h
Log Message:
gdisk 0.7.2 finally introduced a Linux Basic Data partition GUID.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/sys/disklabel_gpt.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/sys/disklabel_gpt.h
diff -u src/sys/sys/disklabel_gpt.h:1.9 src/sys/sys/disklabel_gpt.h:1.10
--- src/sys/sys/disklabel_gpt.h:1.9 Tue Aug 16 14:04:26 2011
+++ src/sys/sys/disklabel_gpt.h Fri Jan 18 17:43:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel_gpt.h,v 1.9 2011/08/16 14:04:26 jakllsch Exp $ */
+/* $NetBSD: disklabel_gpt.h,v 1.10 2013/01/18 17:43:35 jakllsch Exp $ */
/*
* Copyright (c) 2002 Marcel Moolenaar
@@ -143,7 +143,12 @@ struct gpt_ent {
#define GPT_ENT_TYPE_MS_LDM_DATA \
{0xaf9b60a0,0x1431,0x4f62,0xbc,0x68,{0x33,0x11,0x71,0x4a,0x69,0xad}}
-#define GPT_ENT_TYPE_LINUX_DATA GPT_ENT_TYPE_MS_BASIC_DATA
+/*
+ * Linux originally used GPT_ENT_TYPE_MS_BASIC_DATA in place of
+ * GPT_ENT_TYPE_LINUX_DATA.
+ */
+#define GPT_ENT_TYPE_LINUX_DATA \
+ {0x0fc63daf,0x8483,0x4772,0x8e,0x79,{0x3d,0x69,0xd8,0x47,0x7d,0xe4}}
#define GPT_ENT_TYPE_LINUX_RAID \
{0xa19d880f,0x05fc,0x4d3b,0xa0,0x06,{0x74,0x3f,0x0f,0x84,0x91,0x1e}}
#define GPT_ENT_TYPE_LINUX_SWAP \
CVS commit: src/external/cddl/osnet/dist/tools/ctf/cvt
Module Name:src Committed By: christos Date: Fri Jan 18 16:23:48 UTC 2013 Modified Files: src/external/cddl/osnet/dist/tools/ctf/cvt: dwarf.c Log Message: Handle enum forward declarations. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.5 src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.6 --- src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.5 Tue Jan 10 03:42:22 2012 +++ src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c Fri Jan 18 11:23:48 2013 @@ -767,7 +767,9 @@ die_enum_create(dwarf_t *dw, Dwarf_Die d debug(3, "die %llu: creating enum\n", off); - tdp->t_type = ENUM; + tdp->t_type = (die_isdecl(dw, die) ? FORWARD : ENUM); + if (tdp->t_type != ENUM) + return; (void) die_unsigned(dw, die, DW_AT_byte_size, &uval, DW_ATTR_REQ); /* Check for bogus gcc DW_AT_byte_size attribute */
CVS commit: src/external/bsd/libdwarf/lib
Module Name:src Committed By: christos Date: Fri Jan 18 16:22:35 UTC 2013 Modified Files: src/external/bsd/libdwarf/lib: Makefile Log Message: Forgot to commit additional file. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libdwarf/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/libdwarf/lib/Makefile diff -u src/external/bsd/libdwarf/lib/Makefile:1.1 src/external/bsd/libdwarf/lib/Makefile:1.2 --- src/external/bsd/libdwarf/lib/Makefile:1.1 Tue Dec 22 19:10:15 2009 +++ src/external/bsd/libdwarf/lib/Makefile Fri Jan 18 11:22:35 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2009/12/23 00:10:15 darran Exp $ +# $NetBSD: Makefile,v 1.2 2013/01/18 16:22:35 christos Exp $ .include @@ -15,6 +15,7 @@ SRCS= dwarf_abbrev.c \ dwarf_errno.c \ dwarf_finish.c \ dwarf_form.c \ + dwarf_func.c \ dwarf_init.c \ dwarf_loc.c
CVS commit: src/sys/arch/evbppc/evbppc
Module Name:src Committed By: kiyohara Date: Fri Jan 18 14:04:16 UTC 2013 Modified Files: src/sys/arch/evbppc/evbppc: disksubr.c Log Message: Fix KASSERT() in biodone(). Clear BO_DONE in writedisklabel(). To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbppc/evbppc/disksubr.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/arch/evbppc/evbppc/disksubr.c diff -u src/sys/arch/evbppc/evbppc/disksubr.c:1.16 src/sys/arch/evbppc/evbppc/disksubr.c:1.17 --- src/sys/arch/evbppc/evbppc/disksubr.c:1.16 Wed Jan 2 11:48:24 2008 +++ src/sys/arch/evbppc/evbppc/disksubr.c Fri Jan 18 14:04:16 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: disksubr.c,v 1.16 2008/01/02 11:48:24 ad Exp $ */ +/* $NetBSD: disksubr.c,v 1.17 2013/01/18 14:04:16 kiyohara Exp $ */ /* * Copyright (c) 1982, 1986, 1988 Regents of the University of California. @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.16 2008/01/02 11:48:24 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.17 2013/01/18 14:04:16 kiyohara Exp $"); #include #include @@ -248,6 +248,7 @@ writedisklabel(dev_t dev, void (*strat)( *dlp = *lp; bp->b_cflags = BC_BUSY; bp->b_flags = B_WRITE; + CLR(bp->b_oflags, BO_DONE); (*strat)(bp); error = biowait(bp); goto done;
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jmcneill Date: Fri Jan 18 13:45:51 UTC 2013 Modified Files: src/sys/dev/usb: if_urtwn.c Log Message: if doing #ifdef INET, you need opt_inet.h! To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/dev/usb/if_urtwn.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/usb/if_urtwn.c diff -u src/sys/dev/usb/if_urtwn.c:1.10 src/sys/dev/usb/if_urtwn.c:1.11 --- src/sys/dev/usb/if_urtwn.c:1.10 Fri Jan 18 01:41:07 2013 +++ src/sys/dev/usb/if_urtwn.c Fri Jan 18 13:45:51 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: if_urtwn.c,v 1.10 2013/01/18 01:41:07 jmcneill Exp $ */ +/* $NetBSD: if_urtwn.c,v 1.11 2013/01/18 13:45:51 jmcneill Exp $ */ /* $OpenBSD: if_urtwn.c,v 1.20 2011/11/26 06:39:33 ckuethe Exp $ */ /*- @@ -22,7 +22,11 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.10 2013/01/18 01:41:07 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.11 2013/01/18 13:45:51 jmcneill Exp $"); + +#ifdef _KERNEL_OPT +#include "opt_inet.h" +#endif #include #include @@ -52,6 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v #include #include #include +#include #include #include @@ -2354,7 +2359,7 @@ urtwn_ioctl(struct ifnet *ifp, u_long cm ifp->if_flags |= IFF_UP; #ifdef INET if (ifa->ifa_addr->sa_family == AF_INET) - arp_ifinit(&ic->ic_ac, ifa); + arp_ifinit(ifp, ifa); #endif /*FALLTHROUGH*/ case SIOCSIFFLAGS:
