Page MenuHomeFreeBSD
Files F143538553

D23666.diff
No OneTemporary
Actions

D23666.diff
View Options

Index: head/lib/libkvm/kvm_getswapinfo.c
===================================================================
--- head/lib/libkvm/kvm_getswapinfo.c
+++ head/lib/libkvm/kvm_getswapinfo.c
@@ -115,8 +115,7 @@
kvm_getswapinfo_kvm(kvm_t *kd, struct kvm_swap *swap_ary, int swap_max,
int flags)
{
- int i;
- swblk_t ttl;
+ int i, ttl;
TAILQ_HEAD(, swdevt) swtailq;
struct swdevt *sp, swinfo;
struct kvm_swap tot;
@@ -167,8 +166,7 @@
kvm_getswapinfo_sysctl(kvm_t *kd, struct kvm_swap *swap_ary, int swap_max,
int flags)
{
- int ti;
- swblk_t ttl;
+ int ti, ttl;
size_t mibi, len;
int soid[SWI_MAXMIB];
struct xswdev xsd;
Index: head/sys/vm/swap_pager.h
===================================================================
--- head/sys/vm/swap_pager.h
+++ head/sys/vm/swap_pager.h
@@ -38,14 +38,9 @@
*/
#ifndef _VM_SWAP_PAGER_H_
-#define _VM_SWAP_PAGER_H_ 1
+#define _VM_SWAP_PAGER_H_
-typedef int32_t swblk_t; /*
- * swap offset. This is the type used to
- * address the "virtual swap device" and
- * therefore the maximum swap space is
- * 2^32 pages.
- */
+#include <sys/_types.h>
struct buf;
struct swdevt;
@@ -62,8 +57,8 @@
dev_t sw_dev;
struct vnode *sw_vp;
void *sw_id;
- swblk_t sw_first;
- swblk_t sw_end;
+ __daddr_t sw_first;
+ __daddr_t sw_end;
struct blist *sw_blist;
TAILQ_ENTRY(swdevt) sw_list;
sw_strategy_t *sw_strategy;
Index: head/sys/vm/swap_pager.c
===================================================================
--- head/sys/vm/swap_pager.c
+++ head/sys/vm/swap_pager.c
@@ -2334,7 +2334,7 @@
sw_strategy_t *strategy, sw_close_t *close, dev_t dev, int flags)
{
struct swdevt *sp, *tsp;
- swblk_t dvbase;
+ daddr_t dvbase;
u_long mblocks;
/*

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 31, 9:08 PM (3 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28186070
Default Alt Text
D23666.diff (1 KB)

Event Timeline