CVS commit: src/lib/libform
Module Name:src
Committed By: christos
Date: Tue Nov 26 01:17:00 UTC 2013
Modified Files:
src/lib/libform: driver.c form.h internals.c
Log Message:
goodbye CIRCLEQ, welcome TAILQ
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/lib/libform/driver.c
cvs rdiff -u -r1.21 -r1.22 src/lib/libform/form.h
cvs rdiff -u -r1.36 -r1.37 src/lib/libform/internals.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libform/driver.c
diff -u src/lib/libform/driver.c:1.17 src/lib/libform/driver.c:1.18
--- src/lib/libform/driver.c:1.17 Wed Feb 3 10:34:43 2010
+++ src/lib/libform/driver.c Mon Nov 25 20:17:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: driver.c,v 1.17 2010/02/03 15:34:43 roy Exp $ */
+/* $NetBSD: driver.c,v 1.18 2013/11/26 01:17:00 christos Exp $ */
/*-
* Copyright (c) 1998-1999 Brett Lymn
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: driver.c,v 1.17 2010/02/03 15:34:43 roy Exp $");
+__RCSID("$NetBSD: driver.c,v 1.18 2013/11/26 01:17:00 christos Exp $");
#include
#include "form.h"
@@ -284,13 +284,14 @@ form_driver(FORM *form, int c)
break;
case REQ_SFIRST_FIELD:
- fieldp = CIRCLEQ_FIRST(&form->sorted_fields);
+ fieldp = TAILQ_FIRST(&form->sorted_fields);
form->cur_field = fieldp->index;
update_field = 1;
break;
case REQ_SLAST_FIELD:
- fieldp = CIRCLEQ_LAST(&form->sorted_fields);
+ fieldp = TAILQ_LAST(&form->sorted_fields,
+ _formi_sort_head);
form->cur_field = fieldp->index;
update_field = 1;
break;
Index: src/lib/libform/form.h
diff -u src/lib/libform/form.h:1.21 src/lib/libform/form.h:1.22
--- src/lib/libform/form.h:1.21 Mon Nov 28 07:44:18 2011
+++ src/lib/libform/form.h Mon Nov 25 20:17:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: form.h,v 1.21 2011/11/28 12:44:18 joerg Exp $ */
+/* $NetBSD: form.h,v 1.22 2013/11/26 01:17:00 christos Exp $ */
/*-
* Copyright (c) 1998-1999 Brett Lymn
@@ -231,7 +231,7 @@ struct _form_field {
void *userptr; /* user defined pointer. */
FIELD *link; /* used if fields are linked */
FIELDTYPE *type; /* type struct for the field */
- CIRCLEQ_ENTRY(_form_field) glue; /* circle queue glue for sorting fields */
+ TAILQ_ENTRY(_form_field) glue; /* tail queue glue for sorting fields */
char *args; /* args for field type. */
_FORMI_FIELD_LINES *alines; /* array of the starts and ends of lines */
_FORMI_FIELD_LINES *free; /* list of lines available for reuse */
@@ -291,7 +291,7 @@ struct _form_struct {
int max_page; /* number of pages in the form */
_FORMI_PAGE_START *page_starts; /* dynamic array of fields that start
the pages */
- CIRCLEQ_HEAD(_formi_sort_head, _form_field) sorted_fields; /* sorted field
+ TAILQ_HEAD(_formi_sort_head, _form_field) sorted_fields; /* sorted field
list */
FIELD **fields; /* array of fields attached to this form. */
};
Index: src/lib/libform/internals.c
diff -u src/lib/libform/internals.c:1.36 src/lib/libform/internals.c:1.37
--- src/lib/libform/internals.c:1.36 Sat Jan 19 11:11:03 2013
+++ src/lib/libform/internals.c Mon Nov 25 20:17:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: internals.c,v 1.36 2013/01/19 16:11:03 mbalmer Exp $ */
+/* $NetBSD: internals.c,v 1.37 2013/11/26 01:17:00 christos Exp $ */
/*-
* Copyright (c) 1998-1999 Brett Lymn
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: internals.c,v 1.36 2013/01/19 16:11:03 mbalmer Exp $");
+__RCSID("$NetBSD: internals.c,v 1.37 2013/11/26 01:17:00 christos Exp $");
#include
#include
@@ -390,8 +390,8 @@ _formi_pos_first_field(FORM *form)
cur = form->fields[form->page_starts[form->page].first];
while ((cur->opts & (O_VISIBLE | O_ACTIVE))
!= (O_VISIBLE | O_ACTIVE)) {
- cur = CIRCLEQ_NEXT(cur, glue);
- if (cur == (void *) &form->sorted_fields) {
+ cur = TAILQ_NEXT(cur, glue);
+ if (cur == NULL) {
form->page = old_page;
return E_REQUEST_DENIED;
}
@@ -420,9 +420,10 @@ _formi_pos_new_field(FORM *form, unsigne
if (direction == _FORMI_FORWARD) {
if (use_sorted == TRUE) {
if ((form->wrap == FALSE) &&
-(cur == CIRCLEQ_LAST(&form->sorted_fields)))
+(cur == TAILQ_LAST(&form->sorted_fields,
+ _formi_sort_head)))
return E_REQUEST_DENIED;
-cur = CIRCLEQ_NEXT(cur, glue);
+cur = TAILQ_NEXT(cur, glue);
i = cur->index;
} else {
if ((form->wrap == FALSE) &&
@@ -435,9 +436,9 @@ _formi_pos_new_field(FORM *form, unsigne
} else {
if (use_sorted == TRUE) {
if ((form->wrap == FALSE) &&
-(cur == CIRCLEQ_FIRST(&form->sorted_fields)))
+(cur == TAILQ_FIRST(&form->sorted_fields)))
return E_REQUEST_DENIED;
-cur = CIRCLEQ_PREV(cur, glue);
+cur = TAILQ_PREV(cur, _formi_sort_head, glue);
i = cur->index;
} else {
if ((form->wrap == FALSE) && (i <= 0))
@@ -3242,9 +3243,9 @@ _formi_sort_fields(FORM *form)
FIELD **sort_area;
int i;
- CIRCLEQ_INI
CVS commit: src/external/bsd/tmux/dist/compat
Module Name:src Committed By: christos Date: Tue Nov 26 01:26:42 UTC 2013 Removed Files: src/external/bsd/tmux/dist/compat: asprintf.c bitstring.h closefrom.c daemon.c fgetln.c forkpty-aix.c forkpty-hpux.c forkpty-sunos.c getopt.c queue.h setenv.c strcasestr.c strlcat.c strlcpy.c strsep.c tree.h unvis.c vis.c vis.h Log Message: delete things that we don't need so we don't use them accidentally. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/tmux/dist/compat/asprintf.c \ src/external/bsd/tmux/dist/compat/bitstring.h \ src/external/bsd/tmux/dist/compat/closefrom.c \ src/external/bsd/tmux/dist/compat/daemon.c \ src/external/bsd/tmux/dist/compat/fgetln.c \ src/external/bsd/tmux/dist/compat/forkpty-aix.c \ src/external/bsd/tmux/dist/compat/forkpty-sunos.c \ src/external/bsd/tmux/dist/compat/getopt.c \ src/external/bsd/tmux/dist/compat/queue.h \ src/external/bsd/tmux/dist/compat/setenv.c \ src/external/bsd/tmux/dist/compat/strcasestr.c \ src/external/bsd/tmux/dist/compat/strlcat.c \ src/external/bsd/tmux/dist/compat/strlcpy.c \ src/external/bsd/tmux/dist/compat/strsep.c \ src/external/bsd/tmux/dist/compat/tree.h \ src/external/bsd/tmux/dist/compat/unvis.c \ src/external/bsd/tmux/dist/compat/vis.c \ src/external/bsd/tmux/dist/compat/vis.h cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/tmux/dist/compat/forkpty-hpux.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src Committed By: christos Date: Tue Nov 26 01:27:20 UTC 2013 Modified Files: src/external/bsd/tmux/usr.bin/tmux: Makefile Log Message: Provide the correct feature macros, so that we get to include our own files not the compat copies. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/bsd/tmux/usr.bin/tmux/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/tmux/usr.bin/tmux/Makefile diff -u src/external/bsd/tmux/usr.bin/tmux/Makefile:1.9 src/external/bsd/tmux/usr.bin/tmux/Makefile:1.10 --- src/external/bsd/tmux/usr.bin/tmux/Makefile:1.9 Fri Sep 16 21:48:46 2011 +++ src/external/bsd/tmux/usr.bin/tmux/Makefile Mon Nov 25 20:27:20 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2011/09/17 01:48:46 christos Exp $ +# $NetBSD: Makefile,v 1.10 2013/11/26 01:27:20 christos Exp $ .include @@ -179,7 +179,8 @@ CPPFLAGS+= -DHAVE_INTTYPES_H=1 CPPFLAGS+= -DHAVE_PATHS_H=1 CPPFLAGS+= -DHAVE_STDINT_H=1 CPPFLAGS+= -DHAVE_SYS_DIR_H=1 -CPPFLAGS+= -DHAVE_SYS_TREE_H=1 +CPPFLAGS+= -DHAVE_QUEUE_H=1 +CPPFLAGS+= -DHAVE_TREE_H=1 CPPFLAGS+= -DHAVE_TERM_H=1 CPPFLAGS+= -DHAVE_UTIL_H=1 CPPFLAGS+= -DHAVE_LIBRT=1
CVS commit: src/sys/sys
Module Name:src
Committed By: christos
Date: Tue Nov 26 01:27:46 UTC 2013
Modified Files:
src/sys/sys: queue.h
Log Message:
Provide TAILQ_REPLACE for tmux, from FreeBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/sys/queue.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/queue.h
diff -u src/sys/sys/queue.h:1.59 src/sys/sys/queue.h:1.60
--- src/sys/sys/queue.h:1.59 Sun Nov 24 22:02:57 2013
+++ src/sys/sys/queue.h Mon Nov 25 20:27:46 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: queue.h,v 1.59 2013/11/25 03:02:57 christos Exp $ */
+/* $NetBSD: queue.h,v 1.60 2013/11/26 01:27:46 christos Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -556,6 +556,18 @@ struct {\
QUEUEDEBUG_TAILQ_POSTREMOVE((elm), field); \
} while (/*CONSTCOND*/0)
+#define TAILQ_REPLACE(head, elm, elm2, field) do { \
+if (((elm2)->field.tqe_next = (elm)->field.tqe_next) != \
+ TAILQ_END(head)) \
+(elm2)->field.tqe_next->field.tqe_prev =\
+&(elm2)->field.tqe_next;\
+else\
+(head)->tqh_last = &(elm2)->field.tqe_next; \
+(elm2)->field.tqe_prev = (elm)->field.tqe_prev; \
+*(elm2)->field.tqe_prev = (elm2); \
+ QUEUEDEBUG_TAILQ_POSTREMOVE((elm), field); \
+} while (/*CONSTCOND*/0)
+
#define TAILQ_FOREACH(var, head, field) \
for ((var) = ((head)->tqh_first);\
(var) != TAILQ_END(head); \
CVS commit: src/external/bsd/openldap/dist/include
Module Name:src
Committed By: christos
Date: Tue Nov 26 01:31:43 UTC 2013
Modified Files:
src/external/bsd/openldap/dist/include: ldap_queue.h
Log Message:
Kill CIRCLEQ, nothing uses it and it will not work with gcc-4.8, so avoid
future accidents.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/bsd/openldap/dist/include/ldap_queue.h
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/openldap/dist/include/ldap_queue.h
diff -u src/external/bsd/openldap/dist/include/ldap_queue.h:1.1.1.3 src/external/bsd/openldap/dist/include/ldap_queue.h:1.2
--- src/external/bsd/openldap/dist/include/ldap_queue.h:1.1.1.3 Sun Dec 12 10:21:24 2010
+++ src/external/bsd/openldap/dist/include/ldap_queue.h Mon Nov 25 20:31:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ldap_queue.h,v 1.1.1.3 2010/12/12 15:21:24 adam Exp $ */
+/* $NetBSD: ldap_queue.h,v 1.2 2013/11/26 01:31:43 christos Exp $ */
/* ldap_queue.h -- queue macros */
/* OpenLDAP: pkg/ldap/include/ldap_queue.h,v 1.13.2.5 2010/04/13 20:22:48 kurt Exp */
@@ -109,24 +109,24 @@
* For details on the use of these macros, see the queue(3) manual page.
* All macros are prefixed with LDAP_.
*
- * SLIST_ LIST_ STAILQ_ TAILQ_ CIRCLEQ_
- * _HEAD + + + + +
- * _ENTRY + + + + +
- * _INIT + + + + +
- * _ENTRY_INIT + + + + +
- * _EMPTY + + + + +
- * _FIRST + + + + +
- * _NEXT + + + + +
- * _PREV - - - + +
- * _LAST - - + + +
- * _FOREACH + + + + +
- * _FOREACH_REVERSE - - - + +
- * _INSERT_HEAD + + + + +
- * _INSERT_BEFORE - + - + +
- * _INSERT_AFTER + + + + +
- * _INSERT_TAIL - - + + +
- * _REMOVE_HEAD + - + - -
- * _REMOVE + + + + +
+ * SLIST_ LIST_ STAILQ_ TAILQ_
+ * _HEAD + + + +
+ * _ENTRY + + + +
+ * _INIT + + + +
+ * _ENTRY_INIT + + + +
+ * _EMPTY + + + +
+ * _FIRST + + + +
+ * _NEXT + + + +
+ * _PREV - - - +
+ * _LAST - - + +
+ * _FOREACH + + + +
+ * _FOREACH_REVERSE - - - +
+ * _INSERT_HEAD + + + +
+ * _INSERT_BEFORE - + - +
+ * _INSERT_AFTER + + + +
+ * _INSERT_TAIL - - + +
+ * _REMOVE_HEAD + - + -
+ * _REMOVE + + + +
*
*/
@@ -460,105 +460,4 @@ struct {\
*(elm)->field.tqe_prev = (elm)->field.tqe_next; \
} while (0)
-/*
- * Circular queue definitions.
- */
-#define LDAP_CIRCLEQ_HEAD(name, type) \
-struct name {\
- struct type *cqh_first; /* first element */ \
- struct type *cqh_last; /* last element */ \
-}
-
-#define LDAP_CIRCLEQ_ENTRY(type) \
-struct {\
- struct type *cqe_next; /* next element */ \
- struct type *cqe_prev; /* previous element */ \
-}
-
-/*
- * Circular queue functions.
- */
-#define LDAP_CIRCLEQ_EMPTY(head) ((head)->cqh_first == (void *)(head))
-
-#define LDAP_CIRCLEQ_FIRST(head) ((head)->cqh_first)
-
-#define LDAP_CIRCLEQ_FOREACH(var, head, field)\
- for((var) = (head)->cqh_first; \
- (var) != (void *)(head); \
- (var) = (var)->field.cqe_next)
-
-#define LDAP_CIRCLEQ_FOREACH_REVERSE(var, head, field) \
- for((var) = (head)->cqh_last; \
- (var) != (void *)(head); \
- (var) = (var)->field.cqe_prev)
-
-#define LDAP_CIRCLEQ_INIT(head) do { \
- (head)->cqh_first = (void *)(head);\
- (head)->cqh_last = (void *)(head);\
-} while (0)
-
-#define LDAP_CIRCLEQ_ENTRY_INIT(var, field) do { \
- (var)->field.cqe_next = NULL; \
- (var)->field.cqe_prev = NULL; \
-} while (0)
-
-#define LDAP_CIRCLEQ_INSERT_AFTER(head, listelm, elm, field) do { \
- (elm)->field.cqe_next = (listelm)->field.cqe_next; \
- (elm)->field.cqe_prev = (listelm);\
- if ((listelm)->field.cqe_next == (void *)(head)) \
- (head)->cqh_last = (elm);\
- else\
- (listelm)->field.cqe_next->field.cqe_prev = (elm); \
- (listelm)->field.cqe_next = (elm);\
-} while (0)
-
-#define LDAP_CIRCLEQ_INSERT_BEFORE(head, listelm, elm, field) do { \
- (elm)->field.cqe_next = (listelm);\
- (elm)->field.cqe_prev = (listelm)->field.cqe_prev; \
- if ((listelm)->field.cqe_prev == (void *)(head)) \
- (head)->cqh_first = (elm);\
- else\
- (listelm)->field.cqe_prev->field.cqe_next = (elm); \
- (listelm)->field.cqe_prev = (elm);\
-} while (0)
-
-#define LDAP_CIRCLEQ_INSERT_HEAD(head, elm, field) do { \
- (elm)->field.cqe_next = (head)->cqh_first; \
- (elm)->field.cqe_prev = (void *)(head);\
- if ((head)->cqh_last == (void *)(head))\
- (head)->cqh_last = (elm);\
- else\
- (head)->cqh_first->field.cqe_prev = (elm); \
- (head)->cqh_first = (elm); \
-} while (0)
-
-#define LDAP_CIRCLEQ_INSERT_TAIL(head, elm, field) do { \
- (elm)->field.cqe_next = (void *)(head);\
- (elm)->field.cqe_prev = (head)->cqh_last; \
- if ((head)->cqh_first == (void *)(head)) \
- (head)->cqh_first = (elm);\
- else\
- (head)->cqh_last->field.cqe_next = (elm); \
- (head)->cqh_last = (elm); \
-} while (0)
-
-#define LDAP_CIRCLEQ_LAST(head) ((head)->cqh_las
CVS commit: src/share/man/man3
Module Name:src Committed By: christos Date: Tue Nov 26 01:33:02 UTC 2013 Modified Files: src/share/man/man3: Makefile Log Message: remove CIRCLEQ pages. To generate a diff of this commit: cvs rdiff -u -r1.83 -r1.84 src/share/man/man3/Makefile 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/man3/Makefile diff -u src/share/man/man3/Makefile:1.83 src/share/man/man3/Makefile:1.84 --- src/share/man/man3/Makefile:1.83 Sun Oct 27 07:56:18 2013 +++ src/share/man/man3/Makefile Mon Nov 25 20:33:02 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2013/10/27 11:56:18 apb Exp $ +# $NetBSD: Makefile,v 1.84 2013/11/26 01:33:02 christos Exp $ # @(#)Makefile 8.2 (Berkeley) 12/13/93 MAN= _DIAGASSERT.3 __CONCAT.3 __UNCONST.3 __USE.3 CMSG_DATA.3 \ @@ -202,24 +202,6 @@ MLINKS+=queue.3 TAILQ_HEAD.3 \ queue.3 TAILQ_NEXT.3 \ queue.3 TAILQ_LAST.3 \ queue.3 TAILQ_PREV.3 -MLINKS+=queue.3 CIRCLEQ_HEAD.3 \ - queue.3 CIRCLEQ_HEAD_INITIALIZER.3 \ - queue.3 CIRCLEQ_ENTRY.3 \ - queue.3 CIRCLEQ_INIT.3 \ - queue.3 CIRCLEQ_INSERT_AFTER.3 \ - queue.3 CIRCLEQ_INSERT_BEFORE.3 \ - queue.3 CIRCLEQ_INSERT_HEAD.3 \ - queue.3 CIRCLEQ_INSERT_TAIL.3 \ - queue.3 CIRCLEQ_REMOVE.3 \ - queue.3 CIRCLEQ_FOREACH.3 \ - queue.3 CIRCLEQ_FOREACH_REVERSE.3 \ - queue.3 CIRCLEQ_EMPTY.3 \ - queue.3 CIRCLEQ_FIRST.3 \ - queue.3 CIRCLEQ_LAST.3 \ - queue.3 CIRCLEQ_NEXT.3 \ - queue.3 CIRCLEQ_PREV.3 \ - queue.3 CIRCLEQ_LOOP_NEXT.3 \ - queue.3 CIRCLEQ_LOOP_PREV.3 MLINKS+=rbtree.3 rb_tree_init.3 \ rbtree.3 rb_tree_insert_node.3 \ rbtree.3 rb_tree_find_node.3 \
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: christos Date: Tue Nov 26 01:36:07 UTC 2013 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Bye CIRCLEQ To generate a diff of this commit: cvs rdiff -u -r1.1862 -r1.1863 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.1862 src/distrib/sets/lists/comp/mi:1.1863 --- src/distrib/sets/lists/comp/mi:1.1862 Tue Nov 19 14:24:34 2013 +++ src/distrib/sets/lists/comp/mi Mon Nov 25 20:36:07 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1862 2013/11/19 19:24:34 joerg Exp $ +# $NetBSD: mi,v 1.1863 2013/11/26 01:36:07 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -4631,25 +4631,25 @@ ./usr/share/man/cat3/BN_set_bit.0 comp-c-catman crypto,.cat ./usr/share/man/cat3/BN_swap.0 comp-c-catman crypto,.cat ./usr/share/man/cat3/BN_zero.0 comp-c-catman crypto,.cat -./usr/share/man/cat3/CIRCLEQ_EMPTY.0 comp-c-catman .cat -./usr/share/man/cat3/CIRCLEQ_ENTRY.0 comp-c-catman .cat -./usr/share/man/cat3/CIRCLEQ_FIRST.0 comp-c-catman .cat -./usr/share/man/cat3/CIRCLEQ_FOREACH.0 comp-c-catman .cat -./usr/share/man/cat3/CIRCLEQ_FOREACH_REVERSE.0 comp-c-catman .cat -./usr/share/man/cat3/CIRCLEQ_HEAD.0 comp-c-catman .cat -./usr/share/man/cat3/CIRCLEQ_HEAD_INITIALIZER.0 comp-c-catman .cat -./usr/share/man/cat3/CIRCLEQ_INIT.0 comp-c-catman .cat -./usr/share/man/cat3/CIRCLEQ_INSERT_AFTER.0 comp-c-catman .cat -./usr/share/man/cat3/CIRCLEQ_INSERT_BEFORE.0 comp-c-catman .cat -./usr/share/man/cat3/CIRCLEQ_INSERT_HEAD.0 comp-c-catman .cat -./usr/share/man/cat3/CIRCLEQ_INSERT_TAIL.0 comp-c-catman .cat -./usr/share/man/cat3/CIRCLEQ_LAST.0 comp-c-catman .cat -./usr/share/man/cat3/CIRCLEQ_LOOP_NEXT.0 comp-c-catman .cat -./usr/share/man/cat3/CIRCLEQ_LOOP_PREV.0 comp-c-catman .cat -./usr/share/man/cat3/CIRCLEQ_NEXT.0 comp-c-catman .cat -./usr/share/man/cat3/CIRCLEQ_PREV.0 comp-c-catman .cat -./usr/share/man/cat3/CIRCLEQ_REMOVE.0 comp-c-catman .cat -./usr/share/man/cat3/CMSG_DATA.0 comp-c-catman .cat +./usr/share/man/cat3/CIRCLEQ_EMPTY.0 comp-obsolete obsolete +./usr/share/man/cat3/CIRCLEQ_ENTRY.0 comp-obsolete obsolete +./usr/share/man/cat3/CIRCLEQ_FIRST.0 comp-obsolete obsolete +./usr/share/man/cat3/CIRCLEQ_FOREACH.0 comp-obsolete obsolete +./usr/share/man/cat3/CIRCLEQ_FOREACH_REVERSE.0 comp-obsolete obsolete +./usr/share/man/cat3/CIRCLEQ_HEAD.0 comp-obsolete obsolete +./usr/share/man/cat3/CIRCLEQ_HEAD_INITIALIZER.0 comp-obsolete obsolete +./usr/share/man/cat3/CIRCLEQ_INIT.0 comp-obsolete obsolete +./usr/share/man/cat3/CIRCLEQ_INSERT_AFTER.0 comp-obsolete obsolete +./usr/share/man/cat3/CIRCLEQ_INSERT_BEFORE.0 comp-obsolete obsolete +./usr/share/man/cat3/CIRCLEQ_INSERT_HEAD.0 comp-obsolete obsolete +./usr/share/man/cat3/CIRCLEQ_INSERT_TAIL.0 comp-obsolete obsolete +./usr/share/man/cat3/CIRCLEQ_LAST.0 comp-obsolete obsolete +./usr/share/man/cat3/CIRCLEQ_LOOP_NEXT.0 comp-obsolete obsolete +./usr/share/man/cat3/CIRCLEQ_LOOP_PREV.0 comp-obsolete obsolete +./usr/share/man/cat3/CIRCLEQ_NEXT.0 comp-obsolete obsolete +./usr/share/man/cat3/CIRCLEQ_PREV.0 comp-obsolete obsolete +./usr/share/man/cat3/CIRCLEQ_REMOVE.0 comp-obsolete obsolete +./usr/share/man/cat3/CMSG_DATA.0 comp-obsolete obsolete ./usr/share/man/cat3/CMSG_FIRSTHDR.0 comp-c-catman .cat ./usr/share/man/cat3/CMSG_LEN.0 comp-c-catman .cat ./usr/share/man/cat3/CMSG_NXTHDR.0 comp-c-catman .cat
CVS commit: src/sys/sys
Module Name:src
Committed By: christos
Date: Tue Nov 26 01:41:34 UTC 2013
Modified Files:
src/sys/sys: queue.h
Log Message:
remove trailing whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/sys/queue.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/queue.h
diff -u src/sys/sys/queue.h:1.60 src/sys/sys/queue.h:1.61
--- src/sys/sys/queue.h:1.60 Mon Nov 25 20:27:46 2013
+++ src/sys/sys/queue.h Mon Nov 25 20:41:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: queue.h,v 1.60 2013/11/26 01:27:46 christos Exp $ */
+/* $NetBSD: queue.h,v 1.61 2013/11/26 01:41:34 christos Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -559,12 +559,12 @@ struct {\
#define TAILQ_REPLACE(head, elm, elm2, field) do { \
if (((elm2)->field.tqe_next = (elm)->field.tqe_next) != \
TAILQ_END(head)) \
-(elm2)->field.tqe_next->field.tqe_prev =\
+(elm2)->field.tqe_next->field.tqe_prev =\
&(elm2)->field.tqe_next;\
else\
-(head)->tqh_last = &(elm2)->field.tqe_next; \
+(head)->tqh_last = &(elm2)->field.tqe_next; \
(elm2)->field.tqe_prev = (elm)->field.tqe_prev; \
-*(elm2)->field.tqe_prev = (elm2); \
+*(elm2)->field.tqe_prev = (elm2); \
QUEUEDEBUG_TAILQ_POSTREMOVE((elm), field); \
} while (/*CONSTCOND*/0)
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Tue Nov 26 05:54:43 UTC 2013
Modified Files:
src/sys/dev/usb: ehci.c
Log Message:
Improve DEBUG message.
To generate a diff of this commit:
cvs rdiff -u -r1.218 -r1.219 src/sys/dev/usb/ehci.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/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.218 src/sys/dev/usb/ehci.c:1.219
--- src/sys/dev/usb/ehci.c:1.218 Mon Nov 25 07:59:03 2013
+++ src/sys/dev/usb/ehci.c Tue Nov 26 05:54:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.218 2013/11/25 07:59:03 skrll Exp $ */
+/* $NetBSD: ehci.c,v 1.219 2013/11/26 05:54:43 skrll Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.218 2013/11/25 07:59:03 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.219 2013/11/26 05:54:43 skrll Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -1525,7 +1525,7 @@ ehci_dump_qtd(ehci_qtd_t *qtd)
printf(" status=0x%08x: toggle=%d bytes=0x%x ioc=%d c_page=0x%x\n",
s, EHCI_QTD_GET_TOGGLE(s), EHCI_QTD_GET_BYTES(s),
EHCI_QTD_GET_IOC(s), EHCI_QTD_GET_C_PAGE(s));
- printf("cerr=%d pid=%d stat=0x%s\n", EHCI_QTD_GET_CERR(s),
+ printf("cerr=%d pid=%d stat=%s\n", EHCI_QTD_GET_CERR(s),
EHCI_QTD_GET_PID(s), sbuf);
for (s = 0; s < 5; s++)
printf(" buffer[%d]=0x%08x\n", s, le32toh(qtd->qtd_buffer[s]));
CVS commit: [netbsd-6] src/sys
Module Name:src Committed By: bouyer Date: Mon Nov 25 08:23:32 UTC 2013 Modified Files: src/sys/arch/x86/acpi [netbsd-6]: acpi_cpu_md.c src/sys/dev/acpi [netbsd-6]: acpi_cpu_tstate.c Log Message: Pull up following revision(s) (requested by jruoho in ticket #987): sys/arch/x86/acpi/acpi_cpu_md.c: revision 1.74 sys/dev/acpi/acpi_cpu_tstate.c: revision 1.32 As discussed with bouyer@, fix a too eager T-state validation check to accomodate new Intel CPUs. Allow 4-bit range for MSR_THERM_CONTROL. To generate a diff of this commit: cvs rdiff -u -r1.71.2.1 -r1.71.2.2 src/sys/arch/x86/acpi/acpi_cpu_md.c cvs rdiff -u -r1.30 -r1.30.8.1 src/sys/dev/acpi/acpi_cpu_tstate.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/x86/acpi/acpi_cpu_md.c diff -u src/sys/arch/x86/acpi/acpi_cpu_md.c:1.71.2.1 src/sys/arch/x86/acpi/acpi_cpu_md.c:1.71.2.2 --- src/sys/arch/x86/acpi/acpi_cpu_md.c:1.71.2.1 Thu Dec 13 23:41:57 2012 +++ src/sys/arch/x86/acpi/acpi_cpu_md.c Mon Nov 25 08:23:31 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_cpu_md.c,v 1.71.2.1 2012/12/13 23:41:57 riz Exp $ */ +/* $NetBSD: acpi_cpu_md.c,v 1.71.2.2 2013/11/25 08:23:31 bouyer Exp $ */ /*- * Copyright (c) 2010, 2011 Jukka Ruohonen @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.71.2.1 2012/12/13 23:41:57 riz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.71.2.2 2013/11/25 08:23:31 bouyer Exp $"); #include #include @@ -992,7 +992,7 @@ acpicpu_md_tstate_set(struct acpicpu_tst uint8_t i; val = ts->ts_control; - val = val & __BITS(1, 4); + val = val & __BITS(0, 4); wrmsr(MSR_THERM_CONTROL, val); Index: src/sys/dev/acpi/acpi_cpu_tstate.c diff -u src/sys/dev/acpi/acpi_cpu_tstate.c:1.30 src/sys/dev/acpi/acpi_cpu_tstate.c:1.30.8.1 --- src/sys/dev/acpi/acpi_cpu_tstate.c:1.30 Wed Jun 22 08:49:54 2011 +++ src/sys/dev/acpi/acpi_cpu_tstate.c Mon Nov 25 08:23:31 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_cpu_tstate.c,v 1.30 2011/06/22 08:49:54 jruoho Exp $ */ +/* $NetBSD: acpi_cpu_tstate.c,v 1.30.8.1 2013/11/25 08:23:31 bouyer Exp $ */ /*- * Copyright (c) 2010 Jukka Ruohonen @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_tstate.c,v 1.30 2011/06/22 08:49:54 jruoho Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_tstate.c,v 1.30.8.1 2013/11/25 08:23:31 bouyer Exp $"); #include #include @@ -334,9 +334,14 @@ acpicpu_tstate_tss_add(struct acpicpu_ts *p = val[i]; /* - * The minimum should be around 100 / 8 = 12.5 %. + * The minimum should be either 12.5 % or 6.5 %, + * the latter 4-bit dynamic range being available + * in some newer models; see Section 14.5.3.1 in + * + * Intel 64 and IA-32 Architectures Software + * Developer's Manual. Volume 3B, Part 2. 2013. */ -if (ts->ts_percent < 10 || ts->ts_percent > 100) +if (ts->ts_percent < 6 || ts->ts_percent > 100) return AE_BAD_DECIMAL_CONSTANT; if (ts->ts_latency == 0 || ts->ts_latency > 1000)
CVS commit: [netbsd-6] src/sys/kern
Module Name:src Committed By: bouyer Date: Mon Nov 25 08:26:33 UTC 2013 Modified Files: src/sys/kern [netbsd-6]: uipc_socket.c Log Message: Pull up following revision(s) (requested by spz in ticket #988): sys/kern/uipc_socket.c: revision 1.220 PR/48098: Brian Marcotte: panic: kernel diagnostic assertion "cred != NULL": Fix from Michael van Elst, tcpdrop crashes kernel on ebryonic connections. To generate a diff of this commit: cvs rdiff -u -r1.209.2.3 -r1.209.2.4 src/sys/kern/uipc_socket.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/kern/uipc_socket.c diff -u src/sys/kern/uipc_socket.c:1.209.2.3 src/sys/kern/uipc_socket.c:1.209.2.4 --- src/sys/kern/uipc_socket.c:1.209.2.3 Fri Aug 2 20:12:30 2013 +++ src/sys/kern/uipc_socket.c Mon Nov 25 08:26:33 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.209.2.3 2013/08/02 20:12:30 martin Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.209.2.4 2013/11/25 08:26:33 bouyer Exp $ */ /*- * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -63,7 +63,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.209.2.3 2013/08/02 20:12:30 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.209.2.4 2013/11/25 08:26:33 bouyer Exp $"); #include "opt_compat_netbsd.h" #include "opt_sock_counters.h" @@ -416,7 +416,7 @@ socket_listener_cb(kauth_cred_t cred, ka /* Normal users can only drop their own connections. */ struct socket *so = (struct socket *)arg1; - if (proc_uidmatch(cred, so->so_cred) == 0) + if (so->so_cred && proc_uidmatch(cred, so->so_cred) == 0) result = KAUTH_RESULT_ALLOW; break;
CVS commit: [netbsd-6-0] src/sys/kern
Module Name:src Committed By: bouyer Date: Mon Nov 25 08:27:01 UTC 2013 Modified Files: src/sys/kern [netbsd-6-0]: uipc_socket.c Log Message: Pull up following revision(s) (requested by spz in ticket #988): sys/kern/uipc_socket.c: revision 1.220 PR/48098: Brian Marcotte: panic: kernel diagnostic assertion "cred != NULL": Fix from Michael van Elst, tcpdrop crashes kernel on ebryonic connections. To generate a diff of this commit: cvs rdiff -u -r1.209.2.1.4.1 -r1.209.2.1.4.2 src/sys/kern/uipc_socket.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/kern/uipc_socket.c diff -u src/sys/kern/uipc_socket.c:1.209.2.1.4.1 src/sys/kern/uipc_socket.c:1.209.2.1.4.2 --- src/sys/kern/uipc_socket.c:1.209.2.1.4.1 Fri Aug 2 20:23:11 2013 +++ src/sys/kern/uipc_socket.c Mon Nov 25 08:27:01 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.209.2.1.4.1 2013/08/02 20:23:11 martin Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.209.2.1.4.2 2013/11/25 08:27:01 bouyer Exp $ */ /*- * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -63,7 +63,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.209.2.1.4.1 2013/08/02 20:23:11 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.209.2.1.4.2 2013/11/25 08:27:01 bouyer Exp $"); #include "opt_compat_netbsd.h" #include "opt_sock_counters.h" @@ -416,7 +416,7 @@ socket_listener_cb(kauth_cred_t cred, ka /* Normal users can only drop their own connections. */ struct socket *so = (struct socket *)arg1; - if (proc_uidmatch(cred, so->so_cred) == 0) + if (so->so_cred && proc_uidmatch(cred, so->so_cred) == 0) result = KAUTH_RESULT_ALLOW; break;
CVS commit: [netbsd-6-1] src/sys/kern
Module Name:src Committed By: bouyer Date: Mon Nov 25 08:27:06 UTC 2013 Modified Files: src/sys/kern [netbsd-6-1]: uipc_socket.c Log Message: Pull up following revision(s) (requested by spz in ticket #988): sys/kern/uipc_socket.c: revision 1.220 PR/48098: Brian Marcotte: panic: kernel diagnostic assertion "cred != NULL": Fix from Michael van Elst, tcpdrop crashes kernel on ebryonic connections. To generate a diff of this commit: cvs rdiff -u -r1.209.2.2.2.1 -r1.209.2.2.2.2 src/sys/kern/uipc_socket.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/kern/uipc_socket.c diff -u src/sys/kern/uipc_socket.c:1.209.2.2.2.1 src/sys/kern/uipc_socket.c:1.209.2.2.2.2 --- src/sys/kern/uipc_socket.c:1.209.2.2.2.1 Fri Aug 2 20:18:48 2013 +++ src/sys/kern/uipc_socket.c Mon Nov 25 08:27:06 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.209.2.2.2.1 2013/08/02 20:18:48 martin Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.209.2.2.2.2 2013/11/25 08:27:06 bouyer Exp $ */ /*- * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -63,7 +63,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.209.2.2.2.1 2013/08/02 20:18:48 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.209.2.2.2.2 2013/11/25 08:27:06 bouyer Exp $"); #include "opt_compat_netbsd.h" #include "opt_sock_counters.h" @@ -416,7 +416,7 @@ socket_listener_cb(kauth_cred_t cred, ka /* Normal users can only drop their own connections. */ struct socket *so = (struct socket *)arg1; - if (proc_uidmatch(cred, so->so_cred) == 0) + if (so->so_cred && proc_uidmatch(cred, so->so_cred) == 0) result = KAUTH_RESULT_ALLOW; break;
CVS commit: [netbsd-6] src/sys/uvm
Module Name:src
Committed By: bouyer
Date: Mon Nov 25 08:29:58 UTC 2013
Modified Files:
src/sys/uvm [netbsd-6]: uvm_km.c
Log Message:
Pull up following revision(s) (requested by para in ticket #989):
sys/uvm/uvm_km.c: revision 1.125
uvm_km_kmem_alloc: don't hardcode kmem_va_arena
To generate a diff of this commit:
cvs rdiff -u -r1.120.2.3 -r1.120.2.4 src/sys/uvm/uvm_km.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/uvm/uvm_km.c
diff -u src/sys/uvm/uvm_km.c:1.120.2.3 src/sys/uvm/uvm_km.c:1.120.2.4
--- src/sys/uvm/uvm_km.c:1.120.2.3 Fri Sep 7 22:17:34 2012
+++ src/sys/uvm/uvm_km.c Mon Nov 25 08:29:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_km.c,v 1.120.2.3 2012/09/07 22:17:34 riz Exp $ */
+/* $NetBSD: uvm_km.c,v 1.120.2.4 2013/11/25 08:29:58 bouyer Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -120,7 +120,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.120.2.3 2012/09/07 22:17:34 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.120.2.4 2013/11/25 08:29:58 bouyer Exp $");
#include "opt_uvmhist.h"
@@ -787,7 +787,7 @@ again:
} else {
uvm_km_pgremove_intrsafe(kernel_map, va,
va + size);
-vmem_free(kmem_va_arena, va, size);
+vmem_free(vm, va, size);
return ENOMEM;
}
}
CVS commit: [netbsd-6-0] src/sys/uvm
Module Name:src
Committed By: bouyer
Date: Mon Nov 25 08:30:20 UTC 2013
Modified Files:
src/sys/uvm [netbsd-6-0]: uvm_km.c
Log Message:
Pull up following revision(s) (requested by para in ticket #989):
sys/uvm/uvm_km.c: revision 1.125
uvm_km_kmem_alloc: don't hardcode kmem_va_arena
To generate a diff of this commit:
cvs rdiff -u -r1.120.2.3 -r1.120.2.3.2.1 src/sys/uvm/uvm_km.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/uvm/uvm_km.c
diff -u src/sys/uvm/uvm_km.c:1.120.2.3 src/sys/uvm/uvm_km.c:1.120.2.3.2.1
--- src/sys/uvm/uvm_km.c:1.120.2.3 Fri Sep 7 22:17:34 2012
+++ src/sys/uvm/uvm_km.c Mon Nov 25 08:30:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_km.c,v 1.120.2.3 2012/09/07 22:17:34 riz Exp $ */
+/* $NetBSD: uvm_km.c,v 1.120.2.3.2.1 2013/11/25 08:30:20 bouyer Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -120,7 +120,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.120.2.3 2012/09/07 22:17:34 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.120.2.3.2.1 2013/11/25 08:30:20 bouyer Exp $");
#include "opt_uvmhist.h"
@@ -787,7 +787,7 @@ again:
} else {
uvm_km_pgremove_intrsafe(kernel_map, va,
va + size);
-vmem_free(kmem_va_arena, va, size);
+vmem_free(vm, va, size);
return ENOMEM;
}
}
CVS commit: [netbsd-6-1] src/sys/uvm
Module Name:src
Committed By: bouyer
Date: Mon Nov 25 08:30:24 UTC 2013
Modified Files:
src/sys/uvm [netbsd-6-1]: uvm_km.c
Log Message:
Pull up following revision(s) (requested by para in ticket #989):
sys/uvm/uvm_km.c: revision 1.125
uvm_km_kmem_alloc: don't hardcode kmem_va_arena
To generate a diff of this commit:
cvs rdiff -u -r1.120.2.3 -r1.120.2.3.4.1 src/sys/uvm/uvm_km.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/uvm/uvm_km.c
diff -u src/sys/uvm/uvm_km.c:1.120.2.3 src/sys/uvm/uvm_km.c:1.120.2.3.4.1
--- src/sys/uvm/uvm_km.c:1.120.2.3 Fri Sep 7 22:17:34 2012
+++ src/sys/uvm/uvm_km.c Mon Nov 25 08:30:24 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_km.c,v 1.120.2.3 2012/09/07 22:17:34 riz Exp $ */
+/* $NetBSD: uvm_km.c,v 1.120.2.3.4.1 2013/11/25 08:30:24 bouyer Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -120,7 +120,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.120.2.3 2012/09/07 22:17:34 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.120.2.3.4.1 2013/11/25 08:30:24 bouyer Exp $");
#include "opt_uvmhist.h"
@@ -787,7 +787,7 @@ again:
} else {
uvm_km_pgremove_intrsafe(kernel_map, va,
va + size);
-vmem_free(kmem_va_arena, va, size);
+vmem_free(vm, va, size);
return ENOMEM;
}
}
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: bouyer Date: Mon Nov 25 08:31:24 UTC 2013 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.3 Log Message: tickets 988 989 To generate a diff of this commit: cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/doc/CHANGES-6.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1.3 diff -u src/doc/CHANGES-6.1.3:1.1.2.5 src/doc/CHANGES-6.1.3:1.1.2.6 --- src/doc/CHANGES-6.1.3:1.1.2.5 Sun Nov 17 19:23:04 2013 +++ src/doc/CHANGES-6.1.3 Mon Nov 25 08:31:24 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.3,v 1.1.2.5 2013/11/17 19:23:04 bouyer Exp $ +# $NetBSD: CHANGES-6.1.3,v 1.1.2.6 2013/11/25 08:31:24 bouyer Exp $ A complete list of changes from the NetBSD 6.1.1 release to the NetBSD 6.1.2 release: @@ -76,3 +76,17 @@ sys/net/npf/npf_instr.cpatch fix the byteorder for port range comparison [rmind, ticket #986] +sys/kern/uipc_socket.c1.220 + + PR/48098: Brian Marcotte: + panic: kernel diagnostic assertion "cred != NULL": + Fix from Michael van Elst, tcpdrop crashes kernel on + ebryonic connections. + [spz, ticket #988] + +sys/uvm/uvm_km.c1.125 + + uvm_km_kmem_alloc: don't hardcode kmem_va_arena. This could lead to + freeing to the wrong vmem arena in case of failed page allocations. + [para, ticket #989] +
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: bouyer Date: Mon Nov 25 08:31:28 UTC 2013 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.4 Log Message: tickets 988 989 To generate a diff of this commit: cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/doc/CHANGES-6.0.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0.4 diff -u src/doc/CHANGES-6.0.4:1.1.2.5 src/doc/CHANGES-6.0.4:1.1.2.6 --- src/doc/CHANGES-6.0.4:1.1.2.5 Sun Nov 17 19:23:19 2013 +++ src/doc/CHANGES-6.0.4 Mon Nov 25 08:31:28 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.4,v 1.1.2.5 2013/11/17 19:23:19 bouyer Exp $ +# $NetBSD: CHANGES-6.0.4,v 1.1.2.6 2013/11/25 08:31:28 bouyer Exp $ A complete list of changes from the NetBSD 6.0.3 release to the NetBSD 6.0.4 release: @@ -68,3 +68,17 @@ sys/net/npf/npf_instr.cpatch fix the byteorder for port range comparison [rmind, ticket #986] +sys/kern/uipc_socket.c1.220 + + PR/48098: Brian Marcotte: + panic: kernel diagnostic assertion "cred != NULL": + Fix from Michael van Elst, tcpdrop crashes kernel on + ebryonic connections. + [spz, ticket #988] + +sys/uvm/uvm_km.c1.125 + + uvm_km_kmem_alloc: don't hardcode kmem_va_arena. This could lead to + freeing to the wrong vmem arena in case of failed page allocations. + [para, ticket #989] +
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: bouyer Date: Mon Nov 25 08:31:57 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: tickets 987 988 989 To generate a diff of this commit: cvs rdiff -u -r1.1.2.60 -r1.1.2.61 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.60 src/doc/CHANGES-6.2:1.1.2.61 --- src/doc/CHANGES-6.2:1.1.2.60 Sun Nov 17 19:23:06 2013 +++ src/doc/CHANGES-6.2 Mon Nov 25 08:31:57 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.60 2013/11/17 19:23:06 bouyer Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.61 2013/11/25 08:31:57 bouyer Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -1019,3 +1019,24 @@ sys/net/npf/npf_instr.cpatch fix the byteorder for port range comparison [rmind, ticket #986] +sys/arch/x86/acpi/acpi_cpu_md.c 1.74 +sys/dev/acpi/acpi_cpu_tstate.c 1.32 + + Fix a too eager T-state validation check to accomodate new Intel CPUs. + Allow 4-bit range for MSR_THERM_CONTROL. + [jruoho, ticket #987] + +sys/kern/uipc_socket.c1.220 + + PR/48098: Brian Marcotte: + panic: kernel diagnostic assertion "cred != NULL": + Fix from Michael van Elst, tcpdrop crashes kernel on + ebryonic connections. + [spz, ticket #988] + +sys/uvm/uvm_km.c1.125 + + uvm_km_kmem_alloc: don't hardcode kmem_va_arena. This could lead to + freeing to the wrong vmem arena in case of failed page allocations. + [para, ticket #989] +
CVS commit: src/sys/kern
Module Name:src
Committed By: rmind
Date: Mon Nov 25 16:28:21 UTC 2013
Modified Files:
src/sys/kern: kern_prot.c
Log Message:
do_setresuid: add an assert.
To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/sys/kern/kern_prot.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/kern/kern_prot.c
diff -u src/sys/kern/kern_prot.c:1.116 src/sys/kern/kern_prot.c:1.117
--- src/sys/kern/kern_prot.c:1.116 Sat Jun 9 02:55:32 2012
+++ src/sys/kern/kern_prot.c Mon Nov 25 16:28:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_prot.c,v 1.116 2012/06/09 02:55:32 christos Exp $ */
+/* $NetBSD: kern_prot.c,v 1.117 2013/11/25 16:28:20 rmind Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1990, 1991, 1993
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_prot.c,v 1.116 2012/06/09 02:55:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_prot.c,v 1.117 2013/11/25 16:28:20 rmind Exp $");
#include "opt_compat_43.h"
@@ -343,12 +343,15 @@ do_setresuid(struct lwp *l, uid_t r, uid
kauth_cred_clone(cred, ncred);
if (r != -1 && r != kauth_cred_getuid(ncred)) {
- /* Update count of processes for this user */
+ u_long nlwps;
+
+ /* Update count of processes for this user. */
(void)chgproccnt(kauth_cred_getuid(ncred), -1);
(void)chgproccnt(r, 1);
- /* The first lwp of a process is not counted */
- int nlwps = p->p_nlwps - 1;
+ /* The first LWP of a process is excluded. */
+ KASSERT(mutex_owned(p->p_lock));
+ nlwps = p->p_nlwps - 1;
(void)chglwpcnt(kauth_cred_getuid(ncred), -nlwps);
(void)chglwpcnt(r, nlwps);
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Mon Nov 25 16:29:25 UTC 2013 Modified Files: src/sys/kern: kern_lwp.c Log Message: Use the process credentials instead of the lwp credentials because if the process just did a setuid() call, the lwp might not have had a chance to refresh l->l_cred (still has LPR_CRMOD), and we don't want to bother spending time syncing the creds of a dying lwp. Should fix the problem with hald people have been observing. To generate a diff of this commit: cvs rdiff -u -r1.176 -r1.177 src/sys/kern/kern_lwp.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/kern/kern_lwp.c diff -u src/sys/kern/kern_lwp.c:1.176 src/sys/kern/kern_lwp.c:1.177 --- src/sys/kern/kern_lwp.c:1.176 Fri Nov 22 16:04:11 2013 +++ src/sys/kern/kern_lwp.c Mon Nov 25 11:29:25 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_lwp.c,v 1.176 2013/11/22 21:04:11 christos Exp $ */ +/* $NetBSD: kern_lwp.c,v 1.177 2013/11/25 16:29:25 christos Exp $ */ /*- * Copyright (c) 2001, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -211,7 +211,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.176 2013/11/22 21:04:11 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.177 2013/11/25 16:29:25 christos Exp $"); #include "opt_ddb.h" #include "opt_lockdebug.h" @@ -1174,8 +1174,14 @@ lwp_free(struct lwp *l, bool recycle, bo KASSERT(l != curlwp); KASSERT(last || mutex_owned(p->p_lock)); + /* + * We use the process credentials instead of the lwp credentials here + * because the lwp credentials maybe cached (just after a setuid call) + * and we don't want pay for syncing, since the lwp is going away + * anyway + */ if (p != &proc0 && p->p_nlwps != 1) - (void)chglwpcnt(kauth_cred_getuid(l->l_cred), -1); + (void)chglwpcnt(kauth_cred_getuid(p->p_cred), -1); /* * If this was not the last LWP in the process, then adjust * counters and unlock.
CVS commit: src/external/cddl/osnet/sys/kern
Module Name:src
Committed By: christos
Date: Mon Nov 25 22:48:05 UTC 2013
Modified Files:
src/external/cddl/osnet/sys/kern: vfs.c
Log Message:
fix one more mountlist instant
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/kern/vfs.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/sys/kern/vfs.c
diff -u src/external/cddl/osnet/sys/kern/vfs.c:1.4 src/external/cddl/osnet/sys/kern/vfs.c:1.5
--- src/external/cddl/osnet/sys/kern/vfs.c:1.4 Sat Apr 2 00:57:35 2011
+++ src/external/cddl/osnet/sys/kern/vfs.c Mon Nov 25 17:48:05 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs.c,v 1.4 2011/04/02 04:57:35 rmind Exp $ */
+/* $NetBSD: vfs.c,v 1.5 2013/11/25 22:48:05 christos Exp $ */
/*-
* Copyright (c) 2006-2007 Pawel Jakub Dawidek
@@ -324,9 +324,7 @@ domount(kthread_t *td, vnode_t *vp, cons
vp->v_iflag &= ~VI_MOUNT;
simple_unlock(&vp->v_interlock);
vp->v_mountedhere = mp;
- mutex_enter(&mountlist_lock);
- CIRCLEQ_INSERT_TAIL(&mountlist, mp, mnt_list);
- mutex_exit(&mountlist_lock);
+ mountlist_append(mp);
vfs_event_signal(NULL, VQ_MOUNT, 0);
if (VFS_ROOT(mp, LK_EXCLUSIVE, &mvp, td))
panic("mount: lost mount");
CVS commit: src/external/bsd/nvi/dist/dist
Module Name:src
Committed By: christos
Date: Mon Nov 25 23:03:18 UTC 2013
Modified Files:
src/external/bsd/nvi/dist/dist: configure.ac
Log Message:
make configure.ac work with recent versions of autoconf
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nvi/dist/dist/configure.ac
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/nvi/dist/dist/configure.ac
diff -u src/external/bsd/nvi/dist/dist/configure.ac:1.1 src/external/bsd/nvi/dist/dist/configure.ac:1.2
--- src/external/bsd/nvi/dist/dist/configure.ac:1.1 Mon Nov 25 18:02:44 2013
+++ src/external/bsd/nvi/dist/dist/configure.ac Mon Nov 25 18:03:18 2013
@@ -1,10 +1,12 @@
-dnl $Id: configure.ac,v 1.1 2013/11/25 23:02:44 christos Exp $
+dnl $Id: configure.ac,v 1.2 2013/11/25 23:03:18 christos Exp $
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(../common/main.c)
+AC_INIT([vi], [1.81.6])
+AC_CONFIG_SRCDIR([../common/main.c])
AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE(vi, 1.81.6)
+AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h)
+AC_CONFIG_MACRO_DIR([m4])
dnl Configure setup.
AC_PROG_INSTALL()
@@ -78,6 +80,7 @@ AC_SUBST(CC)
CC=${CC-cc}
CFLAGS=${CFLAGS-""}
AC_PROG_CC
+AM_PROG_CC_C_O
if test "$GCC" = yes; then
AC_DEFINE(HAVE_GCC, 1, [Define if you have gcc.])
@@ -596,15 +599,14 @@ AC_TYPE_PID_T
AC_TYPE_SIZE_T
AC_STRUCT_TM
-AC_CHECK_HEADER(sys/cdefs.h, [],
- [AC_CONFIG_FILES([sys/cdefs.h:../db.1.85/PORT/include/cdefs.h])])
+dnl AC_CHECK_HEADER(sys/cdefs.h, [], [AC_CONFIG_FILES([sys/cdefs.h:../db.1.85/PORT/include/cdefs.h])])
dnl Checks for library functions.
VI_CV_REPLACE_FUNCS(bsearch gethostname memchr memset)
VI_CV_REPLACE_FUNCS(mkstemp mmap strdup strpbrk)
VI_CV_REPLACE_FUNCS(snprintf vsnprintf)
-AC_CHECK_FUNCS(select)
+AC_CHECK_FUNCS(select memcpy)
AC_CHECK_FUNCS(setenv, [need_env=no], [need_env=yes])
AC_CHECK_FUNCS(strsep, [need_strsep=no], [need_strsep=yes])
AC_CHECK_FUNCS(unsetenv,, [need_env=yes])
CVS commit: src/external/bsd/nvi/usr.bin/nvi
Module Name:src Committed By: christos Date: Mon Nov 25 23:04:40 UTC 2013 Modified Files: src/external/bsd/nvi/usr.bin/nvi: config.h Log Message: fix SSP build To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nvi/usr.bin/nvi/config.h 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/nvi/usr.bin/nvi/config.h diff -u src/external/bsd/nvi/usr.bin/nvi/config.h:1.1 src/external/bsd/nvi/usr.bin/nvi/config.h:1.2 --- src/external/bsd/nvi/usr.bin/nvi/config.h:1.1 Fri Nov 22 11:00:45 2013 +++ src/external/bsd/nvi/usr.bin/nvi/config.h Mon Nov 25 18:04:39 2013 @@ -79,6 +79,9 @@ /* Define to 1 if you have the `memchr' function. */ #define HAVE_MEMCHR 1 +/* Define to 1 if you have the `memcpy' function. */ +#define HAVE_MEMCPY 1 + /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1
CVS commit: src/sys
Module Name:src
Committed By: alnsn
Date: Mon Nov 25 23:53:45 UTC 2013
Modified Files:
src/sys/arch/powerpc/include: sljitarch.h
src/sys/external/bsd/sljit/dist/sljit_src: sljitNativePPC_common.c
Log Message:
Use __syncicache() in sljit on powerpc.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/powerpc/include/sljitarch.h
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/sys/external/bsd/sljit/dist/sljit_src/sljitNativePPC_common.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/powerpc/include/sljitarch.h
diff -u src/sys/arch/powerpc/include/sljitarch.h:1.1 src/sys/arch/powerpc/include/sljitarch.h:1.2
--- src/sys/arch/powerpc/include/sljitarch.h:1.1 Sun Nov 17 14:34:12 2013
+++ src/sys/arch/powerpc/include/sljitarch.h Mon Nov 25 23:53:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sljitarch.h,v 1.1 2013/11/17 14:34:12 alnsn Exp $ */
+/* $NetBSD: sljitarch.h,v 1.2 2013/11/25 23:53:44 alnsn Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -29,6 +29,9 @@
#ifndef _POWERPC_SLJITARCH_H
#define _POWERPC_SLJITARCH_H
+#include
+#include
+
#if defined(_LP64)
#define SLJIT_CONFIG_PPC_64 1
#else
@@ -36,6 +39,6 @@
#endif
#define SLJIT_CACHE_FLUSH(from, to) \
- ppc_cache_flush((from), (to))
+ __syncicache((from), (to)-(from))
#endif
Index: src/sys/external/bsd/sljit/dist/sljit_src/sljitNativePPC_common.c
diff -u src/sys/external/bsd/sljit/dist/sljit_src/sljitNativePPC_common.c:1.1.1.3 src/sys/external/bsd/sljit/dist/sljit_src/sljitNativePPC_common.c:1.2
--- src/sys/external/bsd/sljit/dist/sljit_src/sljitNativePPC_common.c:1.1.1.3 Sun Oct 28 09:36:22 2012
+++ src/sys/external/bsd/sljit/dist/sljit_src/sljitNativePPC_common.c Mon Nov 25 23:53:44 2013
@@ -37,47 +37,6 @@ typedef sljit_ui sljit_ins;
#include
#endif
-static void ppc_cache_flush(sljit_ins *from, sljit_ins *to)
-{
-#ifdef _AIX
- _sync_cache_range((caddr_t)from, (int)((size_t)to - (size_t)from));
-#elif defined(__GNUC__) || (defined(__IBM_GCC_ASM) && __IBM_GCC_ASM)
-# if defined(_ARCH_PWR) || defined(_ARCH_PWR2)
- /* Cache flush for POWER architecture. */
- while (from < to) {
- __asm__ volatile (
- "clf 0, %0\n"
- "dcs\n"
- : : "r"(from)
- );
- from++;
- }
- __asm__ volatile ( "ics" );
-# elif defined(_ARCH_COM) && !defined(_ARCH_PPC)
-# error "Cache flush is not implemented for PowerPC/POWER common mode."
-# else
- /* Cache flush for PowerPC architecture. */
- while (from < to) {
- __asm__ volatile (
- "dcbf 0, %0\n"
- "sync\n"
- "icbi 0, %0\n"
- : : "r"(from)
- );
- from++;
- }
- __asm__ volatile ( "isync" );
-# endif
-# ifdef __xlc__
-# warning "This file may fail to compile if -qfuncsect is used"
-# endif
-#elif defined(__xlc__)
-#error "Please enable GCC syntax for inline assembly statements with -qasm=gcc"
-#else
-#error "This platform requires a cache flush implementation."
-#endif /* _AIX */
-}
-
#define TMP_REG1 (SLJIT_NO_REGISTERS + 1)
#define TMP_REG2 (SLJIT_NO_REGISTERS + 2)
#define TMP_REG3 (SLJIT_NO_REGISTERS + 3)
