Module Name: src
Committed By: para
Date: Sun Jul 23 10:55:00 UTC 2017
Modified Files:
src/sys/dev/pci: if_iwm.c
src/sys/net: if_ethersubr.c
src/sys/netinet: ip_mroute.c ip_output.c
Log Message:
kmem_intr_free kmem_intr_[z]alloced memory
the underlying pools are the same but api-wise those should match
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/dev/pci/if_iwm.c
cvs rdiff -u -r1.242 -r1.243 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.146 -r1.147 src/sys/netinet/ip_mroute.c
cvs rdiff -u -r1.282 -r1.283 src/sys/netinet/ip_output.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/dev/pci/if_iwm.c
diff -u src/sys/dev/pci/if_iwm.c:1.74 src/sys/dev/pci/if_iwm.c:1.75
--- src/sys/dev/pci/if_iwm.c:1.74 Fri Jun 9 04:48:58 2017
+++ src/sys/dev/pci/if_iwm.c Sun Jul 23 10:55:00 2017
@@ -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 @@ iwm_newstate_cb(struct work *wk, void *v
int arg = iwmns->ns_arg;
int s;
- kmem_free(iwmns, sizeof(*iwmns));
+ kmem_intr_free(iwmns, sizeof(*iwmns));
s = splnet();
Index: src/sys/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.242 src/sys/net/if_ethersubr.c:1.243
--- src/sys/net/if_ethersubr.c:1.242 Thu Apr 6 03:54:59 2017
+++ src/sys/net/if_ethersubr.c Sun Jul 23 10:55:00 2017
@@ -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 @@ ether_ifdetach(struct ifnet *ifp)
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 @@ ether_addmulti(const struct sockaddr *sa
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 @@ ether_delmulti(const struct sockaddr *sa
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.
Index: src/sys/netinet/ip_mroute.c
diff -u src/sys/netinet/ip_mroute.c:1.146 src/sys/netinet/ip_mroute.c:1.147
--- src/sys/netinet/ip_mroute.c:1.146 Tue Jan 24 07:09:24 2017
+++ src/sys/netinet/ip_mroute.c Sun Jul 23 10:55:00 2017
@@ -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 @@ expire_upcalls(void *v)
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 @@ free_bw_list(struct bw_meter *list)
list = list->bm_mfc_next;
unschedule_bw_meter(x);
- kmem_free(x, sizeof(*x));
+ kmem_intr_free(x, sizeof(*x));
}
}
@@ -2589,7 +2589,7 @@ del_bw_upcall(struct bw_upcall *req)
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);
Index: src/sys/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.282 src/sys/netinet/ip_output.c:1.283
--- src/sys/netinet/ip_output.c:1.282 Tue Jul 4 10:25:45 2017
+++ src/sys/netinet/ip_output.c Sun Jul 23 10:55:00 2017
@@ -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 @@ ip_setmoptions(struct ip_moptions **pimo
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 @@ ip_freemoptions(struct ip_moptions *imo)
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));
}
}
