Source-Changes-HG archive

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

[src/trunk]: src/sys kmem_intr_free kmem_intr_[z]alloced memory



details:   https://anonhg.NetBSD.org/src/rev/b4ff5c3b4a59
branches:  trunk
changeset: 825580:b4ff5c3b4a59
user:      para <para%NetBSD.org@localhost>
date:      Sun Jul 23 10:55:00 2017 +0000

description:
kmem_intr_free kmem_intr_[z]alloced memory

the underlying pools are the same but api-wise those should match

diffstat:

 sys/dev/pci/if_iwm.c    |   6 +++---
 sys/net/if_ethersubr.c  |  10 +++++-----
 sys/netinet/ip_mroute.c |  10 +++++-----
 sys/netinet/ip_output.c |   8 ++++----
 4 files changed, 17 insertions(+), 17 deletions(-)

diffs (153 lines):

diff -r 89f24eb24842 -r b4ff5c3b4a59 sys/dev/pci/if_iwm.c
--- a/sys/dev/pci/if_iwm.c      Sun Jul 23 10:16:08 2017 +0000
+++ b/sys/dev/pci/if_iwm.c      Sun Jul 23 10:55:00 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_iwm.c,v 1.74 2017/06/09 04:48:58 nonaka Exp $       */
+/*     $NetBSD: if_iwm.c,v 1.75 2017/07/23 10:55:00 para Exp $ */
 /*     OpenBSD: if_iwm.c,v 1.148 2016/11/19 21:07:08 stsp Exp  */
 #define IEEE80211_NO_HT
 /*
@@ -106,7 +106,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.74 2017/06/09 04:48:58 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.75 2017/07/23 10:55:00 para Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -6321,7 +6321,7 @@
        int arg = iwmns->ns_arg;
        int s;
 
-       kmem_free(iwmns, sizeof(*iwmns));
+       kmem_intr_free(iwmns, sizeof(*iwmns));
 
        s = splnet();
 
diff -r 89f24eb24842 -r b4ff5c3b4a59 sys/net/if_ethersubr.c
--- a/sys/net/if_ethersubr.c    Sun Jul 23 10:16:08 2017 +0000
+++ b/sys/net/if_ethersubr.c    Sun Jul 23 10:55:00 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ethersubr.c,v 1.242 2017/04/06 03:54:59 ozaki-r Exp $       */
+/*     $NetBSD: if_ethersubr.c,v 1.243 2017/07/23 10:55:00 para 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.242 2017/04/06 03:54:59 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.243 2017/07/23 10:55:00 para Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1013,7 +1013,7 @@
        mutex_enter(ec->ec_lock);
        while ((enm = LIST_FIRST(&ec->ec_multiaddrs)) != NULL) {
                LIST_REMOVE(enm, enm_list);
-               kmem_free(enm, sizeof(*enm));
+               kmem_intr_free(enm, sizeof(*enm));
                ec->ec_multicnt--;
        }
        mutex_exit(ec->ec_lock);
@@ -1277,7 +1277,7 @@
 out:
        mutex_exit(ec->ec_lock);
        if (enm != NULL)
-               kmem_free(enm, sizeof(*enm));
+               kmem_intr_free(enm, sizeof(*enm));
        return error;
 }
 
@@ -1319,7 +1319,7 @@
        ec->ec_multicnt--;
        mutex_exit(ec->ec_lock);
 
-       kmem_free(enm, sizeof(*enm));
+       kmem_intr_free(enm, sizeof(*enm));
        /*
         * Return ENETRESET to inform the driver that the list has changed
         * and its reception filter should be adjusted accordingly.
diff -r 89f24eb24842 -r b4ff5c3b4a59 sys/netinet/ip_mroute.c
--- a/sys/netinet/ip_mroute.c   Sun Jul 23 10:16:08 2017 +0000
+++ b/sys/netinet/ip_mroute.c   Sun Jul 23 10:55:00 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_mroute.c,v 1.146 2017/01/24 07:09:24 ozaki-r Exp $  */
+/*     $NetBSD: ip_mroute.c,v 1.147 2017/07/23 10:55:00 para Exp $     */
 
 /*
  * Copyright (c) 1992, 1993
@@ -93,7 +93,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.146 2017/01/24 07:09:24 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.147 2017/07/23 10:55:00 para Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1586,7 +1586,7 @@
                                struct bw_meter *x = rt->mfc_bw_meter;
 
                                rt->mfc_bw_meter = x->bm_mfc_next;
-                               kmem_free(x, sizeof(*x));
+                               kmem_intr_free(x, sizeof(*x));
                        }
 
                        ++mrtstat.mrts_cache_cleanups;
@@ -2530,7 +2530,7 @@
 
        list = list->bm_mfc_next;
        unschedule_bw_meter(x);
-       kmem_free(x, sizeof(*x));
+       kmem_intr_free(x, sizeof(*x));
     }
 }
 
@@ -2589,7 +2589,7 @@
            unschedule_bw_meter(x);
            splx(s);
            /* Free the bw_meter entry */
-           kmem_free(x, sizeof(*x));
+           kmem_intr_free(x, sizeof(*x));
            return 0;
        } else {
            splx(s);
diff -r 89f24eb24842 -r b4ff5c3b4a59 sys/netinet/ip_output.c
--- a/sys/netinet/ip_output.c   Sun Jul 23 10:16:08 2017 +0000
+++ b/sys/netinet/ip_output.c   Sun Jul 23 10:55:00 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_output.c,v 1.282 2017/07/04 10:25:45 roy Exp $      */
+/*     $NetBSD: ip_output.c,v 1.283 2017/07/23 10:55:00 para Exp $     */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.282 2017/07/04 10:25:45 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.283 2017/07/23 10:55:00 para Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1810,7 +1810,7 @@
            imo->imo_multicast_ttl == IP_DEFAULT_MULTICAST_TTL &&
            imo->imo_multicast_loop == IP_DEFAULT_MULTICAST_LOOP &&
            imo->imo_num_memberships == 0) {
-               kmem_free(imo, sizeof(*imo));
+               kmem_intr_free(imo, sizeof(*imo));
                *pimo = NULL;
        }
 
@@ -1885,7 +1885,7 @@
        if (imo != NULL) {
                for (i = 0; i < imo->imo_num_memberships; ++i)
                        in_delmulti(imo->imo_membership[i]);
-               kmem_free(imo, sizeof(*imo));
+               kmem_intr_free(imo, sizeof(*imo));
        }
 }
 



Home | Main Index | Thread Index | Old Index