Source-Changes-HG archive

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

[src/trunk]: src/sys/kern Revert previous; s/kmem(9)/uvm_km(9)/ and comment w...



details:   https://anonhg.NetBSD.org/src/rev/5400191ce8b0
branches:  trunk
changeset: 767806:5400191ce8b0
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Sun Jul 31 13:41:30 2011 +0000

description:
Revert previous; s/kmem(9)/uvm_km(9)/ and comment why done so.  Per request
from rmind@.

diffstat:

 sys/kern/kern_softint.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r e3ccda817988 -r 5400191ce8b0 sys/kern/kern_softint.c
--- a/sys/kern/kern_softint.c   Sun Jul 31 10:05:03 2011 +0000
+++ b/sys/kern/kern_softint.c   Sun Jul 31 13:41:30 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_softint.c,v 1.36 2011/07/30 05:24:16 uebayasi Exp $       */
+/*     $NetBSD: kern_softint.c,v 1.37 2011/07/31 13:41:30 uebayasi Exp $       */
 
 /*-
  * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@@ -176,7 +176,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_softint.c,v 1.36 2011/07/30 05:24:16 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_softint.c,v 1.37 2011/07/31 13:41:30 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -186,7 +186,6 @@
 #include <sys/evcnt.h>
 #include <sys/cpu.h>
 #include <sys/xcall.h>
-#include <sys/kmem.h>
 
 #include <net/netisr.h>
 
@@ -263,6 +262,7 @@
        si->si_lwp->l_private = si;
        softint_init_md(si->si_lwp, level, &si->si_machdep);
 }
+
 /*
  * softint_init:
  *
@@ -284,7 +284,9 @@
                    sizeof(softhand_t);
        }
 
-       sc = kmem_zalloc(softint_bytes, KM_SLEEP);
+       /* Use uvm_km(9) for persistent, page-aligned allocation. */
+       sc = (softcpu_t *)uvm_km_alloc(kernel_map, softint_bytes, 0,
+           UVM_KMF_WIRED | UVM_KMF_ZERO);
        if (sc == NULL)
                panic("softint_init_cpu: cannot allocate memory");
 



Home | Main Index | Thread Index | Old Index