Module Name: src
Committed By: yamt
Date: Sun Nov 13 01:36:25 UTC 2011
Modified Files:
src/sys/uvm [yamt-pagecache]: uvm_meter.c
Log Message:
a patch supposed to unbreak abi from christos@
PR/45598
To generate a diff of this commit:
cvs rdiff -u -r1.56.4.2 -r1.56.4.3 src/sys/uvm/uvm_meter.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/uvm/uvm_meter.c
diff -u src/sys/uvm/uvm_meter.c:1.56.4.2 src/sys/uvm/uvm_meter.c:1.56.4.3
--- src/sys/uvm/uvm_meter.c:1.56.4.2 Sat Nov 12 02:54:04 2011
+++ src/sys/uvm/uvm_meter.c Sun Nov 13 01:36:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_meter.c,v 1.56.4.2 2011/11/12 02:54:04 yamt Exp $ */
+/* $NetBSD: uvm_meter.c,v 1.56.4.3 2011/11/13 01:36:25 yamt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_meter.c,v 1.56.4.2 2011/11/12 02:54:04 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_meter.c,v 1.56.4.3 2011/11/13 01:36:25 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -191,6 +191,8 @@ sysctl_vm_uvmexp2(SYSCTLFN_ARGS)
node = *rnode;
node.sysctl_data = &u;
node.sysctl_size = sizeof(u);
+ if (oldp)
+ node.sysctl_size = min(*oldlenp, node.sysctl_size);
return (sysctl_lookup(SYSCTLFN_CALL(&node)));
}
