summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authoragc <agc>1998-03-18 16:18:36 +0000
committeragc <agc>1998-03-18 16:18:36 +0000
commita245de5edefa4267d5750dc20b29e406881241b0 (patch)
treeefc9e188c584ec8434ec6d01a3a9088e8d100d74 /sysutils
parent048376f572bb8b5e71310ba0f0aca45e31723f22 (diff)
downloadpkgsrc-a245de5edefa4267d5750dc20b29e406881241b0.tar.gz
Further mods from Matt Green for the UVM case.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/xosview/patches/patch-aa10
-rw-r--r--sysutils/xosview/patches/patch-ab6
2 files changed, 7 insertions, 9 deletions
diff --git a/sysutils/xosview/patches/patch-aa b/sysutils/xosview/patches/patch-aa
index 829392989aa..64eb2775927 100644
--- a/sysutils/xosview/patches/patch-aa
+++ b/sysutils/xosview/patches/patch-aa
@@ -1,15 +1,13 @@
*** netbsd/pagemeter.h.orig Fri Jul 18 04:37:33 1997
---- netbsd/pagemeter.h Fri Mar 13 17:36:28 1998
+--- netbsd/pagemeter.h Wed Mar 18 15:02:27 1998
***************
*** 21,25 ****
---- 21,33 ----
+--- 21,31 ----
#include "fieldmeterdecay.h"
+ #if defined(UVM)
+ #include <sys/param.h>
-+ #include <sys/malloc.h>
-+ #include <sys/sysctl.h>
-+ #include <sys/device.h>
++ #include <vm/vm.h>
+ #include <uvm/uvm_extern.h>
+ #else
#include <sys/vmmeter.h>
@@ -18,7 +16,7 @@
class PageMeter : public FieldMeterDecay {
***************
*** 36,40 ****
---- 44,52 ----
+--- 42,50 ----
void getpageinfo( void );
private:
+ #if defined(UVM)
diff --git a/sysutils/xosview/patches/patch-ab b/sysutils/xosview/patches/patch-ab
index 2d8cf299c85..a618d2c66d3 100644
--- a/sysutils/xosview/patches/patch-ab
+++ b/sysutils/xosview/patches/patch-ab
@@ -1,5 +1,5 @@
---- netbsd/pagemeter.cc.orig Tue Mar 3 18:25:08 1998
-+++ netbsd/pagemeter.cc Sun Mar 1 17:24:30 1998
+--- netbsd/pagemeter.cc.orig Sun Dec 7 18:50:28 1997
++++ netbsd/pagemeter.cc Wed Mar 18 15:11:46 1998
@@ -56,9 +56,15 @@
void PageMeter::getpageinfo (void) {
@@ -22,7 +22,7 @@
fields_[1] = vm.v_vnodeout - prev_.v_vnodeout;
#else
+#if defined(UVM)
-+ fields_[0] = uvm.pgswapin - prev_.pgswapin;
++ fields_[0] = uvm.pageins - prev_.pageins;
+ fields_[1] = uvm.pgswapout - prev_.pgswapout;
+ prev_ = uvm;
+#else