Source-Changes-HG archive

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

[src/trunk]: src/sys/net Use kmem_intr_alloc instead of kmem_alloc



details:   https://anonhg.NetBSD.org/src/rev/445ff30e9509
branches:  trunk
changeset: 820136:445ff30e9509
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Sat Dec 31 15:07:02 2016 +0000

description:
Use kmem_intr_alloc instead of kmem_alloc

ether_addmulti still can be called in softint.

Fix PR kern/51755

diffstat:

 sys/net/if_ethersubr.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 80af80089b35 -r 445ff30e9509 sys/net/if_ethersubr.c
--- a/sys/net/if_ethersubr.c    Sat Dec 31 13:50:16 2016 +0000
+++ b/sys/net/if_ethersubr.c    Sat Dec 31 15:07:02 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ethersubr.c,v 1.231 2016/12/28 07:32:16 ozaki-r Exp $       */
+/*     $NetBSD: if_ethersubr.c,v 1.232 2016/12/31 15:07:02 ozaki-r Exp $       */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.231 2016/12/28 07:32:16 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.232 2016/12/31 15:07:02 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1236,7 +1236,8 @@
        int s, error = 0;
 
        /* Allocate out of lock */
-       enm = kmem_alloc(sizeof(*enm), KM_SLEEP);
+       /* XXX still can be called in softint */
+       enm = kmem_intr_alloc(sizeof(*enm), KM_SLEEP);
        if (enm == NULL)
                return ENOBUFS;
 



Home | Main Index | Thread Index | Old Index