Module Name: src
Committed By: christos
Date: Mon Feb 9 20:46:55 UTC 2015
Modified Files:
src/sys/kern: kern_timeout.c
Log Message:
don't compare user and kernel addresses
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/kern/kern_timeout.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_timeout.c
diff -u src/sys/kern/kern_timeout.c:1.49 src/sys/kern/kern_timeout.c:1.50
--- src/sys/kern/kern_timeout.c:1.49 Sun Feb 8 14:41:00 2015
+++ src/sys/kern/kern_timeout.c Mon Feb 9 15:46:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_timeout.c,v 1.49 2015/02/08 19:41:00 christos Exp $ */
+/* $NetBSD: kern_timeout.c,v 1.50 2015/02/09 20:46:55 christos Exp $ */
/*-
* Copyright (c) 2003, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_timeout.c,v 1.49 2015/02/08 19:41:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_timeout.c,v 1.50 2015/02/09 20:46:55 christos Exp $");
/*
* Timeouts are kept in a hierarchical timing wheel. The c_time is the
@@ -777,12 +777,11 @@ db_show_callout_bucket(struct callout_cp
cc = &cci;
db_read_bytes((db_addr_t)bucket, sizeof(bi), (char *)&bi);
- bucket = &bi;
- if (CIRCQ_EMPTY(bucket))
+ if (CIRCQ_EMPTY(&bi))
return;
- for (c = CIRCQ_FIRST(bucket); /*nothing*/; c = CIRCQ_NEXT(&c->c_list)) {
+ for (c = CIRCQ_FIRST(&bi); /*nothing*/; c = CIRCQ_NEXT(&c->c_list)) {
db_read_bytes((db_addr_t)c, sizeof(ci), (char *)&ci);
c = &ci;
db_find_sym_and_offset((db_addr_t)(intptr_t)c->c_func, &name,
