D45586.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D45586.id.diff
View Options

	diff --git a/sys/kern/subr_rangeset.c b/sys/kern/subr_rangeset.c
	--- a/sys/kern/subr_rangeset.c
	+++ b/sys/kern/subr_rangeset.c
	@@ -233,9 +233,8 @@
	}

	static void
	-rangeset_remove_leaf(void rv, void rsv)
	+rangeset_remove_leaf(struct rs_el r, void rsv)
	{
	- struct rs_el *r = rv;
	struct rangeset *rs = rsv;

	rs->rs_free_data(rs->rs_data_ctx, r);
	diff --git a/sys/sys/pctrie.h b/sys/sys/pctrie.h
	--- a/sys/sys/pctrie.h
	+++ b/sys/sys/pctrie.h
	@@ -226,9 +226,10 @@
	*/ \
	static __inline __unused void \
	name##_PCTRIE_RECLAIM_CALLBACK(struct pctrie *ptree, \
	- pctrie_cb_t callback, void *arg) \
	+ void (typed_cb)(struct type , void ), void arg) \
	{ \
	struct pctrie_node freenode, node; \
	+ pctrie_cb_t callback = (pctrie_cb_t)typed_cb; \
	\
	for (freenode = pctrie_reclaim_begin_cb(&node, ptree, \
	callback, __offsetof(struct type, field), arg); \
	diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
	--- a/sys/vm/swap_pager.c
	+++ b/sys/vm/swap_pager.c
	@@ -2220,9 +2220,8 @@
	}

	static void
	-swp_pager_meta_free_block(void sbv, void rangev)
	+swp_pager_meta_free_block(struct swblk sb, void rangev)
	{
	- struct swblk *sb = sbv;
	struct page_range *range = rangev;

	for (int i = 0; i < SWAP_META_PAGES; i++) {