Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/kern don't compare user and kernel addresses



details:   https://anonhg.NetBSD.org/src/rev/dc895a9c7480
branches:  trunk
changeset: 336070:dc895a9c7480
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Feb 09 20:46:55 2015 +0000

description:
don't compare user and kernel addresses

diffstat:

 sys/kern/kern_timeout.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (33 lines):

diff -r 0b171bd4a910 -r dc895a9c7480 sys/kern/kern_timeout.c
--- a/sys/kern/kern_timeout.c   Mon Feb 09 20:41:01 2015 +0000
+++ b/sys/kern/kern_timeout.c   Mon Feb 09 20:46:55 2015 +0000
@@ -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 @@
        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,



Home | Main Index | Thread Index | Old Index